diff --git a/README.md b/README.md index 317a1b1..e8345cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%202.3.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light) +![LunarCore](https://socialify.git.ci/Melledy/LunarCore/image?description=1&descriptionEditable=A%20game%20server%20reimplementation%20for%20version%202.4.0%20of%20a%20certain%20turn-based%20anime%20game%20for%20educational%20purposes.%20&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
GitHub release (latest by date) GitHub GitHub last commit GitHub Workflow Status
Discord - LunarCore
diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java index fe13aec..4a68b9f 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class ActivateFarmElementCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 4; - */ - private int entityId; - - /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 13; */ private int worldLevel; + /** + * optional uint32 entity_id = 15; + */ + private int entityId; + private ActivateFarmElementCsReq() { } @@ -39,62 +39,25 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 4; - * @return whether the entityId field is set + * optional uint32 world_level = 13; + * @return whether the worldLevel field is set */ - public boolean hasEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 4; - * @return this - */ - public ActivateFarmElementCsReq clearEntityId() { - bitField0_ &= ~0x00000001; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 4; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 4; - * @param value the entityId to set - * @return this - */ - public ActivateFarmElementCsReq setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * optional uint32 world_level = 9; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 13; * @return this */ public ActivateFarmElementCsReq clearWorldLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 13; * @return the worldLevel */ public int getWorldLevel() { @@ -102,23 +65,60 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 13; * @param value the worldLevel to set * @return this */ public ActivateFarmElementCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; worldLevel = value; return this; } + /** + * optional uint32 entity_id = 15; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 15; + * @return this + */ + public ActivateFarmElementCsReq clearEntityId() { + bitField0_ &= ~0x00000002; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 15; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 15; + * @param value the entityId to set + * @return this + */ + public ActivateFarmElementCsReq setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + @Override public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entityId = other.entityId; worldLevel = other.worldLevel; + entityId = other.entityId; } return this; } @@ -129,12 +129,12 @@ public final class ActivateFarmElementCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } return this; } @@ -145,8 +145,8 @@ public final class ActivateFarmElementCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; worldLevel = 0; + entityId = 0; return this; } @@ -170,19 +170,19 @@ public final class ActivateFarmElementCsReqOuterClass { } ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) - && (!hasWorldLevel() || worldLevel == other.worldLevel); + && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasEntityId() || entityId == other.entityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(entityId); } } @@ -190,10 +190,10 @@ public final class ActivateFarmElementCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } return size; } @@ -205,18 +205,18 @@ public final class ActivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // entityId - entityId = input.readUInt32(); + case 104: { + // worldLevel + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 120) { break; } } - case 72: { - // worldLevel - worldLevel = input.readUInt32(); + case 120: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ActivateFarmElementCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.entityId, entityId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ActivateFarmElementCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ActivateFarmElementCsReqOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class ActivateFarmElementCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java index 1135f0e..e1065b0 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,19 +19,19 @@ public final class ActivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 entity_id = 7; */ - private int retcode; + private int entityId; /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 8; */ private int worldLevel; /** - * optional uint32 entity_id = 12; + * optional uint32 retcode = 12; */ - private int entityId; + private int retcode; private ActivateFarmElementScRsp() { } @@ -44,44 +44,44 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set + * optional uint32 entity_id = 7; + * @return whether the entityId field is set */ - public boolean hasRetcode() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 10; + * optional uint32 entity_id = 7; * @return this */ - public ActivateFarmElementScRsp clearRetcode() { + public ActivateFarmElementScRsp clearEntityId() { bitField0_ &= ~0x00000001; - retcode = 0; + entityId = 0; return this; } /** - * optional uint32 retcode = 10; - * @return the retcode + * optional uint32 entity_id = 7; + * @return the entityId */ - public int getRetcode() { - return retcode; + public int getEntityId() { + return entityId; } /** - * optional uint32 retcode = 10; - * @param value the retcode to set + * optional uint32 entity_id = 7; + * @param value the entityId to set * @return this */ - public ActivateFarmElementScRsp setRetcode(final int value) { + public ActivateFarmElementScRsp setEntityId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + entityId = value; return this; } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 8; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -89,7 +89,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 8; * @return this */ public ActivateFarmElementScRsp clearWorldLevel() { @@ -99,7 +99,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 8; * @return the worldLevel */ public int getWorldLevel() { @@ -107,7 +107,7 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 11; + * optional uint32 world_level = 8; * @param value the worldLevel to set * @return this */ @@ -118,39 +118,39 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 12; - * @return whether the entityId field is set + * optional uint32 retcode = 12; + * @return whether the retcode field is set */ - public boolean hasEntityId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 entity_id = 12; + * optional uint32 retcode = 12; * @return this */ - public ActivateFarmElementScRsp clearEntityId() { + public ActivateFarmElementScRsp clearRetcode() { bitField0_ &= ~0x00000004; - entityId = 0; + retcode = 0; return this; } /** - * optional uint32 entity_id = 12; - * @return the entityId + * optional uint32 retcode = 12; + * @return the retcode */ - public int getEntityId() { - return entityId; + public int getRetcode() { + return retcode; } /** - * optional uint32 entity_id = 12; - * @param value the entityId to set + * optional uint32 retcode = 12; + * @param value the retcode to set * @return this */ - public ActivateFarmElementScRsp setEntityId(final int value) { + public ActivateFarmElementScRsp setRetcode(final int value) { bitField0_ |= 0x00000004; - entityId = value; + retcode = value; return this; } @@ -159,9 +159,9 @@ public final class ActivateFarmElementScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; - worldLevel = other.worldLevel; entityId = other.entityId; + worldLevel = other.worldLevel; + retcode = other.retcode; } return this; } @@ -172,14 +172,14 @@ public final class ActivateFarmElementScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasEntityId()) { + setEntityId(other.entityId); } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasEntityId()) { - setEntityId(other.entityId); + if (other.hasRetcode()) { + setRetcode(other.retcode); } return this; } @@ -191,9 +191,9 @@ public final class ActivateFarmElementScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - worldLevel = 0; entityId = 0; + worldLevel = 0; + retcode = 0; return this; } @@ -217,24 +217,24 @@ public final class ActivateFarmElementScRspOuterClass { } ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) + && (!hasEntityId() || entityId == other.entityId) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEntityId() || entityId == other.entityId); + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(entityId); + output.writeUInt32NoTag(retcode); } } @@ -242,13 +242,13 @@ public final class ActivateFarmElementScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -260,16 +260,16 @@ public final class ActivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // retcode - retcode = input.readUInt32(); + case 56: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000002; @@ -279,8 +279,8 @@ public final class ActivateFarmElementScRspOuterClass { } } case 96: { - // entityId - entityId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class ActivateFarmElementScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -323,10 +323,11 @@ public final class ActivateFarmElementScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -346,11 +347,10 @@ public final class ActivateFarmElementScRspOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class ActivateFarmElementScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index ad54b0b..6cc2ab6 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java @@ -19,22 +19,22 @@ public final class ActivityScheduleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 9; - */ - private long beginTime; - - /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; */ private long endTime; /** - * optional uint32 module_id = 3; + * optional int64 begin_time = 13; + */ + private long beginTime; + + /** + * optional uint32 module_id = 6; */ private int moduleId; /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 9; */ private int activityId; @@ -49,62 +49,25 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 9; - * @return whether the beginTime field is set + * optional int64 end_time = 7; + * @return whether the endTime field is set */ - public boolean hasBeginTime() { + public boolean hasEndTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 begin_time = 9; - * @return this - */ - public ActivityScheduleInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 9; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 9; - * @param value the beginTime to set - * @return this - */ - public ActivityScheduleInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 10; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @return this */ public ActivityScheduleInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @return the endTime */ public long getEndTime() { @@ -112,18 +75,55 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 10; + * optional int64 end_time = 7; * @param value the endTime to set * @return this */ public ActivityScheduleInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 module_id = 3; + * optional int64 begin_time = 13; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 13; + * @return this + */ + public ActivityScheduleInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 13; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 13; + * @param value the beginTime to set + * @return this + */ + public ActivityScheduleInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 module_id = 6; * @return whether the moduleId field is set */ public boolean hasModuleId() { @@ -131,7 +131,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 3; + * optional uint32 module_id = 6; * @return this */ public ActivityScheduleInfo clearModuleId() { @@ -141,7 +141,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 3; + * optional uint32 module_id = 6; * @return the moduleId */ public int getModuleId() { @@ -149,7 +149,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 module_id = 3; + * optional uint32 module_id = 6; * @param value the moduleId to set * @return this */ @@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 9; * @return whether the activityId field is set */ public boolean hasActivityId() { @@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 9; * @return this */ public ActivityScheduleInfo clearActivityId() { @@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 9; * @return the activityId */ public int getActivityId() { @@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 12; + * optional uint32 activity_id = 9; * @param value the activityId to set * @return this */ @@ -201,8 +201,8 @@ public final class ActivityScheduleInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; moduleId = other.moduleId; activityId = other.activityId; } @@ -215,12 +215,12 @@ public final class ActivityScheduleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasModuleId()) { setModuleId(other.moduleId); } @@ -237,8 +237,8 @@ public final class ActivityScheduleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; moduleId = 0; activityId = 0; return this; @@ -264,8 +264,8 @@ public final class ActivityScheduleInfoOuterClass { } ActivityScheduleInfo other = (ActivityScheduleInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasModuleId() || moduleId == other.moduleId) && (!hasActivityId() || activityId == other.activityId); } @@ -273,19 +273,19 @@ public final class ActivityScheduleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeInt64NoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(moduleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(activityId); } } @@ -294,10 +294,10 @@ public final class ActivityScheduleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(moduleId); @@ -315,34 +315,34 @@ public final class ActivityScheduleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 56: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { + case 104: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // moduleId moduleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // activityId activityId = input.readUInt32(); bitField0_ |= 0x00000008; @@ -369,10 +369,10 @@ public final class ActivityScheduleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.moduleId, moduleId); @@ -390,11 +390,11 @@ public final class ActivityScheduleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public final class ActivityScheduleInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -491,10 +491,10 @@ public final class ActivityScheduleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); - static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); + static final FieldName moduleId = FieldName.forField("moduleId", "module_id"); static final FieldName activityId = FieldName.forField("activityId", "activity_id"); diff --git a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java index d6f3404..bbe13d1 100644 --- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ApplyFriendCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 7; + * optional uint32 uid = 5; */ private int uid; /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 12; */ private int source; @@ -39,7 +39,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 5; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 5; * @return this */ public ApplyFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional uint32 uid = 7; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 12; * @return whether the source field is set */ public boolean hasSource() { @@ -84,7 +84,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 12; * @return this */ public ApplyFriendCsReq clearSource() { @@ -94,7 +94,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 12; * @return the source */ public FriendApplySourceOuterClass.FriendApplySource getSource() { @@ -127,7 +127,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 14; + * optional .FriendApplySource source = 12; * @param value the source to set * @return this */ @@ -202,11 +202,11 @@ public final class ApplyFriendCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeEnumNoTag(source); } } @@ -230,16 +230,16 @@ public final class ApplyFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { // source final int value = input.readInt32(); if (FriendApplySourceOuterClass.FriendApplySource.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java index 332542c..06fa354 100644 --- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java @@ -26,17 +26,17 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 2; */ private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 11; */ private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory()); /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_list = 12; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory()); @@ -56,7 +56,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 2; * @return whether the archiveEquipmentIdList field is set */ public boolean hasArchiveEquipmentIdList() { @@ -69,7 +69,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 2; * @return this */ public ArchiveData clearArchiveEquipmentIdList() { @@ -84,7 +84,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 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. @@ -103,7 +103,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 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 @@ -122,7 +122,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 2; * @param value the archiveEquipmentIdList to add * @return this */ @@ -138,7 +138,7 @@ public final class ArchiveDataOuterClass { * repeated uint32 archive_missing_equipment_id_list = 14; // isnt used * * - * repeated uint32 archive_equipment_id_list = 14; + * repeated uint32 archive_equipment_id_list = 2; * @param values the archiveEquipmentIdList to add * @return this */ @@ -149,7 +149,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 11; * @return whether the archiveMonsterIdList field is set */ public boolean hasArchiveMonsterIdList() { @@ -157,7 +157,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 11; * @return this */ public ArchiveData clearArchiveMonsterIdList() { @@ -167,7 +167,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 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. @@ -181,7 +181,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 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 @@ -196,7 +196,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 11; * @param value the archiveMonsterIdList to add * @return this */ @@ -208,7 +208,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 3; + * repeated .MonsterArchive archive_monster_id_list = 11; * @param values the archiveMonsterIdList to add * @return this */ @@ -220,7 +220,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_list = 12; * @return whether the relicList field is set */ public boolean hasRelicList() { @@ -228,7 +228,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_list = 12; * @return this */ public ArchiveData clearRelicList() { @@ -238,7 +238,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_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. @@ -252,7 +252,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_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 @@ -266,7 +266,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_list = 12; * @param value the relicList to add * @return this */ @@ -277,7 +277,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 11; + * repeated .RelicArchive relic_list = 12; * @param values the relicList to add * @return this */ @@ -362,19 +362,19 @@ public final class ArchiveDataOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < archiveEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < archiveMonsterIdList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 90); output.writeMessageNoTag(archiveMonsterIdList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 98); output.writeMessageNoTag(relicList.get(i)); } } @@ -402,24 +402,24 @@ public final class ArchiveDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 18: { // archiveEquipmentIdList [packed=true] input.readPackedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // archiveMonsterIdList - tag = input.readRepeatedMessage(archiveMonsterIdList, tag); - bitField0_ |= 0x00000002; if (tag != 90) { break; } } case 90: { + // archiveMonsterIdList + tag = input.readRepeatedMessage(archiveMonsterIdList, tag); + bitField0_ |= 0x00000002; + if (tag != 98) { + break; + } + } + case 98: { // relicList tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000004; @@ -437,7 +437,7 @@ public final class ArchiveDataOuterClass { tag = input.readTag(); break; } - case 112: { + case 16: { // archiveEquipmentIdList [packed=false] tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java index aceede1..af73e2c 100644 --- a/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java @@ -20,7 +20,7 @@ public final class AssistMonsterWaveOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; */ private final RepeatedInt entityIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * @return whether the entityIdList field is set */ public boolean hasEntityIdList() { @@ -43,7 +43,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * @return this */ public AssistMonsterWave clearEntityIdList() { @@ -53,7 +53,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * * 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. @@ -67,7 +67,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * @param value the entityIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 2; + * repeated uint32 entity_id_list = 9; * @param values the entityIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class AssistMonsterWaveOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entityIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(entityIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class AssistMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 74: { // entityIdList [packed=true] input.readPackedUInt32(entityIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class AssistMonsterWaveOuterClass { tag = input.readTag(); break; } - case 16: { + case 72: { // entityIdList [packed=false] tag = input.readRepeatedUInt32(entityIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java index 606bc12..a6f5c77 100644 --- a/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java @@ -24,20 +24,20 @@ public final class AssistSimpleInfoOuterClass { private int level; /** - * optional uint32 avatar_id = 3; + * optional uint32 dressed_skin_id = 5; + */ + private int dressedSkinId; + + /** + * optional uint32 avatar_id = 9; */ private int avatarId; /** - * optional uint32 pos = 6; + * optional uint32 pos = 12; */ private int pos; - /** - * optional uint32 dressed_skin_id = 10; - */ - private int dressedSkinId; - private AssistSimpleInfo() { } @@ -86,99 +86,25 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 3; - * @return whether the avatarId field is set + * optional uint32 dressed_skin_id = 5; + * @return whether the dressedSkinId field is set */ - public boolean hasAvatarId() { + public boolean hasDressedSkinId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 avatar_id = 3; - * @return this - */ - public AssistSimpleInfo clearAvatarId() { - bitField0_ &= ~0x00000002; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 3; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 3; - * @param value the avatarId to set - * @return this - */ - public AssistSimpleInfo setAvatarId(final int value) { - bitField0_ |= 0x00000002; - avatarId = value; - return this; - } - - /** - * optional uint32 pos = 6; - * @return whether the pos field is set - */ - public boolean hasPos() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 pos = 6; - * @return this - */ - public AssistSimpleInfo clearPos() { - bitField0_ &= ~0x00000004; - pos = 0; - return this; - } - - /** - * optional uint32 pos = 6; - * @return the pos - */ - public int getPos() { - return pos; - } - - /** - * optional uint32 pos = 6; - * @param value the pos to set - * @return this - */ - public AssistSimpleInfo setPos(final int value) { - bitField0_ |= 0x00000004; - pos = value; - return this; - } - - /** - * optional uint32 dressed_skin_id = 10; - * @return whether the dressedSkinId field is set - */ - public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 dressed_skin_id = 10; + * optional uint32 dressed_skin_id = 5; * @return this */ public AssistSimpleInfo clearDressedSkinId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; dressedSkinId = 0; return this; } /** - * optional uint32 dressed_skin_id = 10; + * optional uint32 dressed_skin_id = 5; * @return the dressedSkinId */ public int getDressedSkinId() { @@ -186,25 +112,99 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 dressed_skin_id = 10; + * optional uint32 dressed_skin_id = 5; * @param value the dressedSkinId to set * @return this */ public AssistSimpleInfo setDressedSkinId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; dressedSkinId = value; return this; } + /** + * optional uint32 avatar_id = 9; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 avatar_id = 9; + * @return this + */ + public AssistSimpleInfo clearAvatarId() { + bitField0_ &= ~0x00000004; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 9; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 9; + * @param value the avatarId to set + * @return this + */ + public AssistSimpleInfo setAvatarId(final int value) { + bitField0_ |= 0x00000004; + avatarId = value; + return this; + } + + /** + * optional uint32 pos = 12; + * @return whether the pos field is set + */ + public boolean hasPos() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 pos = 12; + * @return this + */ + public AssistSimpleInfo clearPos() { + bitField0_ &= ~0x00000008; + pos = 0; + return this; + } + + /** + * optional uint32 pos = 12; + * @return the pos + */ + public int getPos() { + return pos; + } + + /** + * optional uint32 pos = 12; + * @param value the pos to set + * @return this + */ + public AssistSimpleInfo setPos(final int value) { + bitField0_ |= 0x00000008; + pos = value; + return this; + } + @Override public AssistSimpleInfo copyFrom(final AssistSimpleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; level = other.level; + dressedSkinId = other.dressedSkinId; avatarId = other.avatarId; pos = other.pos; - dressedSkinId = other.dressedSkinId; } return this; } @@ -218,15 +218,15 @@ public final class AssistSimpleInfoOuterClass { if (other.hasLevel()) { setLevel(other.level); } + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } if (other.hasPos()) { setPos(other.pos); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); - } return this; } @@ -238,9 +238,9 @@ public final class AssistSimpleInfoOuterClass { cachedSize = -1; bitField0_ = 0; level = 0; + dressedSkinId = 0; avatarId = 0; pos = 0; - dressedSkinId = 0; return this; } @@ -265,9 +265,9 @@ public final class AssistSimpleInfoOuterClass { AssistSimpleInfo other = (AssistSimpleInfo) o; return bitField0_ == other.bitField0_ && (!hasLevel() || level == other.level) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasPos() || pos == other.pos) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId); + && (!hasPos() || pos == other.pos); } @Override @@ -277,16 +277,16 @@ public final class AssistSimpleInfoOuterClass { output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(pos); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(dressedSkinId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(pos); } } @@ -297,13 +297,13 @@ public final class AssistSimpleInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } return size; } @@ -320,31 +320,31 @@ public final class AssistSimpleInfoOuterClass { level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 40) { break; } } - case 24: { - // avatarId - avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // pos - pos = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 40: { // dressedSkinId dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // avatarId + avatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // pos + pos = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -372,13 +372,13 @@ public final class AssistSimpleInfoOuterClass { output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.pos, pos); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.pos, pos); } output.endObject(); } @@ -401,12 +401,24 @@ public final class AssistSimpleInfoOuterClass { } break; } + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { + if (!input.trySkipNullValue()) { + dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 1787287636: case -428636735: { if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -417,18 +429,6 @@ public final class AssistSimpleInfoOuterClass { if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { pos = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { - if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -491,11 +491,11 @@ public final class AssistSimpleInfoOuterClass { static class FieldNames { static final FieldName level = FieldName.forField("level"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName pos = FieldName.forField("pos"); - - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java index 26e5922..1654356 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class AvatarExpUpCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 14; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 12; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 2; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 14; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 14; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 14; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class AvatarExpUpCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 114); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 96: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 114) { break; } } - case 66: { + case 114: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java index db165f9..ec24d62 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarExpUpScRspOuterClass.java @@ -20,12 +20,12 @@ public final class AvatarExpUpScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_list = 12; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_list = 12; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_list = 12; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_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. @@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_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 @@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_list = 12; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 5; + * repeated .PileItem return_item_list = 12; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public final class AvatarExpUpScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 98); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 98) { break; } } - case 42: { + case 98: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java index 8933e5c..da72dda 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarOuterClass.java @@ -21,65 +21,65 @@ public final class AvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 first_met_timestamp = 14; + * optional uint64 first_met_timestamp = 8; */ private long firstMetTimestamp; /** - * optional uint32 base_avatar_id = 1; - */ - private int baseAvatarId; - - /** - * optional uint32 equipment_unique_id = 5; - */ - private int equipmentUniqueId; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 exp = 10; - */ - private int exp; - - /** - * optional uint32 rank = 11; + * optional uint32 rank = 1; */ private int rank; /** - * optional uint32 promotion = 13; + * optional uint32 level = 5; */ - private int promotion; + private int level; /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; */ private int dressedSkinId; /** - * optional bool is_marked = 2; + * optional uint32 equipment_unique_id = 7; + */ + private int equipmentUniqueId; + + /** + * optional uint32 promotion = 12; + */ + private int promotion; + + /** + * optional uint32 base_avatar_id = 13; + */ + private int baseAvatarId; + + /** + * optional uint32 exp = 15; + */ + private int exp; + + /** + * optional bool is_marked = 3; */ private boolean isMarked; /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 11; */ private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .EquipRelic equip_relic_list = 7; - */ - private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); - - /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; */ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + /** + * repeated .EquipRelic equip_relic_list = 14; + */ + private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); + private Avatar() { } @@ -91,7 +91,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 14; + * optional uint64 first_met_timestamp = 8; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -99,7 +99,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 14; + * optional uint64 first_met_timestamp = 8; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -109,7 +109,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 14; + * optional uint64 first_met_timestamp = 8; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -117,7 +117,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 14; + * optional uint64 first_met_timestamp = 8; * @param value the firstMetTimestamp to set * @return this */ @@ -128,173 +128,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 base_avatar_id = 1; - * @return whether the baseAvatarId field is set + * optional uint32 rank = 1; + * @return whether the rank field is set */ - public boolean hasBaseAvatarId() { + public boolean hasRank() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 base_avatar_id = 1; - * @return this - */ - public Avatar clearBaseAvatarId() { - bitField0_ &= ~0x00000002; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 1; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 1; - * @param value the baseAvatarId to set - * @return this - */ - public Avatar setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @return whether the equipmentUniqueId field is set - */ - public boolean hasEquipmentUniqueId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @return this - */ - public Avatar clearEquipmentUniqueId() { - bitField0_ &= ~0x00000004; - equipmentUniqueId = 0; - return this; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @return the equipmentUniqueId - */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; - } - - /** - * optional uint32 equipment_unique_id = 5; - * @param value the equipmentUniqueId to set - * @return this - */ - public Avatar setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000004; - equipmentUniqueId = value; - return this; - } - - /** - * optional uint32 level = 8; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 level = 8; - * @return this - */ - public Avatar clearLevel() { - bitField0_ &= ~0x00000008; - level = 0; - return this; - } - - /** - * optional uint32 level = 8; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 8; - * @param value the level to set - * @return this - */ - public Avatar setLevel(final int value) { - bitField0_ |= 0x00000008; - level = value; - return this; - } - - /** - * optional uint32 exp = 10; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 exp = 10; - * @return this - */ - public Avatar clearExp() { - bitField0_ &= ~0x00000010; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 10; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 10; - * @param value the exp to set - * @return this - */ - public Avatar setExp(final int value) { - bitField0_ |= 0x00000010; - exp = value; - return this; - } - - /** - * optional uint32 rank = 11; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 rank = 11; + * optional uint32 rank = 1; * @return this */ public Avatar clearRank() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000002; rank = 0; return this; } /** - * optional uint32 rank = 11; + * optional uint32 rank = 1; * @return the rank */ public int getRank() { @@ -302,73 +154,73 @@ public final class AvatarOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 1; * @param value the rank to set * @return this */ public Avatar setRank(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; rank = value; return this; } /** - * optional uint32 promotion = 13; - * @return whether the promotion field is set + * optional uint32 level = 5; + * @return whether the level field is set */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000040) != 0; + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 promotion = 13; + * optional uint32 level = 5; * @return this */ - public Avatar clearPromotion() { - bitField0_ &= ~0x00000040; - promotion = 0; + public Avatar clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; return this; } /** - * optional uint32 promotion = 13; - * @return the promotion + * optional uint32 level = 5; + * @return the level */ - public int getPromotion() { - return promotion; + public int getLevel() { + return level; } /** - * optional uint32 promotion = 13; - * @param value the promotion to set + * optional uint32 level = 5; + * @param value the level to set * @return this */ - public Avatar setPromotion(final int value) { - bitField0_ |= 0x00000040; - promotion = value; + public Avatar setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; return this; } /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; * @return whether the dressedSkinId field is set */ public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; * @return this */ public Avatar clearDressedSkinId() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000008; dressedSkinId = 0; return this; } /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; * @return the dressedSkinId */ public int getDressedSkinId() { @@ -376,18 +228,166 @@ public final class AvatarOuterClass { } /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; * @param value the dressedSkinId to set * @return this */ public Avatar setDressedSkinId(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; dressedSkinId = value; return this; } /** - * optional bool is_marked = 2; + * optional uint32 equipment_unique_id = 7; + * @return whether the equipmentUniqueId field is set + */ + public boolean hasEquipmentUniqueId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 equipment_unique_id = 7; + * @return this + */ + public Avatar clearEquipmentUniqueId() { + bitField0_ &= ~0x00000010; + equipmentUniqueId = 0; + return this; + } + + /** + * optional uint32 equipment_unique_id = 7; + * @return the equipmentUniqueId + */ + public int getEquipmentUniqueId() { + return equipmentUniqueId; + } + + /** + * optional uint32 equipment_unique_id = 7; + * @param value the equipmentUniqueId to set + * @return this + */ + public Avatar setEquipmentUniqueId(final int value) { + bitField0_ |= 0x00000010; + equipmentUniqueId = value; + return this; + } + + /** + * optional uint32 promotion = 12; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 promotion = 12; + * @return this + */ + public Avatar clearPromotion() { + bitField0_ &= ~0x00000020; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 12; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 12; + * @param value the promotion to set + * @return this + */ + public Avatar setPromotion(final int value) { + bitField0_ |= 0x00000020; + promotion = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 13; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 base_avatar_id = 13; + * @return this + */ + public Avatar clearBaseAvatarId() { + bitField0_ &= ~0x00000040; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 13; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 13; + * @param value the baseAvatarId to set + * @return this + */ + public Avatar setBaseAvatarId(final int value) { + bitField0_ |= 0x00000040; + baseAvatarId = value; + return this; + } + + /** + * optional uint32 exp = 15; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 exp = 15; + * @return this + */ + public Avatar clearExp() { + bitField0_ &= ~0x00000080; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 15; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 15; + * @param value the exp to set + * @return this + */ + public Avatar setExp(final int value) { + bitField0_ |= 0x00000080; + exp = value; + return this; + } + + /** + * optional bool is_marked = 3; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -395,7 +395,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @return this */ public Avatar clearIsMarked() { @@ -405,7 +405,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @return the isMarked */ public boolean getIsMarked() { @@ -413,7 +413,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @param value the isMarked to set * @return this */ @@ -424,7 +424,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 11; * @return whether the takenRewards field is set */ public boolean hasTakenRewards() { @@ -432,7 +432,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 11; * @return this */ public Avatar clearTakenRewards() { @@ -442,7 +442,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 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. @@ -456,7 +456,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 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 @@ -470,7 +470,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 11; * @param value the takenRewards to add * @return this */ @@ -481,7 +481,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 6; + * repeated uint32 taken_rewards = 11; * @param values the takenRewards to add * @return this */ @@ -492,93 +492,25 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 7; - * @return whether the equipRelicList field is set + * repeated .AvatarSkillTree skilltree_list = 9; + * @return whether the skilltreeList field is set */ - public boolean hasEquipRelicList() { + public boolean hasSkilltreeList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .EquipRelic equip_relic_list = 7; - * @return this - */ - public Avatar clearEquipRelicList() { - bitField0_ &= ~0x00000400; - equipRelicList.clear(); - return this; - } - - /** - * repeated .EquipRelic equip_relic_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 #getMutableEquipRelicList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipRelicList() { - return equipRelicList; - } - - /** - * repeated .EquipRelic equip_relic_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 getMutableEquipRelicList() { - bitField0_ |= 0x00000400; - return equipRelicList; - } - - /** - * repeated .EquipRelic equip_relic_list = 7; - * @param value the equipRelicList to add - * @return this - */ - public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { - bitField0_ |= 0x00000400; - equipRelicList.add(value); - return this; - } - - /** - * repeated .EquipRelic equip_relic_list = 7; - * @param values the equipRelicList to add - * @return this - */ - public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) { - bitField0_ |= 0x00000400; - equipRelicList.addAll(values); - return this; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 12; - * @return whether the skilltreeList field is set - */ - public boolean hasSkilltreeList() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; * @return this */ public Avatar clearSkilltreeList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000400; skilltreeList.clear(); return this; } /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; * * 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. @@ -592,7 +524,7 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -601,49 +533,117 @@ public final class AvatarOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableSkilltreeList() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return skilltreeList; } /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; * @param value the skilltreeList to add * @return this */ public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; skilltreeList.add(value); return this; } /** - * repeated .AvatarSkillTree skilltree_list = 12; + * repeated .AvatarSkillTree skilltree_list = 9; * @param values the skilltreeList to add * @return this */ public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; skilltreeList.addAll(values); return this; } + /** + * repeated .EquipRelic equip_relic_list = 14; + * @return whether the equipRelicList field is set + */ + public boolean hasEquipRelicList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .EquipRelic equip_relic_list = 14; + * @return this + */ + public Avatar clearEquipRelicList() { + bitField0_ &= ~0x00000800; + equipRelicList.clear(); + return this; + } + + /** + * repeated .EquipRelic equip_relic_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. + * + * Use {@link #getMutableEquipRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getEquipRelicList() { + return equipRelicList; + } + + /** + * repeated .EquipRelic equip_relic_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableEquipRelicList() { + bitField0_ |= 0x00000800; + return equipRelicList; + } + + /** + * repeated .EquipRelic equip_relic_list = 14; + * @param value the equipRelicList to add + * @return this + */ + public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { + bitField0_ |= 0x00000800; + equipRelicList.add(value); + return this; + } + + /** + * repeated .EquipRelic equip_relic_list = 14; + * @param values the equipRelicList to add + * @return this + */ + public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) { + bitField0_ |= 0x00000800; + equipRelicList.addAll(values); + return this; + } + @Override public Avatar copyFrom(final Avatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; firstMetTimestamp = other.firstMetTimestamp; - baseAvatarId = other.baseAvatarId; - equipmentUniqueId = other.equipmentUniqueId; - level = other.level; - exp = other.exp; rank = other.rank; - promotion = other.promotion; + level = other.level; dressedSkinId = other.dressedSkinId; + equipmentUniqueId = other.equipmentUniqueId; + promotion = other.promotion; + baseAvatarId = other.baseAvatarId; + exp = other.exp; isMarked = other.isMarked; takenRewards.copyFrom(other.takenRewards); - equipRelicList.copyFrom(other.equipRelicList); skilltreeList.copyFrom(other.skilltreeList); + equipRelicList.copyFrom(other.equipRelicList); } return this; } @@ -657,26 +657,26 @@ public final class AvatarOuterClass { if (other.hasFirstMetTimestamp()) { setFirstMetTimestamp(other.firstMetTimestamp); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); + if (other.hasRank()) { + setRank(other.rank); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasExp()) { - setExp(other.exp); + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); } if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } + if (other.hasExp()) { + setExp(other.exp); } if (other.hasIsMarked()) { setIsMarked(other.isMarked); @@ -684,12 +684,12 @@ public final class AvatarOuterClass { if (other.hasTakenRewards()) { getMutableTakenRewards().addAll(other.takenRewards); } - if (other.hasEquipRelicList()) { - getMutableEquipRelicList().addAll(other.equipRelicList); - } if (other.hasSkilltreeList()) { getMutableSkilltreeList().addAll(other.skilltreeList); } + if (other.hasEquipRelicList()) { + getMutableEquipRelicList().addAll(other.equipRelicList); + } return this; } @@ -701,17 +701,17 @@ public final class AvatarOuterClass { cachedSize = -1; bitField0_ = 0; firstMetTimestamp = 0L; - baseAvatarId = 0; - equipmentUniqueId = 0; - level = 0; - exp = 0; rank = 0; - promotion = 0; + level = 0; dressedSkinId = 0; + equipmentUniqueId = 0; + promotion = 0; + baseAvatarId = 0; + exp = 0; isMarked = false; takenRewards.clear(); - equipRelicList.clear(); skilltreeList.clear(); + equipRelicList.clear(); return this; } @@ -723,8 +723,8 @@ public final class AvatarOuterClass { cachedSize = -1; bitField0_ = 0; takenRewards.clear(); - equipRelicList.clearQuick(); skilltreeList.clearQuick(); + equipRelicList.clearQuick(); return this; } @@ -739,73 +739,73 @@ public final class AvatarOuterClass { Avatar other = (Avatar) o; return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) - && (!hasLevel() || level == other.level) - && (!hasExp() || exp == other.exp) && (!hasRank() || rank == other.rank) - && (!hasPromotion() || promotion == other.promotion) + && (!hasLevel() || level == other.level) && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasPromotion() || promotion == other.promotion) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasExp() || exp == other.exp) && (!hasIsMarked() || isMarked == other.isMarked) && (!hasTakenRewards() || takenRewards.equals(other.takenRewards)) - && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)) - && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); + && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) + && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(baseAvatarId); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(equipmentUniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(dressedSkinId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(promotion); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(dressedSkinId); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isMarked); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < takenRewards.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(takenRewards.array()[i]); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < equipRelicList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(equipRelicList.get(i)); + for (int i = 0; i < skilltreeList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(skilltreeList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(skilltreeList.get(i)); + for (int i = 0; i < equipRelicList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(equipRelicList.get(i)); } } } @@ -817,25 +817,25 @@ public final class AvatarOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000100) != 0) { size += 2; @@ -844,10 +844,10 @@ public final class AvatarOuterClass { size += (1 * takenRewards.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(takenRewards); } if ((bitField0_ & 0x00000400) != 0) { - size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); + size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } if ((bitField0_ & 0x00000800) != 0) { - size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); + size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); } return size; } @@ -859,7 +859,7 @@ public final class AvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 64: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; @@ -869,8 +869,8 @@ public final class AvatarOuterClass { } } case 8: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { @@ -878,35 +878,35 @@ public final class AvatarOuterClass { } } case 40: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // level level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // exp - exp = input.readUInt32(); + case 56: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // rank - rank = input.readUInt32(); + case 96: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 104) { @@ -914,8 +914,8 @@ public final class AvatarOuterClass { } } case 104: { - // promotion - promotion = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 120) { @@ -923,43 +923,43 @@ public final class AvatarOuterClass { } } case 120: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { + case 24: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 50) { + if (tag != 90) { break; } } - case 50: { + case 90: { // takenRewards [packed=true] input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 58) { + if (tag != 74) { break; } } - case 58: { - // equipRelicList - tag = input.readRepeatedMessage(equipRelicList, tag); - bitField0_ |= 0x00000400; - if (tag != 98) { - break; - } - } - case 98: { + case 74: { // skilltreeList tag = input.readRepeatedMessage(skilltreeList, tag); + bitField0_ |= 0x00000400; + if (tag != 114) { + break; + } + } + case 114: { + // equipRelicList + tag = input.readRepeatedMessage(equipRelicList, tag); bitField0_ |= 0x00000800; if (tag != 0) { break; @@ -975,7 +975,7 @@ public final class AvatarOuterClass { tag = input.readTag(); break; } - case 48: { + case 88: { // takenRewards [packed=false] tag = input.readRepeatedUInt32(takenRewards, tag); bitField0_ |= 0x00000200; @@ -992,25 +992,25 @@ public final class AvatarOuterClass { output.writeUInt64(FieldNames.firstMetTimestamp, firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.promotion, promotion); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000100) != 0) { output.writeBool(FieldNames.isMarked, isMarked); @@ -1019,10 +1019,10 @@ public final class AvatarOuterClass { output.writeRepeatedUInt32(FieldNames.takenRewards, takenRewards); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); + output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); + output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); } output.endObject(); } @@ -1046,11 +1046,10 @@ public final class AvatarOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1058,56 +1057,11 @@ public final class AvatarOuterClass { } break; } - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { - if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { - if (!input.trySkipNullValue()) { - rank = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1119,6 +1073,52 @@ public final class AvatarOuterClass { if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { + if (!input.trySkipNullValue()) { + equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { + if (!input.trySkipNullValue()) { + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -1150,11 +1150,11 @@ public final class AvatarOuterClass { } break; } - case 1578968161: - case -795441831: { - if (input.isAtField(FieldNames.equipRelicList)) { + case 1549763245: + case 815647086: { + if (input.isAtField(FieldNames.skilltreeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipRelicList); + input.readRepeatedMessage(skilltreeList); bitField0_ |= 0x00000400; } } else { @@ -1162,11 +1162,11 @@ public final class AvatarOuterClass { } break; } - case 1549763245: - case 815647086: { - if (input.isAtField(FieldNames.skilltreeList)) { + case 1578968161: + case -795441831: { + if (input.isAtField(FieldNames.equipRelicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(skilltreeList); + input.readRepeatedMessage(equipRelicList); bitField0_ |= 0x00000800; } } else { @@ -1228,27 +1228,27 @@ public final class AvatarOuterClass { static class FieldNames { static final FieldName firstMetTimestamp = FieldName.forField("firstMetTimestamp", "first_met_timestamp"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); + static final FieldName rank = FieldName.forField("rank"); static final FieldName level = FieldName.forField("level"); - static final FieldName exp = FieldName.forField("exp"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); - static final FieldName rank = FieldName.forField("rank"); + static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + + static final FieldName exp = FieldName.forField("exp"); static final FieldName isMarked = FieldName.forField("isMarked", "is_marked"); static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards"); - static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); - static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); + + static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java new file mode 100644 index 0000000..6506bab --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/AvatarPathChangedNotifyOuterClass.java @@ -0,0 +1,375 @@ +// 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 AvatarPathChangedNotifyOuterClass { + /** + * Protobuf type {@code AvatarPathChangedNotify} + */ + public static final class AvatarPathChangedNotify extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 base_avatar_id = 3; + */ + private int baseAvatarId; + + /** + * optional .MultiPathAvatarType changed_avatar_type = 9; + */ + private int changedAvatarType; + + private AvatarPathChangedNotify() { + } + + /** + * @return a new empty instance of {@code AvatarPathChangedNotify} + */ + public static AvatarPathChangedNotify newInstance() { + return new AvatarPathChangedNotify(); + } + + /** + * optional uint32 base_avatar_id = 3; + * @return whether the baseAvatarId field is set + */ + public boolean hasBaseAvatarId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 base_avatar_id = 3; + * @return this + */ + public AvatarPathChangedNotify clearBaseAvatarId() { + bitField0_ &= ~0x00000001; + baseAvatarId = 0; + return this; + } + + /** + * optional uint32 base_avatar_id = 3; + * @return the baseAvatarId + */ + public int getBaseAvatarId() { + return baseAvatarId; + } + + /** + * optional uint32 base_avatar_id = 3; + * @param value the baseAvatarId to set + * @return this + */ + public AvatarPathChangedNotify setBaseAvatarId(final int value) { + bitField0_ |= 0x00000001; + baseAvatarId = value; + return this; + } + + /** + * optional .MultiPathAvatarType changed_avatar_type = 9; + * @return whether the changedAvatarType field is set + */ + public boolean hasChangedAvatarType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .MultiPathAvatarType changed_avatar_type = 9; + * @return this + */ + public AvatarPathChangedNotify clearChangedAvatarType() { + bitField0_ &= ~0x00000002; + changedAvatarType = 0; + return this; + } + + /** + * optional .MultiPathAvatarType changed_avatar_type = 9; + * @return the changedAvatarType + */ + public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getChangedAvatarType() { + return MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(changedAvatarType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link AvatarPathChangedNotify#getChangedAvatarType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getChangedAvatarTypeValue() { + return changedAvatarType; + } + + /** + * 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 MultiPathAvatarTypeOuterClass.MultiPathAvatarType}. Setting an invalid value + * can cause {@link AvatarPathChangedNotify#getChangedAvatarType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public AvatarPathChangedNotify setChangedAvatarTypeValue(final int value) { + bitField0_ |= 0x00000002; + changedAvatarType = value; + return this; + } + + /** + * optional .MultiPathAvatarType changed_avatar_type = 9; + * @param value the changedAvatarType to set + * @return this + */ + public AvatarPathChangedNotify setChangedAvatarType( + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value) { + bitField0_ |= 0x00000002; + changedAvatarType = value.getNumber(); + return this; + } + + @Override + public AvatarPathChangedNotify copyFrom(final AvatarPathChangedNotify other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + baseAvatarId = other.baseAvatarId; + changedAvatarType = other.changedAvatarType; + } + return this; + } + + @Override + public AvatarPathChangedNotify mergeFrom(final AvatarPathChangedNotify other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); + } + if (other.hasChangedAvatarType()) { + setChangedAvatarTypeValue(other.changedAvatarType); + } + return this; + } + + @Override + public AvatarPathChangedNotify clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + baseAvatarId = 0; + changedAvatarType = 0; + return this; + } + + @Override + public AvatarPathChangedNotify 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 AvatarPathChangedNotify)) { + return false; + } + AvatarPathChangedNotify other = (AvatarPathChangedNotify) o; + return bitField0_ == other.bitField0_ + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasChangedAvatarType() || changedAvatarType == other.changedAvatarType); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(baseAvatarId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeEnumNoTag(changedAvatarType); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(changedAvatarType); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public AvatarPathChangedNotify mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // changedAvatarType + final int value = input.readInt32(); + if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { + changedAvatarType = value; + bitField0_ |= 0x00000002; + } + 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.baseAvatarId, baseAvatarId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeEnum(FieldNames.changedAvatarType, changedAvatarType, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + } + output.endObject(); + } + + @Override + public AvatarPathChangedNotify mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { + if (!input.trySkipNullValue()) { + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1985011207: + case 1120127317: { + if (input.isAtField(FieldNames.changedAvatarType)) { + if (!input.trySkipNullValue()) { + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value = input.readEnum(MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + if (value != null) { + changedAvatarType = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public AvatarPathChangedNotify clone() { + return new AvatarPathChangedNotify().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static AvatarPathChangedNotify parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new AvatarPathChangedNotify(), data).checkInitialized(); + } + + public static AvatarPathChangedNotify parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new AvatarPathChangedNotify(), input).checkInitialized(); + } + + public static AvatarPathChangedNotify parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new AvatarPathChangedNotify(), input).checkInitialized(); + } + + /** + * @return factory for creating AvatarPathChangedNotify messages + */ + public static MessageFactory getFactory() { + return AvatarPathChangedNotifyFactory.INSTANCE; + } + + private enum AvatarPathChangedNotifyFactory implements MessageFactory { + INSTANCE; + + @Override + public AvatarPathChangedNotify create() { + return AvatarPathChangedNotify.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + + static final FieldName changedAvatarType = FieldName.forField("changedAvatarType", "changed_avatar_type"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index 2f04107..5795f3c 100644 --- a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java @@ -20,7 +20,7 @@ public final class AvatarSyncOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 12; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 12; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 12; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_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. @@ -67,7 +67,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_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 @@ -81,7 +81,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 12; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 7; + * repeated .Avatar avatar_list = 12; * @param values the avatarList to add * @return this */ @@ -163,7 +163,7 @@ public final class AvatarSyncOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 98); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 98: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java index e765191..a98fea9 100644 --- a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java @@ -21,57 +21,61 @@ public final class BattlePassInfoNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 taken_premium_optional_reward = 2; - */ - private long takenPremiumOptionalReward; - - /** - * optional uint64 taken_premium_reward2 = 3; + * optional uint64 taken_premium_reward2 = 2; */ private long takenPremiumReward2; /** - * optional uint64 taken_premium_extended_reward = 4; - */ - private long takenPremiumExtendedReward; - - /** - * optional uint64 taken_free_extended_reward = 8; - */ - private long takenFreeExtendedReward; - - /** - * optional uint64 taken_premium_reward1 = 9; - */ - private long takenPremiumReward1; - - /** - * optional uint64 taken_free_reward = 10; + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 7; */ private long takenFreeReward; /** - * optional uint32 cur_week_add_exp_sum = 1; + * optional uint64 taken_premium_reward1 = 8; */ - private int curWeekAddExpSum; + private long takenPremiumReward1; /** - * optional uint32 cur_bp_id = 5; + * optional uint64 taken_premium_extended_reward = 10; + */ + private long takenPremiumExtendedReward; + + /** + * optional uint64 taken_free_extended_reward = 11; + */ + private long takenFreeExtendedReward; + + /** + * optional uint64 taken_premium_optional_reward = 15; + */ + private long takenPremiumOptionalReward; + + /** + * optional uint32 cur_bp_id = 1; */ private int curBpId; + /** + * optional uint32 level = 4; + */ + private int level; + /** * optional uint32 exp = 12; */ private int exp; /** - * optional uint32 level = 13; + * optional uint32 cur_week_add_exp_sum = 14; */ - private int level; + private int curWeekAddExpSum; /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; */ private int bpTierType; @@ -86,62 +90,25 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_optional_reward = 2; - * @return whether the takenPremiumOptionalReward field is set + * optional uint64 taken_premium_reward2 = 2; + * @return whether the takenPremiumReward2 field is set */ - public boolean hasTakenPremiumOptionalReward() { + public boolean hasTakenPremiumReward2() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 taken_premium_optional_reward = 2; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumOptionalReward() { - bitField0_ &= ~0x00000001; - takenPremiumOptionalReward = 0L; - return this; - } - - /** - * optional uint64 taken_premium_optional_reward = 2; - * @return the takenPremiumOptionalReward - */ - public long getTakenPremiumOptionalReward() { - return takenPremiumOptionalReward; - } - - /** - * optional uint64 taken_premium_optional_reward = 2; - * @param value the takenPremiumOptionalReward to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) { - bitField0_ |= 0x00000001; - takenPremiumOptionalReward = value; - return this; - } - - /** - * optional uint64 taken_premium_reward2 = 3; - * @return whether the takenPremiumReward2 field is set - */ - public boolean hasTakenPremiumReward2() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint64 taken_premium_reward2 = 3; + * optional uint64 taken_premium_reward2 = 2; * @return this */ public BattlePassInfoNotify clearTakenPremiumReward2() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; takenPremiumReward2 = 0L; return this; } /** - * optional uint64 taken_premium_reward2 = 3; + * optional uint64 taken_premium_reward2 = 2; * @return the takenPremiumReward2 */ public long getTakenPremiumReward2() { @@ -149,147 +116,48 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward2 = 3; + * optional uint64 taken_premium_reward2 = 2; * @param value the takenPremiumReward2 to set * @return this */ public BattlePassInfoNotify setTakenPremiumReward2(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; takenPremiumReward2 = value; return this; } /** - * optional uint64 taken_premium_extended_reward = 4; - * @return whether the takenPremiumExtendedReward field is set - */ - public boolean hasTakenPremiumExtendedReward() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint64 taken_premium_extended_reward = 4; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumExtendedReward() { - bitField0_ &= ~0x00000004; - takenPremiumExtendedReward = 0L; - return this; - } - - /** - * optional uint64 taken_premium_extended_reward = 4; - * @return the takenPremiumExtendedReward - */ - public long getTakenPremiumExtendedReward() { - return takenPremiumExtendedReward; - } - - /** - * optional uint64 taken_premium_extended_reward = 4; - * @param value the takenPremiumExtendedReward to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) { - bitField0_ |= 0x00000004; - takenPremiumExtendedReward = value; - return this; - } - - /** - * optional uint64 taken_free_extended_reward = 8; - * @return whether the takenFreeExtendedReward field is set - */ - public boolean hasTakenFreeExtendedReward() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint64 taken_free_extended_reward = 8; - * @return this - */ - public BattlePassInfoNotify clearTakenFreeExtendedReward() { - bitField0_ &= ~0x00000008; - takenFreeExtendedReward = 0L; - return this; - } - - /** - * optional uint64 taken_free_extended_reward = 8; - * @return the takenFreeExtendedReward - */ - public long getTakenFreeExtendedReward() { - return takenFreeExtendedReward; - } - - /** - * optional uint64 taken_free_extended_reward = 8; - * @param value the takenFreeExtendedReward to set - * @return this - */ - public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { - bitField0_ |= 0x00000008; - takenFreeExtendedReward = value; - return this; - } - - /** - * optional uint64 taken_premium_reward1 = 9; - * @return whether the takenPremiumReward1 field is set - */ - public boolean hasTakenPremiumReward1() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint64 taken_premium_reward1 = 9; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumReward1() { - bitField0_ &= ~0x00000010; - takenPremiumReward1 = 0L; - return this; - } - - /** - * optional uint64 taken_premium_reward1 = 9; - * @return the takenPremiumReward1 - */ - public long getTakenPremiumReward1() { - return takenPremiumReward1; - } - - /** - * optional uint64 taken_premium_reward1 = 9; - * @param value the takenPremiumReward1 to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumReward1(final long value) { - bitField0_ |= 0x00000010; - takenPremiumReward1 = value; - return this; - } - - /** - * optional uint64 taken_free_reward = 10; + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 7; * @return whether the takenFreeReward field is set */ public boolean hasTakenFreeReward() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint64 taken_free_reward = 10; + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 7; * @return this */ public BattlePassInfoNotify clearTakenFreeReward() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000002; takenFreeReward = 0L; return this; } /** - * optional uint64 taken_free_reward = 10; + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 7; * @return the takenFreeReward */ public long getTakenFreeReward() { @@ -297,73 +165,188 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_free_reward = 10; + * 
+     *  the difficult ones
+     *
+ * + * optional uint64 taken_free_reward = 7; * @param value the takenFreeReward to set * @return this */ public BattlePassInfoNotify setTakenFreeReward(final long value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; takenFreeReward = value; return this; } /** - * optional uint32 cur_week_add_exp_sum = 1; - * @return whether the curWeekAddExpSum field is set + * optional uint64 taken_premium_reward1 = 8; + * @return whether the takenPremiumReward1 field is set */ - public boolean hasCurWeekAddExpSum() { + public boolean hasTakenPremiumReward1() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint64 taken_premium_reward1 = 8; + * @return this + */ + public BattlePassInfoNotify clearTakenPremiumReward1() { + bitField0_ &= ~0x00000004; + takenPremiumReward1 = 0L; + return this; + } + + /** + * optional uint64 taken_premium_reward1 = 8; + * @return the takenPremiumReward1 + */ + public long getTakenPremiumReward1() { + return takenPremiumReward1; + } + + /** + * optional uint64 taken_premium_reward1 = 8; + * @param value the takenPremiumReward1 to set + * @return this + */ + public BattlePassInfoNotify setTakenPremiumReward1(final long value) { + bitField0_ |= 0x00000004; + takenPremiumReward1 = value; + return this; + } + + /** + * optional uint64 taken_premium_extended_reward = 10; + * @return whether the takenPremiumExtendedReward field is set + */ + public boolean hasTakenPremiumExtendedReward() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint64 taken_premium_extended_reward = 10; + * @return this + */ + public BattlePassInfoNotify clearTakenPremiumExtendedReward() { + bitField0_ &= ~0x00000008; + takenPremiumExtendedReward = 0L; + return this; + } + + /** + * optional uint64 taken_premium_extended_reward = 10; + * @return the takenPremiumExtendedReward + */ + public long getTakenPremiumExtendedReward() { + return takenPremiumExtendedReward; + } + + /** + * optional uint64 taken_premium_extended_reward = 10; + * @param value the takenPremiumExtendedReward to set + * @return this + */ + public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) { + bitField0_ |= 0x00000008; + takenPremiumExtendedReward = value; + return this; + } + + /** + * optional uint64 taken_free_extended_reward = 11; + * @return whether the takenFreeExtendedReward field is set + */ + public boolean hasTakenFreeExtendedReward() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint64 taken_free_extended_reward = 11; + * @return this + */ + public BattlePassInfoNotify clearTakenFreeExtendedReward() { + bitField0_ &= ~0x00000010; + takenFreeExtendedReward = 0L; + return this; + } + + /** + * optional uint64 taken_free_extended_reward = 11; + * @return the takenFreeExtendedReward + */ + public long getTakenFreeExtendedReward() { + return takenFreeExtendedReward; + } + + /** + * optional uint64 taken_free_extended_reward = 11; + * @param value the takenFreeExtendedReward to set + * @return this + */ + public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { + bitField0_ |= 0x00000010; + takenFreeExtendedReward = value; + return this; + } + + /** + * optional uint64 taken_premium_optional_reward = 15; + * @return whether the takenPremiumOptionalReward field is set + */ + public boolean hasTakenPremiumOptionalReward() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint64 taken_premium_optional_reward = 15; + * @return this + */ + public BattlePassInfoNotify clearTakenPremiumOptionalReward() { + bitField0_ &= ~0x00000020; + takenPremiumOptionalReward = 0L; + return this; + } + + /** + * optional uint64 taken_premium_optional_reward = 15; + * @return the takenPremiumOptionalReward + */ + public long getTakenPremiumOptionalReward() { + return takenPremiumOptionalReward; + } + + /** + * optional uint64 taken_premium_optional_reward = 15; + * @param value the takenPremiumOptionalReward to set + * @return this + */ + public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) { + bitField0_ |= 0x00000020; + takenPremiumOptionalReward = value; + return this; + } + + /** + * optional uint32 cur_bp_id = 1; + * @return whether the curBpId field is set + */ + public boolean hasCurBpId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 cur_week_add_exp_sum = 1; - * @return this - */ - public BattlePassInfoNotify clearCurWeekAddExpSum() { - bitField0_ &= ~0x00000040; - curWeekAddExpSum = 0; - return this; - } - - /** - * optional uint32 cur_week_add_exp_sum = 1; - * @return the curWeekAddExpSum - */ - public int getCurWeekAddExpSum() { - return curWeekAddExpSum; - } - - /** - * optional uint32 cur_week_add_exp_sum = 1; - * @param value the curWeekAddExpSum to set - * @return this - */ - public BattlePassInfoNotify setCurWeekAddExpSum(final int value) { - bitField0_ |= 0x00000040; - curWeekAddExpSum = value; - return this; - } - - /** - * optional uint32 cur_bp_id = 5; - * @return whether the curBpId field is set - */ - public boolean hasCurBpId() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional uint32 cur_bp_id = 5; + * optional uint32 cur_bp_id = 1; * @return this */ public BattlePassInfoNotify clearCurBpId() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; curBpId = 0; return this; } /** - * optional uint32 cur_bp_id = 5; + * optional uint32 cur_bp_id = 1; * @return the curBpId */ public int getCurBpId() { @@ -371,16 +354,53 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 cur_bp_id = 5; + * optional uint32 cur_bp_id = 1; * @param value the curBpId to set * @return this */ public BattlePassInfoNotify setCurBpId(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; curBpId = value; return this; } + /** + * optional uint32 level = 4; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 level = 4; + * @return this + */ + public BattlePassInfoNotify clearLevel() { + bitField0_ &= ~0x00000080; + level = 0; + return this; + } + + /** + * optional uint32 level = 4; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 4; + * @param value the level to set + * @return this + */ + public BattlePassInfoNotify setLevel(final int value) { + bitField0_ |= 0x00000080; + level = value; + return this; + } + /** * optional uint32 exp = 12; * @return whether the exp field is set @@ -419,44 +439,44 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 level = 13; - * @return whether the level field is set + * optional uint32 cur_week_add_exp_sum = 14; + * @return whether the curWeekAddExpSum field is set */ - public boolean hasLevel() { + public boolean hasCurWeekAddExpSum() { return (bitField0_ & 0x00000200) != 0; } /** - * optional uint32 level = 13; + * optional uint32 cur_week_add_exp_sum = 14; * @return this */ - public BattlePassInfoNotify clearLevel() { + public BattlePassInfoNotify clearCurWeekAddExpSum() { bitField0_ &= ~0x00000200; - level = 0; + curWeekAddExpSum = 0; return this; } /** - * optional uint32 level = 13; - * @return the level + * optional uint32 cur_week_add_exp_sum = 14; + * @return the curWeekAddExpSum */ - public int getLevel() { - return level; + public int getCurWeekAddExpSum() { + return curWeekAddExpSum; } /** - * optional uint32 level = 13; - * @param value the level to set + * optional uint32 cur_week_add_exp_sum = 14; + * @param value the curWeekAddExpSum to set * @return this */ - public BattlePassInfoNotify setLevel(final int value) { + public BattlePassInfoNotify setCurWeekAddExpSum(final int value) { bitField0_ |= 0x00000200; - level = value; + curWeekAddExpSum = value; return this; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; * @return whether the bpTierType field is set */ public boolean hasBpTierType() { @@ -464,7 +484,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; * @return this */ public BattlePassInfoNotify clearBpTierType() { @@ -474,7 +494,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; * @return the bpTierType */ public BpTierType getBpTierType() { @@ -507,7 +527,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 5; * @param value the bpTierType to set * @return this */ @@ -522,16 +542,16 @@ public final class BattlePassInfoNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - takenPremiumOptionalReward = other.takenPremiumOptionalReward; takenPremiumReward2 = other.takenPremiumReward2; + takenFreeReward = other.takenFreeReward; + takenPremiumReward1 = other.takenPremiumReward1; takenPremiumExtendedReward = other.takenPremiumExtendedReward; takenFreeExtendedReward = other.takenFreeExtendedReward; - takenPremiumReward1 = other.takenPremiumReward1; - takenFreeReward = other.takenFreeReward; - curWeekAddExpSum = other.curWeekAddExpSum; + takenPremiumOptionalReward = other.takenPremiumOptionalReward; curBpId = other.curBpId; - exp = other.exp; level = other.level; + exp = other.exp; + curWeekAddExpSum = other.curWeekAddExpSum; bpTierType = other.bpTierType; } return this; @@ -543,35 +563,35 @@ public final class BattlePassInfoNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasTakenPremiumOptionalReward()) { - setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); - } if (other.hasTakenPremiumReward2()) { setTakenPremiumReward2(other.takenPremiumReward2); } + if (other.hasTakenFreeReward()) { + setTakenFreeReward(other.takenFreeReward); + } + if (other.hasTakenPremiumReward1()) { + setTakenPremiumReward1(other.takenPremiumReward1); + } if (other.hasTakenPremiumExtendedReward()) { setTakenPremiumExtendedReward(other.takenPremiumExtendedReward); } if (other.hasTakenFreeExtendedReward()) { setTakenFreeExtendedReward(other.takenFreeExtendedReward); } - if (other.hasTakenPremiumReward1()) { - setTakenPremiumReward1(other.takenPremiumReward1); - } - if (other.hasTakenFreeReward()) { - setTakenFreeReward(other.takenFreeReward); - } - if (other.hasCurWeekAddExpSum()) { - setCurWeekAddExpSum(other.curWeekAddExpSum); + if (other.hasTakenPremiumOptionalReward()) { + setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); } if (other.hasCurBpId()) { setCurBpId(other.curBpId); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasExp()) { setExp(other.exp); } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasCurWeekAddExpSum()) { + setCurWeekAddExpSum(other.curWeekAddExpSum); } if (other.hasBpTierType()) { setBpTierTypeValue(other.bpTierType); @@ -586,16 +606,16 @@ public final class BattlePassInfoNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - takenPremiumOptionalReward = 0L; takenPremiumReward2 = 0L; + takenFreeReward = 0L; + takenPremiumReward1 = 0L; takenPremiumExtendedReward = 0L; takenFreeExtendedReward = 0L; - takenPremiumReward1 = 0L; - takenFreeReward = 0L; - curWeekAddExpSum = 0; + takenPremiumOptionalReward = 0L; curBpId = 0; - exp = 0; level = 0; + exp = 0; + curWeekAddExpSum = 0; bpTierType = 0; return this; } @@ -620,16 +640,16 @@ public final class BattlePassInfoNotifyOuterClass { } BattlePassInfoNotify other = (BattlePassInfoNotify) o; return bitField0_ == other.bitField0_ - && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) + && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) + && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) && (!hasTakenPremiumExtendedReward() || takenPremiumExtendedReward == other.takenPremiumExtendedReward) && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward) - && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) - && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) - && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) + && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) && (!hasCurBpId() || curBpId == other.curBpId) - && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) + && (!hasExp() || exp == other.exp) + && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) && (!hasBpTierType() || bpTierType == other.bpTierType); } @@ -637,46 +657,46 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt64NoTag(takenPremiumOptionalReward); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); output.writeUInt64NoTag(takenPremiumReward2); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt64NoTag(takenFreeReward); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt64NoTag(takenPremiumExtendedReward); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); - output.writeUInt64NoTag(takenFreeExtendedReward); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); output.writeUInt64NoTag(takenPremiumReward1); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 80); - output.writeUInt64NoTag(takenFreeReward); + output.writeUInt64NoTag(takenPremiumExtendedReward); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt64NoTag(takenFreeExtendedReward); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt64NoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curWeekAddExpSum); + output.writeUInt32NoTag(curBpId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(curBpId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 96); output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(curWeekAddExpSum); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeEnumNoTag(bpTierType); } } @@ -685,34 +705,34 @@ public final class BattlePassInfoNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); } if ((bitField0_ & 0x00000400) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(bpTierType); @@ -728,53 +748,53 @@ public final class BattlePassInfoNotifyOuterClass { while (true) { switch (tag) { case 16: { - // takenPremiumOptionalReward - takenPremiumOptionalReward = input.readUInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { // takenPremiumReward2 takenPremiumReward2 = input.readUInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 56) { break; } } - case 32: { - // takenPremiumExtendedReward - takenPremiumExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000004; + case 56: { + // takenFreeReward + takenFreeReward = input.readUInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // takenFreeExtendedReward - takenFreeExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { // takenPremiumReward1 takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // takenFreeReward - takenFreeReward = input.readUInt64(); + // takenPremiumExtendedReward + takenPremiumExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // takenFreeExtendedReward + takenFreeExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // takenPremiumOptionalReward + takenPremiumOptionalReward = input.readUInt64(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 8) { @@ -782,17 +802,17 @@ public final class BattlePassInfoNotifyOuterClass { } } case 8: { - // curWeekAddExpSum - curWeekAddExpSum = input.readUInt32(); + // curBpId + curBpId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { - // curBpId - curBpId = input.readUInt32(); + case 32: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 96) { @@ -804,20 +824,20 @@ public final class BattlePassInfoNotifyOuterClass { exp = input.readUInt32(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // level - level = input.readUInt32(); + case 112: { + // curWeekAddExpSum + curWeekAddExpSum = input.readUInt32(); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 88) { + if (tag != 40) { break; } } - case 88: { + case 40: { // bpTierType final int value = input.readInt32(); if (BpTierType.forNumber(value) != null) { @@ -847,34 +867,34 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); + output.writeUInt32(FieldNames.curBpId, curBpId); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.curBpId, curBpId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000100) != 0) { output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000200) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); } if ((bitField0_ & 0x00000400) != 0) { output.writeEnum(FieldNames.bpTierType, bpTierType, BpTierType.converter()); @@ -889,60 +909,12 @@ public final class BattlePassInfoNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 736311903: - case 548161422: { - if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { - if (!input.trySkipNullValue()) { - takenPremiumOptionalReward = input.readUInt64(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 226926899: case 1195903363: { if (input.isAtField(FieldNames.takenPremiumReward2)) { if (!input.trySkipNullValue()) { takenPremiumReward2 = input.readUInt64(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1290021512: - case -2138632299: { - if (input.isAtField(FieldNames.takenPremiumExtendedReward)) { - if (!input.trySkipNullValue()) { - takenPremiumExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1116117893: - case 1257087386: { - if (input.isAtField(FieldNames.takenFreeExtendedReward)) { - if (!input.trySkipNullValue()) { - takenFreeExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 226926898: - case 1195903362: { - if (input.isAtField(FieldNames.takenPremiumReward1)) { - if (!input.trySkipNullValue()) { - takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -954,19 +926,55 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.takenFreeReward)) { if (!input.trySkipNullValue()) { takenFreeReward = input.readUInt64(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case 835771131: - case 26830815: { - if (input.isAtField(FieldNames.curWeekAddExpSum)) { + case 226926898: + case 1195903362: { + if (input.isAtField(FieldNames.takenPremiumReward1)) { if (!input.trySkipNullValue()) { - curWeekAddExpSum = input.readUInt32(); - bitField0_ |= 0x00000040; + takenPremiumReward1 = input.readUInt64(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1290021512: + case -2138632299: { + if (input.isAtField(FieldNames.takenPremiumExtendedReward)) { + if (!input.trySkipNullValue()) { + takenPremiumExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1116117893: + case 1257087386: { + if (input.isAtField(FieldNames.takenFreeExtendedReward)) { + if (!input.trySkipNullValue()) { + takenFreeExtendedReward = input.readUInt64(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 736311903: + case 548161422: { + if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { + if (!input.trySkipNullValue()) { + takenPremiumOptionalReward = input.readUInt64(); + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -978,6 +986,17 @@ public final class BattlePassInfoNotifyOuterClass { if (input.isAtField(FieldNames.curBpId)) { if (!input.trySkipNullValue()) { curBpId = input.readUInt32(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -996,10 +1015,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 835771131: + case 26830815: { + if (input.isAtField(FieldNames.curWeekAddExpSum)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + curWeekAddExpSum = input.readUInt32(); bitField0_ |= 0x00000200; } } else { @@ -1219,25 +1239,25 @@ public final class BattlePassInfoNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); - static final FieldName takenPremiumReward2 = FieldName.forField("takenPremiumReward2", "taken_premium_reward2"); + static final FieldName takenFreeReward = FieldName.forField("takenFreeReward", "taken_free_reward"); + + static final FieldName takenPremiumReward1 = FieldName.forField("takenPremiumReward1", "taken_premium_reward1"); + static final FieldName takenPremiumExtendedReward = FieldName.forField("takenPremiumExtendedReward", "taken_premium_extended_reward"); static final FieldName takenFreeExtendedReward = FieldName.forField("takenFreeExtendedReward", "taken_free_extended_reward"); - static final FieldName takenPremiumReward1 = FieldName.forField("takenPremiumReward1", "taken_premium_reward1"); - - static final FieldName takenFreeReward = FieldName.forField("takenFreeReward", "taken_free_reward"); - - static final FieldName curWeekAddExpSum = FieldName.forField("curWeekAddExpSum", "cur_week_add_exp_sum"); + static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); static final FieldName curBpId = FieldName.forField("curBpId", "cur_bp_id"); + static final FieldName level = FieldName.forField("level"); + static final FieldName exp = FieldName.forField("exp"); - static final FieldName level = FieldName.forField("level"); + static final FieldName curWeekAddExpSum = FieldName.forField("curWeekAddExpSum", "cur_week_add_exp_sum"); static final FieldName bpTierType = FieldName.forField("bpTierType", "bp_tier_type"); } diff --git a/src/generated/main/emu/lunarcore/proto/BattleStatisticsOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleStatisticsOuterClass.java index 162e010..f44a275 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleStatisticsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleStatisticsOuterClass.java @@ -96,6 +96,11 @@ public final class BattleStatisticsOuterClass { */ private final RepeatedMessage customValues = RepeatedMessage.newEmptyInstance(CustomValuesEntry.getFactory()); + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + */ + private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); + private BattleStatistics() { } @@ -761,6 +766,74 @@ public final class BattleStatisticsOuterClass { return this; } + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * @return whether the battleTargetInfo field is set + */ + public boolean hasBattleTargetInfo() { + return (bitField0_ & 0x00004000) != 0; + } + + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * @return this + */ + public BattleStatistics clearBattleTargetInfo() { + bitField0_ &= ~0x00004000; + battleTargetInfo.clear(); + return this; + } + + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * + * 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 #getMutableBattleTargetInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBattleTargetInfo() { + return battleTargetInfo; + } + + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * + * 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 getMutableBattleTargetInfo() { + bitField0_ |= 0x00004000; + return battleTargetInfo; + } + + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * @param value the battleTargetInfo to add + * @return this + */ + public BattleStatistics addBattleTargetInfo(final BattleTargetInfoEntry value) { + bitField0_ |= 0x00004000; + battleTargetInfo.add(value); + return this; + } + + /** + * repeated .BattleStatistics.BattleTargetInfoEntry battle_target_info = 28; + * @param values the battleTargetInfo to add + * @return this + */ + public BattleStatistics addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { + bitField0_ |= 0x00004000; + battleTargetInfo.addAll(values); + return this; + } + @Override public BattleStatistics copyFrom(final BattleStatistics other) { cachedSize = other.cachedSize; @@ -780,6 +853,7 @@ public final class BattleStatisticsOuterClass { avatarIdList.copyFrom(other.avatarIdList); battleAvatarList.copyFrom(other.battleAvatarList); customValues.copyFrom(other.customValues); + battleTargetInfo.copyFrom(other.battleTargetInfo); } return this; } @@ -832,6 +906,9 @@ public final class BattleStatisticsOuterClass { if (other.hasCustomValues()) { getMutableCustomValues().addAll(other.customValues); } + if (other.hasBattleTargetInfo()) { + getMutableBattleTargetInfo().addAll(other.battleTargetInfo); + } return this; } @@ -856,6 +933,7 @@ public final class BattleStatisticsOuterClass { avatarIdList.clear(); battleAvatarList.clear(); customValues.clear(); + battleTargetInfo.clear(); return this; } @@ -869,6 +947,7 @@ public final class BattleStatisticsOuterClass { avatarIdList.clear(); battleAvatarList.clearQuick(); customValues.clearQuick(); + battleTargetInfo.clearQuick(); return this; } @@ -895,7 +974,8 @@ public final class BattleStatisticsOuterClass { && (!hasEndReason() || endReason == other.endReason) && (!hasAvatarIdList() || avatarIdList.equals(other.avatarIdList)) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) - && (!hasCustomValues() || customValues.equals(other.customValues)); + && (!hasCustomValues() || customValues.equals(other.customValues)) + && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)); } @Override @@ -962,6 +1042,12 @@ public final class BattleStatisticsOuterClass { output.writeMessageNoTag(customValues.get(i)); } } + if ((bitField0_ & 0x00004000) != 0) { + for (int i = 0; i < battleTargetInfo.length(); i++) { + output.writeRawLittleEndian16((short) 482); + output.writeMessageNoTag(battleTargetInfo.get(i)); + } + } } @Override @@ -1009,6 +1095,9 @@ public final class BattleStatisticsOuterClass { if ((bitField0_ & 0x00002000) != 0) { size += (1 * customValues.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(customValues); } + if ((bitField0_ & 0x00004000) != 0) { + size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); + } return size; } @@ -1142,6 +1231,14 @@ public final class BattleStatisticsOuterClass { // customValues tag = input.readRepeatedMessage(customValues, tag); bitField0_ |= 0x00002000; + if (tag != 226) { + break; + } + } + case 226: { + // battleTargetInfo + tag = input.readRepeatedMessage(battleTargetInfo, tag); + bitField0_ |= 0x00004000; if (tag != 0) { break; } @@ -1211,6 +1308,9 @@ public final class BattleStatisticsOuterClass { if ((bitField0_ & 0x00002000) != 0) { output.writeRepeatedMessage(FieldNames.customValues, customValues); } + if ((bitField0_ & 0x00004000) != 0) { + output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); + } output.endObject(); } @@ -1394,6 +1494,18 @@ public final class BattleStatisticsOuterClass { } break; } + case 1657979063: + case 2141477269: { + if (input.isAtField(FieldNames.battleTargetInfo)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(battleTargetInfo); + bitField0_ |= 0x00004000; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -1788,6 +1900,353 @@ public final class BattleStatisticsOuterClass { } } + /** + * Protobuf type {@code BattleTargetInfoEntry} + */ + public static final class BattleTargetInfoEntry extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 key = 1; + */ + private int key; + + /** + * optional .BattleTargetList value = 2; + */ + private final BattleTargetListOuterClass.BattleTargetList value_ = BattleTargetListOuterClass.BattleTargetList.newInstance(); + + private BattleTargetInfoEntry() { + } + + /** + * @return a new empty instance of {@code BattleTargetInfoEntry} + */ + public static BattleTargetInfoEntry newInstance() { + return new BattleTargetInfoEntry(); + } + + /** + * optional uint32 key = 1; + * @return whether the key field is set + */ + public boolean hasKey() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 key = 1; + * @return this + */ + public BattleTargetInfoEntry clearKey() { + bitField0_ &= ~0x00000001; + key = 0; + return this; + } + + /** + * optional uint32 key = 1; + * @return the key + */ + public int getKey() { + return key; + } + + /** + * optional uint32 key = 1; + * @param value the key to set + * @return this + */ + public BattleTargetInfoEntry setKey(final int value) { + bitField0_ |= 0x00000001; + key = value; + return this; + } + + /** + * optional .BattleTargetList value = 2; + * @return whether the value_ field is set + */ + public boolean hasValue() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .BattleTargetList value = 2; + * @return this + */ + public BattleTargetInfoEntry clearValue() { + bitField0_ &= ~0x00000002; + value_.clear(); + return this; + } + + /** + * optional .BattleTargetList value = 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 #getMutableValue()} if you want to modify it. + * + * @return internal storage object for reading + */ + public BattleTargetListOuterClass.BattleTargetList getValue() { + return value_; + } + + /** + * optional .BattleTargetList value = 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 BattleTargetListOuterClass.BattleTargetList getMutableValue() { + bitField0_ |= 0x00000002; + return value_; + } + + /** + * optional .BattleTargetList value = 2; + * @param value the value_ to set + * @return this + */ + public BattleTargetInfoEntry setValue( + final BattleTargetListOuterClass.BattleTargetList value) { + bitField0_ |= 0x00000002; + value_.copyFrom(value); + return this; + } + + @Override + public BattleTargetInfoEntry copyFrom(final BattleTargetInfoEntry other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + key = other.key; + value_.copyFrom(other.value_); + } + return this; + } + + @Override + public BattleTargetInfoEntry mergeFrom(final BattleTargetInfoEntry other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasKey()) { + setKey(other.key); + } + if (other.hasValue()) { + getMutableValue().mergeFrom(other.value_); + } + return this; + } + + @Override + public BattleTargetInfoEntry clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + key = 0; + value_.clear(); + return this; + } + + @Override + public BattleTargetInfoEntry clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + value_.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof BattleTargetInfoEntry)) { + return false; + } + BattleTargetInfoEntry other = (BattleTargetInfoEntry) o; + return bitField0_ == other.bitField0_ + && (!hasKey() || key == other.key) + && (!hasValue() || value_.equals(other.value_)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(key); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(value_); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(key); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(value_); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public BattleTargetInfoEntry mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // key + key = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // value_ + input.readMessage(value_); + bitField0_ |= 0x00000002; + 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.key, key); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.value_, value_); + } + output.endObject(); + } + + @Override + public BattleTargetInfoEntry mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 106079: { + if (input.isAtField(FieldNames.key)) { + if (!input.trySkipNullValue()) { + key = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 111972721: { + if (input.isAtField(FieldNames.value_)) { + if (!input.trySkipNullValue()) { + input.readMessage(value_); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public BattleTargetInfoEntry clone() { + return new BattleTargetInfoEntry().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static BattleTargetInfoEntry parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new BattleTargetInfoEntry(), data).checkInitialized(); + } + + public static BattleTargetInfoEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new BattleTargetInfoEntry(), input).checkInitialized(); + } + + public static BattleTargetInfoEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new BattleTargetInfoEntry(), input).checkInitialized(); + } + + /** + * @return factory for creating BattleTargetInfoEntry messages + */ + public static MessageFactory getFactory() { + return BattleTargetInfoEntryFactory.INSTANCE; + } + + private enum BattleTargetInfoEntryFactory implements MessageFactory { + INSTANCE; + + @Override + public BattleTargetInfoEntry create() { + return BattleTargetInfoEntry.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName key = FieldName.forField("key"); + + static final FieldName value_ = FieldName.forField("value"); + } + } + private enum BattleStatisticsFactory implements MessageFactory { INSTANCE; @@ -1828,6 +2287,8 @@ public final class BattleStatisticsOuterClass { static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); static final FieldName customValues = FieldName.forField("customValues", "custom_values"); + + static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BattleTargetOuterClass.java b/src/generated/main/emu/lunarcore/proto/BattleTargetOuterClass.java index 7ab2d5e..938f488 100644 --- a/src/generated/main/emu/lunarcore/proto/BattleTargetOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattleTargetOuterClass.java @@ -28,6 +28,11 @@ public final class BattleTargetOuterClass { */ private int progress; + /** + * optional uint32 total_progress = 3; + */ + private int totalProgress; + private BattleTarget() { } @@ -112,6 +117,43 @@ public final class BattleTargetOuterClass { return this; } + /** + * optional uint32 total_progress = 3; + * @return whether the totalProgress field is set + */ + public boolean hasTotalProgress() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 total_progress = 3; + * @return this + */ + public BattleTarget clearTotalProgress() { + bitField0_ &= ~0x00000004; + totalProgress = 0; + return this; + } + + /** + * optional uint32 total_progress = 3; + * @return the totalProgress + */ + public int getTotalProgress() { + return totalProgress; + } + + /** + * optional uint32 total_progress = 3; + * @param value the totalProgress to set + * @return this + */ + public BattleTarget setTotalProgress(final int value) { + bitField0_ |= 0x00000004; + totalProgress = value; + return this; + } + @Override public BattleTarget copyFrom(final BattleTarget other) { cachedSize = other.cachedSize; @@ -119,6 +161,7 @@ public final class BattleTargetOuterClass { bitField0_ = other.bitField0_; id = other.id; progress = other.progress; + totalProgress = other.totalProgress; } return this; } @@ -135,6 +178,9 @@ public final class BattleTargetOuterClass { if (other.hasProgress()) { setProgress(other.progress); } + if (other.hasTotalProgress()) { + setTotalProgress(other.totalProgress); + } return this; } @@ -147,6 +193,7 @@ public final class BattleTargetOuterClass { bitField0_ = 0; id = 0; progress = 0; + totalProgress = 0; return this; } @@ -171,7 +218,8 @@ public final class BattleTargetOuterClass { BattleTarget other = (BattleTarget) o; return bitField0_ == other.bitField0_ && (!hasId() || id == other.id) - && (!hasProgress() || progress == other.progress); + && (!hasProgress() || progress == other.progress) + && (!hasTotalProgress() || totalProgress == other.totalProgress); } @Override @@ -184,6 +232,10 @@ public final class BattleTargetOuterClass { output.writeRawByte((byte) 16); output.writeUInt32NoTag(progress); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(totalProgress); + } } @Override @@ -195,6 +247,9 @@ public final class BattleTargetOuterClass { if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalProgress); + } return size; } @@ -219,6 +274,15 @@ public final class BattleTargetOuterClass { progress = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // totalProgress + totalProgress = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 0) { break; } @@ -246,6 +310,9 @@ public final class BattleTargetOuterClass { if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.progress, progress); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.totalProgress, totalProgress); + } output.endObject(); } @@ -278,6 +345,18 @@ public final class BattleTargetOuterClass { } break; } + case -974619247: + case -2094299960: { + if (input.isAtField(FieldNames.totalProgress)) { + if (!input.trySkipNullValue()) { + totalProgress = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -333,6 +412,8 @@ public final class BattleTargetOuterClass { static final FieldName id = FieldName.forField("id"); static final FieldName progress = FieldName.forField("progress"); + + static final FieldName totalProgress = FieldName.forField("totalProgress", "total_progress"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java index 040f509..b6efcff 100644 --- a/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java @@ -21,12 +21,12 @@ public final class BoardDataSyncOuterClass { private static final long serialVersionUID = 0L; /** - * optional string signature = 12; + * optional string signature = 6; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_list = 15; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -41,7 +41,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @return whether the signature field is set */ public boolean hasSignature() { @@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @return this */ public BoardDataSync clearSignature() { @@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @return the signature */ public String getSignature() { @@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @param value the signature to set * @return this */ @@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 12; + * optional string signature = 6; * @param value the signature to set * @return this */ @@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_list = 15; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_list = 15; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { @@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_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. @@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_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 @@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_list = 15; * @param value the unlockedHeadIconList to add * @return this */ @@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 13; + * repeated .HeadIcon unlocked_head_icon_list = 15; * @param values the unlockedHeadIconList to add * @return this */ @@ -240,12 +240,12 @@ public final class BoardDataSyncOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 122); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 50: { // signature input.readString(signature); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java index 237bb62..fe3c3e2 100644 --- a/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuffInfoOuterClass.java @@ -22,37 +22,37 @@ public final class BuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 add_time_ms = 1; + * optional uint64 add_time_ms = 15; */ private long addTimeMs; /** - * optional float life_time = 3; + * optional float life_time = 11; */ private float lifeTime; /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 3; */ private int buffId; /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 5; */ private int baseAvatarId; /** - * optional uint32 level = 12; + * optional uint32 level = 7; */ private int level; /** - * optional uint32 count = 13; + * optional uint32 count = 8; */ private int count; /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; */ private final RepeatedMessage dynamicValues = RepeatedMessage.newEmptyInstance(DynamicValuesEntry.getFactory()); @@ -67,7 +67,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 1; + * optional uint64 add_time_ms = 15; * @return whether the addTimeMs field is set */ public boolean hasAddTimeMs() { @@ -75,7 +75,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 1; + * optional uint64 add_time_ms = 15; * @return this */ public BuffInfo clearAddTimeMs() { @@ -85,7 +85,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 1; + * optional uint64 add_time_ms = 15; * @return the addTimeMs */ public long getAddTimeMs() { @@ -93,7 +93,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint64 add_time_ms = 1; + * optional uint64 add_time_ms = 15; * @param value the addTimeMs to set * @return this */ @@ -104,7 +104,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 3; + * optional float life_time = 11; * @return whether the lifeTime field is set */ public boolean hasLifeTime() { @@ -112,7 +112,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 3; + * optional float life_time = 11; * @return this */ public BuffInfo clearLifeTime() { @@ -122,7 +122,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 3; + * optional float life_time = 11; * @return the lifeTime */ public float getLifeTime() { @@ -130,7 +130,7 @@ public final class BuffInfoOuterClass { } /** - * optional float life_time = 3; + * optional float life_time = 11; * @param value the lifeTime to set * @return this */ @@ -141,7 +141,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 3; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -149,7 +149,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 3; * @return this */ public BuffInfo clearBuffId() { @@ -159,7 +159,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 3; * @return the buffId */ public int getBuffId() { @@ -167,7 +167,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 buff_id = 4; + * optional uint32 buff_id = 3; * @param value the buffId to set * @return this */ @@ -178,7 +178,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 5; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -186,7 +186,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 5; * @return this */ public BuffInfo clearBaseAvatarId() { @@ -196,7 +196,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 5; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -204,7 +204,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 5; * @param value the baseAvatarId to set * @return this */ @@ -215,7 +215,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 7; * @return whether the level field is set */ public boolean hasLevel() { @@ -223,7 +223,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 7; * @return this */ public BuffInfo clearLevel() { @@ -233,7 +233,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 7; * @return the level */ public int getLevel() { @@ -241,7 +241,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 7; * @param value the level to set * @return this */ @@ -252,7 +252,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 13; + * optional uint32 count = 8; * @return whether the count field is set */ public boolean hasCount() { @@ -260,7 +260,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 13; + * optional uint32 count = 8; * @return this */ public BuffInfo clearCount() { @@ -270,7 +270,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 13; + * optional uint32 count = 8; * @return the count */ public int getCount() { @@ -278,7 +278,7 @@ public final class BuffInfoOuterClass { } /** - * optional uint32 count = 13; + * optional uint32 count = 8; * @param value the count to set * @return this */ @@ -289,7 +289,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @return whether the dynamicValues field is set */ public boolean hasDynamicValues() { @@ -297,7 +297,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @return this */ public BuffInfo clearDynamicValues() { @@ -307,7 +307,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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. @@ -321,7 +321,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 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 @@ -335,7 +335,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @param value the dynamicValues to add * @return this */ @@ -346,7 +346,7 @@ public final class BuffInfoOuterClass { } /** - * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 5; + * repeated .BuffInfo.DynamicValuesEntry dynamic_values = 4; * @param values the dynamicValues to add * @return this */ @@ -452,32 +452,32 @@ public final class BuffInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeUInt64NoTag(addTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 29); + output.writeRawByte((byte) 93); output.writeFloatNoTag(lifeTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < dynamicValues.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 34); output.writeMessageNoTag(dynamicValues.get(i)); } } @@ -517,61 +517,61 @@ public final class BuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // addTimeMs addTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 29) { + if (tag != 93) { break; } } - case 29: { + case 93: { // lifeTime lifeTime = input.readFloat(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 24) { break; } } - case 32: { + case 24: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { + case 40: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { + case 56: { // level level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 104) { + if (tag != 64) { break; } } - case 104: { + case 64: { // count count = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 42) { + if (tag != 34) { break; } } - case 42: { + case 34: { // dynamicValues tag = input.readRepeatedMessage(dynamicValues, tag); bitField0_ |= 0x00000040; diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java index 6e5f8eb..b681bbc 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsCsReqOuterClass.java @@ -19,20 +19,20 @@ public final class BuyGoodsCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 4; */ private int itemId; /** - * optional uint32 goods_num = 4; - */ - private int goodsNum; - - /** - * optional uint32 goods_id = 6; + * optional uint32 goods_id = 5; */ private int goodsId; + /** + * optional uint32 goods_num = 9; + */ + private int goodsNum; + /** * optional uint32 shop_id = 13; */ @@ -49,7 +49,7 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 4; * @return whether the itemId field is set */ public boolean hasItemId() { @@ -57,7 +57,7 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 4; * @return this */ public BuyGoodsCsReq clearItemId() { @@ -67,7 +67,7 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 4; * @return the itemId */ public int getItemId() { @@ -75,7 +75,7 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 4; * @param value the itemId to set * @return this */ @@ -86,62 +86,25 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 goods_num = 4; - * @return whether the goodsNum field is set + * optional uint32 goods_id = 5; + * @return whether the goodsId field is set */ - public boolean hasGoodsNum() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 goods_num = 4; - * @return this - */ - public BuyGoodsCsReq clearGoodsNum() { - bitField0_ &= ~0x00000002; - goodsNum = 0; - return this; - } - - /** - * optional uint32 goods_num = 4; - * @return the goodsNum - */ - public int getGoodsNum() { - return goodsNum; - } - - /** - * optional uint32 goods_num = 4; - * @param value the goodsNum to set - * @return this - */ - public BuyGoodsCsReq setGoodsNum(final int value) { - bitField0_ |= 0x00000002; - goodsNum = value; - return this; - } - - /** - * optional uint32 goods_id = 6; - * @return whether the goodsId field is set - */ - public boolean hasGoodsId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 goods_id = 6; + * optional uint32 goods_id = 5; * @return this */ public BuyGoodsCsReq clearGoodsId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; goodsId = 0; return this; } /** - * optional uint32 goods_id = 6; + * optional uint32 goods_id = 5; * @return the goodsId */ public int getGoodsId() { @@ -149,16 +112,53 @@ public final class BuyGoodsCsReqOuterClass { } /** - * optional uint32 goods_id = 6; + * optional uint32 goods_id = 5; * @param value the goodsId to set * @return this */ public BuyGoodsCsReq setGoodsId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; goodsId = value; return this; } + /** + * optional uint32 goods_num = 9; + * @return whether the goodsNum field is set + */ + public boolean hasGoodsNum() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 goods_num = 9; + * @return this + */ + public BuyGoodsCsReq clearGoodsNum() { + bitField0_ &= ~0x00000004; + goodsNum = 0; + return this; + } + + /** + * optional uint32 goods_num = 9; + * @return the goodsNum + */ + public int getGoodsNum() { + return goodsNum; + } + + /** + * optional uint32 goods_num = 9; + * @param value the goodsNum to set + * @return this + */ + public BuyGoodsCsReq setGoodsNum(final int value) { + bitField0_ |= 0x00000004; + goodsNum = value; + return this; + } + /** * optional uint32 shop_id = 13; * @return whether the shopId field is set @@ -202,8 +202,8 @@ public final class BuyGoodsCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; itemId = other.itemId; - goodsNum = other.goodsNum; goodsId = other.goodsId; + goodsNum = other.goodsNum; shopId = other.shopId; } return this; @@ -218,12 +218,12 @@ public final class BuyGoodsCsReqOuterClass { if (other.hasItemId()) { setItemId(other.itemId); } - if (other.hasGoodsNum()) { - setGoodsNum(other.goodsNum); - } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } + if (other.hasGoodsNum()) { + setGoodsNum(other.goodsNum); + } if (other.hasShopId()) { setShopId(other.shopId); } @@ -238,8 +238,8 @@ public final class BuyGoodsCsReqOuterClass { cachedSize = -1; bitField0_ = 0; itemId = 0; - goodsNum = 0; goodsId = 0; + goodsNum = 0; shopId = 0; return this; } @@ -265,24 +265,24 @@ public final class BuyGoodsCsReqOuterClass { BuyGoodsCsReq other = (BuyGoodsCsReq) o; return bitField0_ == other.bitField0_ && (!hasItemId() || itemId == other.itemId) - && (!hasGoodsNum() || goodsNum == other.goodsNum) && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasGoodsNum() || goodsNum == other.goodsNum) && (!hasShopId() || shopId == other.shopId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(goodsNum); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); @@ -297,10 +297,10 @@ public final class BuyGoodsCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsNum); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); @@ -315,27 +315,27 @@ public final class BuyGoodsCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // itemId itemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { - // goodsNum - goodsNum = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 40: { // goodsId goodsId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // goodsNum + goodsNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -372,10 +372,10 @@ public final class BuyGoodsCsReqOuterClass { output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.goodsNum, goodsNum); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.goodsNum, goodsNum); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.shopId, shopId); @@ -402,11 +402,11 @@ public final class BuyGoodsCsReqOuterClass { } break; } - case 2123191376: - case 1394923293: { - if (input.isAtField(FieldNames.goodsNum)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - goodsNum = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -414,11 +414,11 @@ public final class BuyGoodsCsReqOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case 2123191376: + case 1394923293: { + if (input.isAtField(FieldNames.goodsNum)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + goodsNum = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -492,10 +492,10 @@ public final class BuyGoodsCsReqOuterClass { static class FieldNames { static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num"); - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); + static final FieldName goodsNum = FieldName.forField("goodsNum", "goods_num"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java index 71cf4fb..fb3d1e6 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java @@ -19,27 +19,27 @@ public final class BuyGoodsScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 shop_id = 3; + * optional uint32 shop_id = 2; */ private int shopId; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 goods_id = 7; - */ - private int goodsId; - - /** - * optional uint32 goods_buy_times = 12; + * optional uint32 goods_buy_times = 8; */ private int goodsBuyTimes; /** - * optional .ItemList return_item_list = 14; + * optional uint32 goods_id = 11; + */ + private int goodsId; + + /** + * optional uint32 retcode = 14; + */ + private int retcode; + + /** + * optional .ItemList return_item_list = 7; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -54,7 +54,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 3; + * optional uint32 shop_id = 2; * @return whether the shopId field is set */ public boolean hasShopId() { @@ -62,7 +62,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 3; + * optional uint32 shop_id = 2; * @return this */ public BuyGoodsScRsp clearShopId() { @@ -72,7 +72,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 3; + * optional uint32 shop_id = 2; * @return the shopId */ public int getShopId() { @@ -80,7 +80,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 shop_id = 3; + * optional uint32 shop_id = 2; * @param value the shopId to set * @return this */ @@ -91,44 +91,44 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 goods_buy_times = 8; + * @return whether the goodsBuyTimes field is set */ - public boolean hasRetcode() { + public boolean hasGoodsBuyTimes() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 5; + * optional uint32 goods_buy_times = 8; * @return this */ - public BuyGoodsScRsp clearRetcode() { + public BuyGoodsScRsp clearGoodsBuyTimes() { bitField0_ &= ~0x00000002; - retcode = 0; + goodsBuyTimes = 0; return this; } /** - * optional uint32 retcode = 5; - * @return the retcode + * optional uint32 goods_buy_times = 8; + * @return the goodsBuyTimes */ - public int getRetcode() { - return retcode; + public int getGoodsBuyTimes() { + return goodsBuyTimes; } /** - * optional uint32 retcode = 5; - * @param value the retcode to set + * optional uint32 goods_buy_times = 8; + * @param value the goodsBuyTimes to set * @return this */ - public BuyGoodsScRsp setRetcode(final int value) { + public BuyGoodsScRsp setGoodsBuyTimes(final int value) { bitField0_ |= 0x00000002; - retcode = value; + goodsBuyTimes = value; return this; } /** - * optional uint32 goods_id = 7; + * optional uint32 goods_id = 11; * @return whether the goodsId field is set */ public boolean hasGoodsId() { @@ -136,7 +136,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 7; + * optional uint32 goods_id = 11; * @return this */ public BuyGoodsScRsp clearGoodsId() { @@ -146,7 +146,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 7; + * optional uint32 goods_id = 11; * @return the goodsId */ public int getGoodsId() { @@ -154,7 +154,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_id = 7; + * optional uint32 goods_id = 11; * @param value the goodsId to set * @return this */ @@ -165,44 +165,44 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 goods_buy_times = 12; - * @return whether the goodsBuyTimes field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasGoodsBuyTimes() { + public boolean hasRetcode() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 goods_buy_times = 12; + * optional uint32 retcode = 14; * @return this */ - public BuyGoodsScRsp clearGoodsBuyTimes() { + public BuyGoodsScRsp clearRetcode() { bitField0_ &= ~0x00000008; - goodsBuyTimes = 0; + retcode = 0; return this; } /** - * optional uint32 goods_buy_times = 12; - * @return the goodsBuyTimes + * optional uint32 retcode = 14; + * @return the retcode */ - public int getGoodsBuyTimes() { - return goodsBuyTimes; + public int getRetcode() { + return retcode; } /** - * optional uint32 goods_buy_times = 12; - * @param value the goodsBuyTimes to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public BuyGoodsScRsp setGoodsBuyTimes(final int value) { + public BuyGoodsScRsp setRetcode(final int value) { bitField0_ |= 0x00000008; - goodsBuyTimes = value; + retcode = value; return this; } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 7; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 7; * @return this */ public BuyGoodsScRsp clearReturnItemList() { @@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_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. @@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_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 @@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 14; + * optional .ItemList return_item_list = 7; * @param value the returnItemList to set * @return this */ @@ -264,9 +264,9 @@ public final class BuyGoodsScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; shopId = other.shopId; - retcode = other.retcode; - goodsId = other.goodsId; goodsBuyTimes = other.goodsBuyTimes; + goodsId = other.goodsId; + retcode = other.retcode; returnItemList.copyFrom(other.returnItemList); } return this; @@ -281,14 +281,14 @@ public final class BuyGoodsScRspOuterClass { if (other.hasShopId()) { setShopId(other.shopId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasGoodsBuyTimes()) { + setGoodsBuyTimes(other.goodsBuyTimes); } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } - if (other.hasGoodsBuyTimes()) { - setGoodsBuyTimes(other.goodsBuyTimes); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); @@ -304,9 +304,9 @@ public final class BuyGoodsScRspOuterClass { cachedSize = -1; bitField0_ = 0; shopId = 0; - retcode = 0; - goodsId = 0; goodsBuyTimes = 0; + goodsId = 0; + retcode = 0; returnItemList.clear(); return this; } @@ -333,32 +333,32 @@ public final class BuyGoodsScRspOuterClass { BuyGoodsScRsp other = (BuyGoodsScRsp) o; return bitField0_ == other.bitField0_ && (!hasShopId() || shopId == other.shopId) - && (!hasRetcode() || retcode == other.retcode) - && (!hasGoodsId() || goodsId == other.goodsId) && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) + && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasRetcode() || retcode == other.retcode) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(shopId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(goodsBuyTimes); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 58); output.writeMessageNoTag(returnItemList); } } @@ -370,13 +370,13 @@ public final class BuyGoodsScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -391,43 +391,43 @@ public final class BuyGoodsScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // shopId shopId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { - // retcode - retcode = input.readUInt32(); + case 64: { + // goodsBuyTimes + goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 88) { break; } } - case 56: { + case 88: { // goodsId goodsId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { - // goodsBuyTimes - goodsBuyTimes = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { + case 58: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000010; @@ -457,13 +457,13 @@ public final class BuyGoodsScRspOuterClass { output.writeUInt32(FieldNames.shopId, shopId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -490,10 +490,11 @@ public final class BuyGoodsScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1410858538: + case -230536540: { + if (input.isAtField(FieldNames.goodsBuyTimes)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -513,11 +514,10 @@ public final class BuyGoodsScRspOuterClass { } break; } - case -1410858538: - case -230536540: { - if (input.isAtField(FieldNames.goodsBuyTimes)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - goodsBuyTimes = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -591,11 +591,11 @@ public final class BuyGoodsScRspOuterClass { static class FieldNames { static final FieldName shopId = FieldName.forField("shopId", "shop_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java index 6a56a1f..3719b13 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java @@ -20,12 +20,7 @@ public final class ChallengeBossBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 IHNFPAOKKBA = 10; - */ - private int iHNFPAOKKBA; - - /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -40,62 +35,25 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * optional uint32 IHNFPAOKKBA = 10; - * @return whether the iHNFPAOKKBA field is set + * repeated uint32 buff_list = 9; + * @return whether the buffList field is set */ - public boolean hasIHNFPAOKKBA() { + public boolean hasBuffList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 IHNFPAOKKBA = 10; - * @return this - */ - public ChallengeBossBuffInfo clearIHNFPAOKKBA() { - bitField0_ &= ~0x00000001; - iHNFPAOKKBA = 0; - return this; - } - - /** - * optional uint32 IHNFPAOKKBA = 10; - * @return the iHNFPAOKKBA - */ - public int getIHNFPAOKKBA() { - return iHNFPAOKKBA; - } - - /** - * optional uint32 IHNFPAOKKBA = 10; - * @param value the iHNFPAOKKBA to set - * @return this - */ - public ChallengeBossBuffInfo setIHNFPAOKKBA(final int value) { - bitField0_ |= 0x00000001; - iHNFPAOKKBA = value; - return this; - } - - /** - * repeated uint32 buff_list = 6; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; * @return this */ public ChallengeBossBuffInfo clearBuffList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; buffList.clear(); return this; } /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; * * 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. @@ -109,7 +67,7 @@ public final class ChallengeBossBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -118,28 +76,28 @@ public final class ChallengeBossBuffInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableBuffList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return buffList; } /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; * @param value the buffList to add * @return this */ public ChallengeBossBuffInfo addBuffList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffList.add(value); return this; } /** - * repeated uint32 buff_list = 6; + * repeated uint32 buff_list = 9; * @param values the buffList to add * @return this */ public ChallengeBossBuffInfo addAllBuffList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffList.addAll(values); return this; } @@ -149,7 +107,6 @@ public final class ChallengeBossBuffInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - iHNFPAOKKBA = other.iHNFPAOKKBA; buffList.copyFrom(other.buffList); } return this; @@ -161,9 +118,6 @@ public final class ChallengeBossBuffInfoOuterClass { return this; } cachedSize = -1; - if (other.hasIHNFPAOKKBA()) { - setIHNFPAOKKBA(other.iHNFPAOKKBA); - } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } @@ -177,7 +131,6 @@ public final class ChallengeBossBuffInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - iHNFPAOKKBA = 0; buffList.clear(); return this; } @@ -203,19 +156,14 @@ public final class ChallengeBossBuffInfoOuterClass { } ChallengeBossBuffInfo other = (ChallengeBossBuffInfo) o; return bitField0_ == other.bitField0_ - && (!hasIHNFPAOKKBA() || iHNFPAOKKBA == other.iHNFPAOKKBA) && (!hasBuffList() || buffList.equals(other.buffList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(iHNFPAOKKBA); - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -225,9 +173,6 @@ public final class ChallengeBossBuffInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iHNFPAOKKBA); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(buffList); } return size; @@ -240,19 +185,10 @@ public final class ChallengeBossBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // iHNFPAOKKBA - iHNFPAOKKBA = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { + case 74: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -268,10 +204,10 @@ public final class ChallengeBossBuffInfoOuterClass { tag = input.readTag(); break; } - case 48: { + case 72: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; break; } } @@ -282,9 +218,6 @@ public final class ChallengeBossBuffInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.iHNFPAOKKBA, iHNFPAOKKBA); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.buffList, buffList); } output.endObject(); @@ -297,23 +230,12 @@ public final class ChallengeBossBuffInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1180377050: { - if (input.isAtField(FieldNames.iHNFPAOKKBA)) { - if (!input.trySkipNullValue()) { - iHNFPAOKKBA = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1522789487: case 55792906: { if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(buffList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -373,8 +295,6 @@ public final class ChallengeBossBuffInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName iHNFPAOKKBA = FieldName.forField("IHNFPAOKKBA"); - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java index ac5b258..38a99f4 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java @@ -19,28 +19,28 @@ public final class ChallengeBossInfoOuterClass { public static final class ChallengeBossInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional bool PPNAGBNIOAO = 10; - */ - private boolean pPNAGBNIOAO; - /** * 
-     *  map KCKMGDGIFIF = 8;
+     *  map MPHILJEPBDD = 3;
      *
* - * optional .ChallengeBossSingleNodeInfo second_node = 12; + * optional bool ACGHCDLBCGD = 14; */ - private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo secondNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); + private boolean aCGHCDLBCGD; /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; + * optional .ChallengeBossSingleNodeInfo first_node = 1; */ private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo firstNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); + /** + * optional .ChallengeBossSingleNodeInfo second_node = 5; + */ + private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo secondNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); + /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -48,7 +48,7 @@ public final class ChallengeBossInfoOuterClass { private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 11; */ private final RepeatedInt lineup1 = RepeatedInt.newEmptyInstance(); @@ -63,141 +63,78 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional bool PPNAGBNIOAO = 10; - * @return whether the pPNAGBNIOAO field is set + * 
+     *  map MPHILJEPBDD = 3;
+     *
+ * + * optional bool ACGHCDLBCGD = 14; + * @return whether the aCGHCDLBCGD field is set */ - public boolean hasPPNAGBNIOAO() { + public boolean hasACGHCDLBCGD() { return (bitField0_ & 0x00000001) != 0; } /** - * optional bool PPNAGBNIOAO = 10; + * 
+     *  map MPHILJEPBDD = 3;
+     *
+ * + * optional bool ACGHCDLBCGD = 14; * @return this */ - public ChallengeBossInfo clearPPNAGBNIOAO() { + public ChallengeBossInfo clearACGHCDLBCGD() { bitField0_ &= ~0x00000001; - pPNAGBNIOAO = false; - return this; - } - - /** - * optional bool PPNAGBNIOAO = 10; - * @return the pPNAGBNIOAO - */ - public boolean getPPNAGBNIOAO() { - return pPNAGBNIOAO; - } - - /** - * optional bool PPNAGBNIOAO = 10; - * @param value the pPNAGBNIOAO to set - * @return this - */ - public ChallengeBossInfo setPPNAGBNIOAO(final boolean value) { - bitField0_ |= 0x00000001; - pPNAGBNIOAO = value; + aCGHCDLBCGD = false; return this; } /** * 
-     *  map KCKMGDGIFIF = 8;
+     *  map MPHILJEPBDD = 3;
      *
* - * optional .ChallengeBossSingleNodeInfo second_node = 12; - * @return whether the secondNode field is set + * optional bool ACGHCDLBCGD = 14; + * @return the aCGHCDLBCGD */ - public boolean hasSecondNode() { + public boolean getACGHCDLBCGD() { + return aCGHCDLBCGD; + } + + /** + * 
+     *  map MPHILJEPBDD = 3;
+     *
+ * + * optional bool ACGHCDLBCGD = 14; + * @param value the aCGHCDLBCGD to set + * @return this + */ + public ChallengeBossInfo setACGHCDLBCGD(final boolean value) { + bitField0_ |= 0x00000001; + aCGHCDLBCGD = value; + return this; + } + + /** + * optional .ChallengeBossSingleNodeInfo first_node = 1; + * @return whether the firstNode field is set + */ + public boolean hasFirstNode() { return (bitField0_ & 0x00000002) != 0; } /** - * 
-     *  map KCKMGDGIFIF = 8;
-     *
- * - * optional .ChallengeBossSingleNodeInfo second_node = 12; - * @return this - */ - public ChallengeBossInfo clearSecondNode() { - bitField0_ &= ~0x00000002; - secondNode.clear(); - return this; - } - - /** - * 
-     *  map KCKMGDGIFIF = 8;
-     *
- * - * optional .ChallengeBossSingleNodeInfo second_node = 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 #getMutableSecondNode()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getSecondNode() { - return secondNode; - } - - /** - * 
-     *  map KCKMGDGIFIF = 8;
-     *
- * - * optional .ChallengeBossSingleNodeInfo second_node = 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 ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getMutableSecondNode( - ) { - bitField0_ |= 0x00000002; - return secondNode; - } - - /** - * 
-     *  map KCKMGDGIFIF = 8;
-     *
- * - * optional .ChallengeBossSingleNodeInfo second_node = 12; - * @param value the secondNode to set - * @return this - */ - public ChallengeBossInfo setSecondNode( - final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo value) { - bitField0_ |= 0x00000002; - secondNode.copyFrom(value); - return this; - } - - /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; - * @return whether the firstNode field is set - */ - public boolean hasFirstNode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; + * optional .ChallengeBossSingleNodeInfo first_node = 1; * @return this */ public ChallengeBossInfo clearFirstNode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; firstNode.clear(); return this; } /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; + * optional .ChallengeBossSingleNodeInfo first_node = 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. @@ -211,7 +148,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; + * optional .ChallengeBossSingleNodeInfo first_node = 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 @@ -220,25 +157,84 @@ public final class ChallengeBossInfoOuterClass { * @return internal storage object for modifications */ public ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getMutableFirstNode() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return firstNode; } /** - * optional .ChallengeBossSingleNodeInfo first_node = 15; + * optional .ChallengeBossSingleNodeInfo first_node = 1; * @param value the firstNode to set * @return this */ public ChallengeBossInfo setFirstNode( final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; firstNode.copyFrom(value); return this; } + /** + * optional .ChallengeBossSingleNodeInfo second_node = 5; + * @return whether the secondNode field is set + */ + public boolean hasSecondNode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .ChallengeBossSingleNodeInfo second_node = 5; + * @return this + */ + public ChallengeBossInfo clearSecondNode() { + bitField0_ &= ~0x00000004; + secondNode.clear(); + return this; + } + + /** + * optional .ChallengeBossSingleNodeInfo second_node = 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 #getMutableSecondNode()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getSecondNode() { + return secondNode; + } + + /** + * optional .ChallengeBossSingleNodeInfo second_node = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getMutableSecondNode( + ) { + bitField0_ |= 0x00000004; + return secondNode; + } + + /** + * optional .ChallengeBossSingleNodeInfo second_node = 5; + * @param value the secondNode to set + * @return this + */ + public ChallengeBossInfo setSecondNode( + final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo value) { + bitField0_ |= 0x00000004; + secondNode.copyFrom(value); + return this; + } + /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -250,7 +246,7 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -264,7 +260,7 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -282,7 +278,7 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -300,7 +296,7 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -315,7 +311,7 @@ public final class ChallengeBossInfoOuterClass { /** * 
-     *  map PADHAGKGGPB = 7;
+     *  map GJPKHDHDCDN = 12;
      *
* * repeated uint32 lineup2 = 2; @@ -329,7 +325,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 11; * @return whether the lineup1 field is set */ public boolean hasLineup1() { @@ -337,7 +333,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 11; * @return this */ public ChallengeBossInfo clearLineup1() { @@ -347,7 +343,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 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. @@ -361,7 +357,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 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 @@ -375,7 +371,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 11; * @param value the lineup1 to add * @return this */ @@ -386,7 +382,7 @@ public final class ChallengeBossInfoOuterClass { } /** - * repeated uint32 lineup1 = 13; + * repeated uint32 lineup1 = 11; * @param values the lineup1 to add * @return this */ @@ -401,9 +397,9 @@ public final class ChallengeBossInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - pPNAGBNIOAO = other.pPNAGBNIOAO; - secondNode.copyFrom(other.secondNode); + aCGHCDLBCGD = other.aCGHCDLBCGD; firstNode.copyFrom(other.firstNode); + secondNode.copyFrom(other.secondNode); lineup2.copyFrom(other.lineup2); lineup1.copyFrom(other.lineup1); } @@ -416,15 +412,15 @@ public final class ChallengeBossInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPPNAGBNIOAO()) { - setPPNAGBNIOAO(other.pPNAGBNIOAO); - } - if (other.hasSecondNode()) { - getMutableSecondNode().mergeFrom(other.secondNode); + if (other.hasACGHCDLBCGD()) { + setACGHCDLBCGD(other.aCGHCDLBCGD); } if (other.hasFirstNode()) { getMutableFirstNode().mergeFrom(other.firstNode); } + if (other.hasSecondNode()) { + getMutableSecondNode().mergeFrom(other.secondNode); + } if (other.hasLineup2()) { getMutableLineup2().addAll(other.lineup2); } @@ -441,9 +437,9 @@ public final class ChallengeBossInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - pPNAGBNIOAO = false; - secondNode.clear(); + aCGHCDLBCGD = false; firstNode.clear(); + secondNode.clear(); lineup2.clear(); lineup1.clear(); return this; @@ -456,8 +452,8 @@ public final class ChallengeBossInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - secondNode.clearQuick(); firstNode.clearQuick(); + secondNode.clearQuick(); lineup2.clear(); lineup1.clear(); return this; @@ -473,9 +469,9 @@ public final class ChallengeBossInfoOuterClass { } ChallengeBossInfo other = (ChallengeBossInfo) o; return bitField0_ == other.bitField0_ - && (!hasPPNAGBNIOAO() || pPNAGBNIOAO == other.pPNAGBNIOAO) - && (!hasSecondNode() || secondNode.equals(other.secondNode)) + && (!hasACGHCDLBCGD() || aCGHCDLBCGD == other.aCGHCDLBCGD) && (!hasFirstNode() || firstNode.equals(other.firstNode)) + && (!hasSecondNode() || secondNode.equals(other.secondNode)) && (!hasLineup2() || lineup2.equals(other.lineup2)) && (!hasLineup1() || lineup1.equals(other.lineup1)); } @@ -483,16 +479,16 @@ public final class ChallengeBossInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeBoolNoTag(pPNAGBNIOAO); + output.writeRawByte((byte) 112); + output.writeBoolNoTag(aCGHCDLBCGD); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(secondNode); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(firstNode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(firstNode); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(secondNode); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < lineup2.length(); i++) { @@ -502,7 +498,7 @@ public final class ChallengeBossInfoOuterClass { } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < lineup1.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(lineup1.array()[i]); } } @@ -515,10 +511,10 @@ public final class ChallengeBossInfoOuterClass { size += 2; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(secondNode); + size += 1 + ProtoSink.computeMessageSizeNoTag(firstNode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(firstNode); + size += 1 + ProtoSink.computeMessageSizeNoTag(secondNode); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); @@ -536,27 +532,27 @@ public final class ChallengeBossInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // pPNAGBNIOAO - pPNAGBNIOAO = input.readBool(); + case 112: { + // aCGHCDLBCGD + aCGHCDLBCGD = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { - // secondNode - input.readMessage(secondNode); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 10: { // firstNode input.readMessage(firstNode); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // secondNode + input.readMessage(secondNode); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 18) { @@ -568,11 +564,11 @@ public final class ChallengeBossInfoOuterClass { input.readPackedUInt32(lineup2, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // lineup1 [packed=true] input.readPackedUInt32(lineup1, tag); bitField0_ |= 0x00000010; @@ -597,7 +593,7 @@ public final class ChallengeBossInfoOuterClass { bitField0_ |= 0x00000008; break; } - case 104: { + case 88: { // lineup1 [packed=false] tag = input.readRepeatedUInt32(lineup1, tag); bitField0_ |= 0x00000010; @@ -611,13 +607,13 @@ public final class ChallengeBossInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeBool(FieldNames.pPNAGBNIOAO, pPNAGBNIOAO); + output.writeBool(FieldNames.aCGHCDLBCGD, aCGHCDLBCGD); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.secondNode, secondNode); + output.writeMessage(FieldNames.firstNode, firstNode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.firstNode, firstNode); + output.writeMessage(FieldNames.secondNode, secondNode); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); @@ -635,10 +631,10 @@ public final class ChallengeBossInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1940308460: { - if (input.isAtField(FieldNames.pPNAGBNIOAO)) { + case 1681027462: { + if (input.isAtField(FieldNames.aCGHCDLBCGD)) { if (!input.trySkipNullValue()) { - pPNAGBNIOAO = input.readBool(); + aCGHCDLBCGD = input.readBool(); bitField0_ |= 0x00000001; } } else { @@ -646,23 +642,23 @@ public final class ChallengeBossInfoOuterClass { } break; } - case 423693462: - case 265276141: { - if (input.isAtField(FieldNames.secondNode)) { - if (!input.trySkipNullValue()) { - input.readMessage(secondNode); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 132848850: case -160972239: { if (input.isAtField(FieldNames.firstNode)) { if (!input.trySkipNullValue()) { input.readMessage(firstNode); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 423693462: + case 265276141: { + if (input.isAtField(FieldNames.secondNode)) { + if (!input.trySkipNullValue()) { + input.readMessage(secondNode); bitField0_ |= 0x00000004; } } else { @@ -745,12 +741,12 @@ public final class ChallengeBossInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName pPNAGBNIOAO = FieldName.forField("PPNAGBNIOAO"); - - static final FieldName secondNode = FieldName.forField("secondNode", "second_node"); + static final FieldName aCGHCDLBCGD = FieldName.forField("ACGHCDLBCGD"); static final FieldName firstNode = FieldName.forField("firstNode", "first_node"); + static final FieldName secondNode = FieldName.forField("secondNode", "second_node"); + static final FieldName lineup2 = FieldName.forField("lineup2"); static final FieldName lineup1 = FieldName.forField("lineup1"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java new file mode 100644 index 0000000..5812aae --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossPhaseSettleNotifyOuterClass.java @@ -0,0 +1,1021 @@ +// 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.RepeatedMessage; + +public final class ChallengeBossPhaseSettleNotifyOuterClass { + /** + * Protobuf type {@code ChallengeBossPhaseSettleNotify} + */ + public static final class ChallengeBossPhaseSettleNotify extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 COKFJJOLMDI = 3; + */ + private int cOKFJJOLMDI; + + /** + * optional uint32 challenge_score = 6; + */ + private int challengeScore; + + /** + * optional uint32 phase = 8; + */ + private int phase; + + /** + * optional uint32 stars = 9; + */ + private int stars; + + /** + * optional uint32 challenge_id = 10; + */ + private int challengeId; + + /** + * optional uint32 score_two = 14; + */ + private int scoreTwo; + + /** + * optional bool is_win = 1; + */ + private boolean isWin; + + /** + * optional bool unkbool1 = 2; + */ + private boolean unkbool1; + + /** + * optional bool unkbool2 = 15; + */ + private boolean unkbool2; + + /** + * repeated .BattleTarget BIPEPADLEIA = 7; + */ + private final RepeatedMessage bIPEPADLEIA = RepeatedMessage.newEmptyInstance(BattleTargetOuterClass.BattleTarget.getFactory()); + + private ChallengeBossPhaseSettleNotify() { + } + + /** + * @return a new empty instance of {@code ChallengeBossPhaseSettleNotify} + */ + public static ChallengeBossPhaseSettleNotify newInstance() { + return new ChallengeBossPhaseSettleNotify(); + } + + /** + * optional uint32 COKFJJOLMDI = 3; + * @return whether the cOKFJJOLMDI field is set + */ + public boolean hasCOKFJJOLMDI() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 COKFJJOLMDI = 3; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearCOKFJJOLMDI() { + bitField0_ &= ~0x00000001; + cOKFJJOLMDI = 0; + return this; + } + + /** + * optional uint32 COKFJJOLMDI = 3; + * @return the cOKFJJOLMDI + */ + public int getCOKFJJOLMDI() { + return cOKFJJOLMDI; + } + + /** + * optional uint32 COKFJJOLMDI = 3; + * @param value the cOKFJJOLMDI to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setCOKFJJOLMDI(final int value) { + bitField0_ |= 0x00000001; + cOKFJJOLMDI = value; + return this; + } + + /** + * optional uint32 challenge_score = 6; + * @return whether the challengeScore field is set + */ + public boolean hasChallengeScore() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 challenge_score = 6; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearChallengeScore() { + bitField0_ &= ~0x00000002; + challengeScore = 0; + return this; + } + + /** + * optional uint32 challenge_score = 6; + * @return the challengeScore + */ + public int getChallengeScore() { + return challengeScore; + } + + /** + * optional uint32 challenge_score = 6; + * @param value the challengeScore to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setChallengeScore(final int value) { + bitField0_ |= 0x00000002; + challengeScore = value; + return this; + } + + /** + * optional uint32 phase = 8; + * @return whether the phase field is set + */ + public boolean hasPhase() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 phase = 8; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearPhase() { + bitField0_ &= ~0x00000004; + phase = 0; + return this; + } + + /** + * optional uint32 phase = 8; + * @return the phase + */ + public int getPhase() { + return phase; + } + + /** + * optional uint32 phase = 8; + * @param value the phase to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setPhase(final int value) { + bitField0_ |= 0x00000004; + phase = value; + return this; + } + + /** + * optional uint32 stars = 9; + * @return whether the stars field is set + */ + public boolean hasStars() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stars = 9; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearStars() { + bitField0_ &= ~0x00000008; + stars = 0; + return this; + } + + /** + * optional uint32 stars = 9; + * @return the stars + */ + public int getStars() { + return stars; + } + + /** + * optional uint32 stars = 9; + * @param value the stars to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setStars(final int value) { + bitField0_ |= 0x00000008; + stars = value; + return this; + } + + /** + * optional uint32 challenge_id = 10; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 challenge_id = 10; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearChallengeId() { + bitField0_ &= ~0x00000010; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 10; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 10; + * @param value the challengeId to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setChallengeId(final int value) { + bitField0_ |= 0x00000010; + challengeId = value; + return this; + } + + /** + * optional uint32 score_two = 14; + * @return whether the scoreTwo field is set + */ + public boolean hasScoreTwo() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 score_two = 14; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearScoreTwo() { + bitField0_ &= ~0x00000020; + scoreTwo = 0; + return this; + } + + /** + * optional uint32 score_two = 14; + * @return the scoreTwo + */ + public int getScoreTwo() { + return scoreTwo; + } + + /** + * optional uint32 score_two = 14; + * @param value the scoreTwo to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setScoreTwo(final int value) { + bitField0_ |= 0x00000020; + scoreTwo = value; + return this; + } + + /** + * optional bool is_win = 1; + * @return whether the isWin field is set + */ + public boolean hasIsWin() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional bool is_win = 1; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearIsWin() { + bitField0_ &= ~0x00000040; + isWin = false; + return this; + } + + /** + * optional bool is_win = 1; + * @return the isWin + */ + public boolean getIsWin() { + return isWin; + } + + /** + * optional bool is_win = 1; + * @param value the isWin to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setIsWin(final boolean value) { + bitField0_ |= 0x00000040; + isWin = value; + return this; + } + + /** + * optional bool unkbool1 = 2; + * @return whether the unkbool1 field is set + */ + public boolean hasUnkbool1() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional bool unkbool1 = 2; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearUnkbool1() { + bitField0_ &= ~0x00000080; + unkbool1 = false; + return this; + } + + /** + * optional bool unkbool1 = 2; + * @return the unkbool1 + */ + public boolean getUnkbool1() { + return unkbool1; + } + + /** + * optional bool unkbool1 = 2; + * @param value the unkbool1 to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setUnkbool1(final boolean value) { + bitField0_ |= 0x00000080; + unkbool1 = value; + return this; + } + + /** + * optional bool unkbool2 = 15; + * @return whether the unkbool2 field is set + */ + public boolean hasUnkbool2() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional bool unkbool2 = 15; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearUnkbool2() { + bitField0_ &= ~0x00000100; + unkbool2 = false; + return this; + } + + /** + * optional bool unkbool2 = 15; + * @return the unkbool2 + */ + public boolean getUnkbool2() { + return unkbool2; + } + + /** + * optional bool unkbool2 = 15; + * @param value the unkbool2 to set + * @return this + */ + public ChallengeBossPhaseSettleNotify setUnkbool2(final boolean value) { + bitField0_ |= 0x00000100; + unkbool2 = value; + return this; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 7; + * @return whether the bIPEPADLEIA field is set + */ + public boolean hasBIPEPADLEIA() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 7; + * @return this + */ + public ChallengeBossPhaseSettleNotify clearBIPEPADLEIA() { + bitField0_ &= ~0x00000200; + bIPEPADLEIA.clear(); + return this; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 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 #getMutableBIPEPADLEIA()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBIPEPADLEIA() { + return bIPEPADLEIA; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 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 getMutableBIPEPADLEIA() { + bitField0_ |= 0x00000200; + return bIPEPADLEIA; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 7; + * @param value the bIPEPADLEIA to add + * @return this + */ + public ChallengeBossPhaseSettleNotify addBIPEPADLEIA( + final BattleTargetOuterClass.BattleTarget value) { + bitField0_ |= 0x00000200; + bIPEPADLEIA.add(value); + return this; + } + + /** + * repeated .BattleTarget BIPEPADLEIA = 7; + * @param values the bIPEPADLEIA to add + * @return this + */ + public ChallengeBossPhaseSettleNotify addAllBIPEPADLEIA( + final BattleTargetOuterClass.BattleTarget... values) { + bitField0_ |= 0x00000200; + bIPEPADLEIA.addAll(values); + return this; + } + + @Override + public ChallengeBossPhaseSettleNotify copyFrom(final ChallengeBossPhaseSettleNotify other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + cOKFJJOLMDI = other.cOKFJJOLMDI; + challengeScore = other.challengeScore; + phase = other.phase; + stars = other.stars; + challengeId = other.challengeId; + scoreTwo = other.scoreTwo; + isWin = other.isWin; + unkbool1 = other.unkbool1; + unkbool2 = other.unkbool2; + bIPEPADLEIA.copyFrom(other.bIPEPADLEIA); + } + return this; + } + + @Override + public ChallengeBossPhaseSettleNotify mergeFrom(final ChallengeBossPhaseSettleNotify other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCOKFJJOLMDI()) { + setCOKFJJOLMDI(other.cOKFJJOLMDI); + } + if (other.hasChallengeScore()) { + setChallengeScore(other.challengeScore); + } + if (other.hasPhase()) { + setPhase(other.phase); + } + if (other.hasStars()) { + setStars(other.stars); + } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); + } + if (other.hasIsWin()) { + setIsWin(other.isWin); + } + if (other.hasUnkbool1()) { + setUnkbool1(other.unkbool1); + } + if (other.hasUnkbool2()) { + setUnkbool2(other.unkbool2); + } + if (other.hasBIPEPADLEIA()) { + getMutableBIPEPADLEIA().addAll(other.bIPEPADLEIA); + } + return this; + } + + @Override + public ChallengeBossPhaseSettleNotify clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + cOKFJJOLMDI = 0; + challengeScore = 0; + phase = 0; + stars = 0; + challengeId = 0; + scoreTwo = 0; + isWin = false; + unkbool1 = false; + unkbool2 = false; + bIPEPADLEIA.clear(); + return this; + } + + @Override + public ChallengeBossPhaseSettleNotify clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + bIPEPADLEIA.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChallengeBossPhaseSettleNotify)) { + return false; + } + ChallengeBossPhaseSettleNotify other = (ChallengeBossPhaseSettleNotify) o; + return bitField0_ == other.bitField0_ + && (!hasCOKFJJOLMDI() || cOKFJJOLMDI == other.cOKFJJOLMDI) + && (!hasChallengeScore() || challengeScore == other.challengeScore) + && (!hasPhase() || phase == other.phase) + && (!hasStars() || stars == other.stars) + && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasScoreTwo() || scoreTwo == other.scoreTwo) + && (!hasIsWin() || isWin == other.isWin) + && (!hasUnkbool1() || unkbool1 == other.unkbool1) + && (!hasUnkbool2() || unkbool2 == other.unkbool2) + && (!hasBIPEPADLEIA() || bIPEPADLEIA.equals(other.bIPEPADLEIA)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(cOKFJJOLMDI); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(challengeScore); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(phase); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(stars); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(challengeId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(scoreTwo); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 8); + output.writeBoolNoTag(isWin); + } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 16); + output.writeBoolNoTag(unkbool1); + } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 120); + output.writeBoolNoTag(unkbool2); + } + if ((bitField0_ & 0x00000200) != 0) { + for (int i = 0; i < bIPEPADLEIA.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(bIPEPADLEIA.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(cOKFJJOLMDI); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(phase); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000080) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000100) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000200) != 0) { + size += (1 * bIPEPADLEIA.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(bIPEPADLEIA); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeBossPhaseSettleNotify mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // cOKFJJOLMDI + cOKFJJOLMDI = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // challengeScore + challengeScore = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // phase + phase = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // stars + stars = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // scoreTwo + scoreTwo = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { + // isWin + isWin = input.readBool(); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // unkbool1 + unkbool1 = input.readBool(); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // unkbool2 + unkbool2 = input.readBool(); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // bIPEPADLEIA + tag = input.readRepeatedMessage(bIPEPADLEIA, tag); + bitField0_ |= 0x00000200; + 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.cOKFJJOLMDI, cOKFJJOLMDI); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.challengeScore, challengeScore); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.phase, phase); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.stars, stars); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.challengeId, challengeId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeBool(FieldNames.isWin, isWin); + } + if ((bitField0_ & 0x00000080) != 0) { + output.writeBool(FieldNames.unkbool1, unkbool1); + } + if ((bitField0_ & 0x00000100) != 0) { + output.writeBool(FieldNames.unkbool2, unkbool2); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRepeatedMessage(FieldNames.bIPEPADLEIA, bIPEPADLEIA); + } + output.endObject(); + } + + @Override + public ChallengeBossPhaseSettleNotify mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -9162578: { + if (input.isAtField(FieldNames.cOKFJJOLMDI)) { + if (!input.trySkipNullValue()) { + cOKFJJOLMDI = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 591599599: + case 1517684662: { + if (input.isAtField(FieldNames.challengeScore)) { + if (!input.trySkipNullValue()) { + challengeScore = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 106629499: { + if (input.isAtField(FieldNames.phase)) { + if (!input.trySkipNullValue()) { + phase = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109757537: { + if (input.isAtField(FieldNames.stars)) { + if (!input.trySkipNullValue()) { + stars = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { + if (!input.trySkipNullValue()) { + challengeId = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { + if (!input.trySkipNullValue()) { + scoreTwo = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100482642: + case -1179753657: { + if (input.isAtField(FieldNames.isWin)) { + if (!input.trySkipNullValue()) { + isWin = input.readBool(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case -251222827: { + if (input.isAtField(FieldNames.unkbool1)) { + if (!input.trySkipNullValue()) { + unkbool1 = input.readBool(); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case -251222826: { + if (input.isAtField(FieldNames.unkbool2)) { + if (!input.trySkipNullValue()) { + unkbool2 = input.readBool(); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1538947912: { + if (input.isAtField(FieldNames.bIPEPADLEIA)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(bIPEPADLEIA); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeBossPhaseSettleNotify clone() { + return new ChallengeBossPhaseSettleNotify().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeBossPhaseSettleNotify parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeBossPhaseSettleNotify(), data).checkInitialized(); + } + + public static ChallengeBossPhaseSettleNotify parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new ChallengeBossPhaseSettleNotify(), input).checkInitialized(); + } + + public static ChallengeBossPhaseSettleNotify parseFrom(final JsonSource input) throws + IOException { + return ProtoMessage.mergeFrom(new ChallengeBossPhaseSettleNotify(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeBossPhaseSettleNotify messages + */ + public static MessageFactory getFactory() { + return ChallengeBossPhaseSettleNotifyFactory.INSTANCE; + } + + private enum ChallengeBossPhaseSettleNotifyFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeBossPhaseSettleNotify create() { + return ChallengeBossPhaseSettleNotify.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName cOKFJJOLMDI = FieldName.forField("COKFJJOLMDI"); + + static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score"); + + static final FieldName phase = FieldName.forField("phase"); + + static final FieldName stars = FieldName.forField("stars"); + + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); + + static final FieldName isWin = FieldName.forField("isWin", "is_win"); + + static final FieldName unkbool1 = FieldName.forField("unkbool1"); + + static final FieldName unkbool2 = FieldName.forField("unkbool2"); + + static final FieldName bIPEPADLEIA = FieldName.forField("BIPEPADLEIA"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java index 38f7a91..f4343a5 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeExtInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_info = 11; */ private final ChallengeBossInfoOuterClass.ChallengeBossInfo bossInfo = ChallengeBossInfoOuterClass.ChallengeBossInfo.newInstance(); @@ -34,7 +34,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_info = 11; * @return whether the bossInfo field is set */ public boolean hasBossInfo() { @@ -42,7 +42,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_info = 11; * @return this */ public ChallengeExtInfo clearBossInfo() { @@ -52,7 +52,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_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. @@ -66,7 +66,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_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 @@ -80,7 +80,7 @@ public final class ChallengeExtInfoOuterClass { } /** - * optional .ChallengeBossInfo boss_info = 7; + * optional .ChallengeBossInfo boss_info = 11; * @param value the bossInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class ChallengeExtInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 90); output.writeMessageNoTag(bossInfo); } } @@ -171,7 +171,7 @@ public final class ChallengeExtInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 90: { // bossInfo input.readMessage(bossInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index fd7e247..52bec58 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -24,19 +24,24 @@ public final class ChallengeInfoOuterClass { private int score; /** - * optional uint32 score_two = 9; + * optional uint32 challenge_id = 5; + */ + private int challengeId; + + /** + * optional uint32 score_two = 12; */ private int scoreTwo; /** - * optional uint32 round_count = 10; + * optional uint32 round_count = 14; */ private int roundCount; /** - * optional uint32 challenge_id = 15; + * optional .ExtraLineupType extra_lineup_type = 7; */ - private int challengeId; + private int extraLineupType; /** * optional .ChallengeStatus status = 13; @@ -44,14 +49,9 @@ public final class ChallengeInfoOuterClass { private int status; /** - * optional .ExtraLineupType extra_lineup_type = 14; + * optional .ChallengeStoryInfo ext_info = 9; */ - private int extraLineupType; - - /** - * optional .ChallengeStoryInfo story_info = 4; - */ - private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); + private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo extInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); private ChallengeInfo() { } @@ -101,99 +101,25 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 9; - * @return whether the scoreTwo field is set + * optional uint32 challenge_id = 5; + * @return whether the challengeId field is set */ - public boolean hasScoreTwo() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 score_two = 9; - * @return this - */ - public ChallengeInfo clearScoreTwo() { - bitField0_ &= ~0x00000002; - scoreTwo = 0; - return this; - } - - /** - * optional uint32 score_two = 9; - * @return the scoreTwo - */ - public int getScoreTwo() { - return scoreTwo; - } - - /** - * optional uint32 score_two = 9; - * @param value the scoreTwo to set - * @return this - */ - public ChallengeInfo setScoreTwo(final int value) { - bitField0_ |= 0x00000002; - scoreTwo = value; - return this; - } - - /** - * optional uint32 round_count = 10; - * @return whether the roundCount field is set - */ - public boolean hasRoundCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 round_count = 10; - * @return this - */ - public ChallengeInfo clearRoundCount() { - bitField0_ &= ~0x00000004; - roundCount = 0; - return this; - } - - /** - * optional uint32 round_count = 10; - * @return the roundCount - */ - public int getRoundCount() { - return roundCount; - } - - /** - * optional uint32 round_count = 10; - * @param value the roundCount to set - * @return this - */ - public ChallengeInfo setRoundCount(final int value) { - bitField0_ |= 0x00000004; - roundCount = value; - return this; - } - - /** - * optional uint32 challenge_id = 15; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 5; * @return this */ public ChallengeInfo clearChallengeId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; challengeId = 0; return this; } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 5; * @return the challengeId */ public int getChallengeId() { @@ -201,22 +127,158 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 5; * @param value the challengeId to set * @return this */ public ChallengeInfo setChallengeId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; challengeId = value; return this; } + /** + * optional uint32 score_two = 12; + * @return whether the scoreTwo field is set + */ + public boolean hasScoreTwo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 score_two = 12; + * @return this + */ + public ChallengeInfo clearScoreTwo() { + bitField0_ &= ~0x00000004; + scoreTwo = 0; + return this; + } + + /** + * optional uint32 score_two = 12; + * @return the scoreTwo + */ + public int getScoreTwo() { + return scoreTwo; + } + + /** + * optional uint32 score_two = 12; + * @param value the scoreTwo to set + * @return this + */ + public ChallengeInfo setScoreTwo(final int value) { + bitField0_ |= 0x00000004; + scoreTwo = value; + return this; + } + + /** + * optional uint32 round_count = 14; + * @return whether the roundCount field is set + */ + public boolean hasRoundCount() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 round_count = 14; + * @return this + */ + public ChallengeInfo clearRoundCount() { + bitField0_ &= ~0x00000008; + roundCount = 0; + return this; + } + + /** + * optional uint32 round_count = 14; + * @return the roundCount + */ + public int getRoundCount() { + return roundCount; + } + + /** + * optional uint32 round_count = 14; + * @param value the roundCount to set + * @return this + */ + public ChallengeInfo setRoundCount(final int value) { + bitField0_ |= 0x00000008; + roundCount = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 7; + * @return whether the extraLineupType field is set + */ + public boolean hasExtraLineupType() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 7; + * @return this + */ + public ChallengeInfo clearExtraLineupType() { + bitField0_ &= ~0x00000010; + extraLineupType = 0; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 7; + * @return the extraLineupType + */ + public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { + return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getExtraLineupTypeValue() { + return extraLineupType; + } + + /** + * 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 ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value + * can cause {@link ChallengeInfo#getExtraLineupType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public ChallengeInfo setExtraLineupTypeValue(final int value) { + bitField0_ |= 0x00000010; + extraLineupType = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 7; + * @param value the extraLineupType to set + * @return this + */ + public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { + bitField0_ |= 0x00000010; + extraLineupType = value.getNumber(); + return this; + } + /** * optional .ChallengeStatus status = 13; * @return whether the status field is set */ public boolean hasStatus() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -224,7 +286,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo clearStatus() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; status = 0; return this; } @@ -257,7 +319,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setStatusValue(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; status = value; return this; } @@ -268,107 +330,45 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setStatus(final ChallengeStatusOuterClass.ChallengeStatus value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; status = value.getNumber(); return this; } /** - * optional .ExtraLineupType extra_lineup_type = 14; - * @return whether the extraLineupType field is set + * optional .ChallengeStoryInfo ext_info = 9; + * @return whether the extInfo field is set */ - public boolean hasExtraLineupType() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 14; - * @return this - */ - public ChallengeInfo clearExtraLineupType() { - bitField0_ &= ~0x00000020; - extraLineupType = 0; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 14; - * @return the extraLineupType - */ - public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { - return ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(extraLineupType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link ChallengeInfo#getExtraLineupType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getExtraLineupTypeValue() { - return extraLineupType; - } - - /** - * 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 ExtraLineupTypeOuterClass.ExtraLineupType}. Setting an invalid value - * can cause {@link ChallengeInfo#getExtraLineupType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public ChallengeInfo setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000020; - extraLineupType = value; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 14; - * @param value the extraLineupType to set - * @return this - */ - public ChallengeInfo setExtraLineupType(final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000020; - extraLineupType = value.getNumber(); - return this; - } - - /** - * optional .ChallengeStoryInfo story_info = 4; - * @return whether the storyInfo field is set - */ - public boolean hasStoryInfo() { + public boolean hasExtInfo() { return (bitField0_ & 0x00000040) != 0; } /** - * optional .ChallengeStoryInfo story_info = 4; + * optional .ChallengeStoryInfo ext_info = 9; * @return this */ - public ChallengeInfo clearStoryInfo() { + public ChallengeInfo clearExtInfo() { bitField0_ &= ~0x00000040; - storyInfo.clear(); + extInfo.clear(); return this; } /** - * optional .ChallengeStoryInfo story_info = 4; + * optional .ChallengeStoryInfo ext_info = 9; * * 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 #getMutableStoryInfo()} if you want to modify it. + * Use {@link #getMutableExtInfo()} if you want to modify it. * * @return internal storage object for reading */ - public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getStoryInfo() { - return storyInfo; + public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getExtInfo() { + return extInfo; } /** - * optional .ChallengeStoryInfo story_info = 4; + * optional .ChallengeStoryInfo ext_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -376,19 +376,19 @@ public final class ChallengeInfoOuterClass { * * @return internal storage object for modifications */ - public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getMutableStoryInfo() { + public ChallengeStoryInfoOuterClass.ChallengeStoryInfo getMutableExtInfo() { bitField0_ |= 0x00000040; - return storyInfo; + return extInfo; } /** - * optional .ChallengeStoryInfo story_info = 4; - * @param value the storyInfo to set + * optional .ChallengeStoryInfo ext_info = 9; + * @param value the extInfo to set * @return this */ - public ChallengeInfo setStoryInfo(final ChallengeStoryInfoOuterClass.ChallengeStoryInfo value) { + public ChallengeInfo setExtInfo(final ChallengeStoryInfoOuterClass.ChallengeStoryInfo value) { bitField0_ |= 0x00000040; - storyInfo.copyFrom(value); + extInfo.copyFrom(value); return this; } @@ -398,12 +398,12 @@ public final class ChallengeInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; score = other.score; + challengeId = other.challengeId; scoreTwo = other.scoreTwo; roundCount = other.roundCount; - challengeId = other.challengeId; - status = other.status; extraLineupType = other.extraLineupType; - storyInfo.copyFrom(other.storyInfo); + status = other.status; + extInfo.copyFrom(other.extInfo); } return this; } @@ -417,23 +417,23 @@ public final class ChallengeInfoOuterClass { if (other.hasScore()) { setScore(other.score); } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } if (other.hasScoreTwo()) { setScoreTwo(other.scoreTwo); } if (other.hasRoundCount()) { setRoundCount(other.roundCount); } - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); + if (other.hasExtraLineupType()) { + setExtraLineupTypeValue(other.extraLineupType); } if (other.hasStatus()) { setStatusValue(other.status); } - if (other.hasExtraLineupType()) { - setExtraLineupTypeValue(other.extraLineupType); - } - if (other.hasStoryInfo()) { - getMutableStoryInfo().mergeFrom(other.storyInfo); + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); } return this; } @@ -446,12 +446,12 @@ public final class ChallengeInfoOuterClass { cachedSize = -1; bitField0_ = 0; score = 0; + challengeId = 0; scoreTwo = 0; roundCount = 0; - challengeId = 0; - status = 0; extraLineupType = 0; - storyInfo.clear(); + status = 0; + extInfo.clear(); return this; } @@ -462,7 +462,7 @@ public final class ChallengeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - storyInfo.clearQuick(); + extInfo.clearQuick(); return this; } @@ -477,12 +477,12 @@ public final class ChallengeInfoOuterClass { ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ && (!hasScore() || score == other.score) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasRoundCount() || roundCount == other.roundCount) - && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasStatus() || status == other.status) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) - && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)); + && (!hasStatus() || status == other.status) + && (!hasExtInfo() || extInfo.equals(other.extInfo)); } @Override @@ -492,28 +492,28 @@ public final class ChallengeInfoOuterClass { output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(scoreTwo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(roundCount); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(challengeId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(scoreTwo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(roundCount); + } if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 56); + output.writeEnumNoTag(extraLineupType); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeEnumNoTag(extraLineupType); - } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(storyInfo); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(extInfo); } } @@ -524,22 +524,22 @@ public final class ChallengeInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(status); + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); + } + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(status); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); } return size; } @@ -556,33 +556,45 @@ public final class ChallengeInfoOuterClass { score = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 40) { break; } } - case 72: { - // scoreTwo - scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // roundCount - roundCount = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 40: { // challengeId challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // scoreTwo + scoreTwo = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // roundCount + roundCount = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // extraLineupType + final int value = input.readInt32(); + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; + bitField0_ |= 0x00000010; + } + tag = input.readTag(); if (tag != 104) { break; } @@ -592,28 +604,16 @@ public final class ChallengeInfoOuterClass { final int value = input.readInt32(); if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { status = value; - bitField0_ |= 0x00000010; - } - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // extraLineupType - final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { - // storyInfo - input.readMessage(storyInfo); + case 74: { + // extInfo + input.readMessage(extInfo); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { @@ -641,22 +641,22 @@ public final class ChallengeInfoOuterClass { output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.roundCount, roundCount); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.challengeId, challengeId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.roundCount, roundCount); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeEnum(FieldNames.status, status, ChallengeStatusOuterClass.ChallengeStatus.converter()); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.storyInfo, storyInfo); + output.writeMessage(FieldNames.extInfo, extInfo); } output.endObject(); } @@ -679,12 +679,24 @@ public final class ChallengeInfoOuterClass { } break; } + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { + if (!input.trySkipNullValue()) { + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -485512614: case 2129303327: { if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { scoreTwo = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -696,18 +708,6 @@ public final class ChallengeInfoOuterClass { if (input.isAtField(FieldNames.roundCount)) { if (!input.trySkipNullValue()) { roundCount = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { - if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -715,22 +715,6 @@ public final class ChallengeInfoOuterClass { } break; } - case -892481550: { - if (input.isAtField(FieldNames.status)) { - if (!input.trySkipNullValue()) { - final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); - if (value != null) { - status = value.getNumber(); - bitField0_ |= 0x00000010; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } case -468135527: case -1144475077: { if (input.isAtField(FieldNames.extraLineupType)) { @@ -738,6 +722,22 @@ public final class ChallengeInfoOuterClass { final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { extraLineupType = value.getNumber(); + bitField0_ |= 0x00000010; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -892481550: { + if (input.isAtField(FieldNames.status)) { + if (!input.trySkipNullValue()) { + final ChallengeStatusOuterClass.ChallengeStatus value = input.readEnum(ChallengeStatusOuterClass.ChallengeStatus.converter()); + if (value != null) { + status = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -748,11 +748,11 @@ public final class ChallengeInfoOuterClass { } break; } - case 1710116675: - case 1494185400: { - if (input.isAtField(FieldNames.storyInfo)) { + case -1306498449: + case -1826570228: { + if (input.isAtField(FieldNames.extInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(storyInfo); + input.readMessage(extInfo); bitField0_ |= 0x00000040; } } else { @@ -814,17 +814,17 @@ public final class ChallengeInfoOuterClass { static class FieldNames { static final FieldName score = FieldName.forField("score"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName status = FieldName.forField("status"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); - - static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index d9c1d21..c9abd4f 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class ChallengeLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 13; */ private int extraLineupType; @@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 13; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 13; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 13; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 13; * @param value the extraLineupType to set * @return this */ @@ -155,7 +155,7 @@ public final class ChallengeLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 104: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java index 6dfb88a..73ce3b5 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,27 +19,27 @@ public final class ChallengeOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stars = 3; - */ - private int stars; - - /** - * optional uint32 score = 4; + * optional uint32 score = 1; */ private int score; /** - * optional uint32 taken_reward = 10; - */ - private int takenReward; - - /** - * optional uint32 challenge_id = 13; + * optional uint32 challenge_id = 5; */ private int challengeId; /** - * optional .ChallengeExtInfo ext_info = 7; + * optional uint32 taken_reward = 9; + */ + private int takenReward; + + /** + * optional uint32 stars = 14; + */ + private int stars; + + /** + * optional .ChallengeExtInfo ext_info = 3; */ private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); @@ -54,62 +54,25 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 3; - * @return whether the stars field is set + * optional uint32 score = 1; + * @return whether the score field is set */ - public boolean hasStars() { + public boolean hasScore() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stars = 3; - * @return this - */ - public Challenge clearStars() { - bitField0_ &= ~0x00000001; - stars = 0; - return this; - } - - /** - * optional uint32 stars = 3; - * @return the stars - */ - public int getStars() { - return stars; - } - - /** - * optional uint32 stars = 3; - * @param value the stars to set - * @return this - */ - public Challenge setStars(final int value) { - bitField0_ |= 0x00000001; - stars = value; - return this; - } - - /** - * optional uint32 score = 4; - * @return whether the score field is set - */ - public boolean hasScore() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 score = 4; + * optional uint32 score = 1; * @return this */ public Challenge clearScore() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; score = 0; return this; } /** - * optional uint32 score = 4; + * optional uint32 score = 1; * @return the score */ public int getScore() { @@ -117,18 +80,55 @@ public final class ChallengeOuterClass { } /** - * optional uint32 score = 4; + * optional uint32 score = 1; * @param value the score to set * @return this */ public Challenge setScore(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; score = value; return this; } /** - * optional uint32 taken_reward = 10; + * optional uint32 challenge_id = 5; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 challenge_id = 5; + * @return this + */ + public Challenge clearChallengeId() { + bitField0_ &= ~0x00000002; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 5; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 5; + * @param value the challengeId to set + * @return this + */ + public Challenge setChallengeId(final int value) { + bitField0_ |= 0x00000002; + challengeId = value; + return this; + } + + /** + * optional uint32 taken_reward = 9; * @return whether the takenReward field is set */ public boolean hasTakenReward() { @@ -136,7 +136,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 9; * @return this */ public Challenge clearTakenReward() { @@ -146,7 +146,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 9; * @return the takenReward */ public int getTakenReward() { @@ -154,7 +154,7 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 10; + * optional uint32 taken_reward = 9; * @param value the takenReward to set * @return this */ @@ -165,44 +165,44 @@ public final class ChallengeOuterClass { } /** - * optional uint32 challenge_id = 13; - * @return whether the challengeId field is set + * optional uint32 stars = 14; + * @return whether the stars field is set */ - public boolean hasChallengeId() { + public boolean hasStars() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 challenge_id = 13; + * optional uint32 stars = 14; * @return this */ - public Challenge clearChallengeId() { + public Challenge clearStars() { bitField0_ &= ~0x00000008; - challengeId = 0; + stars = 0; return this; } /** - * optional uint32 challenge_id = 13; - * @return the challengeId + * optional uint32 stars = 14; + * @return the stars */ - public int getChallengeId() { - return challengeId; + public int getStars() { + return stars; } /** - * optional uint32 challenge_id = 13; - * @param value the challengeId to set + * optional uint32 stars = 14; + * @param value the stars to set * @return this */ - public Challenge setChallengeId(final int value) { + public Challenge setStars(final int value) { bitField0_ |= 0x00000008; - challengeId = value; + stars = value; return this; } /** - * optional .ChallengeExtInfo ext_info = 7; + * optional .ChallengeExtInfo ext_info = 3; * @return whether the extInfo field is set */ public boolean hasExtInfo() { @@ -210,7 +210,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 7; + * optional .ChallengeExtInfo ext_info = 3; * @return this */ public Challenge clearExtInfo() { @@ -220,7 +220,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 7; + * optional .ChallengeExtInfo ext_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. @@ -234,7 +234,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 7; + * optional .ChallengeExtInfo ext_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 @@ -248,7 +248,7 @@ public final class ChallengeOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 7; + * optional .ChallengeExtInfo ext_info = 3; * @param value the extInfo to set * @return this */ @@ -263,10 +263,10 @@ public final class ChallengeOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stars = other.stars; score = other.score; - takenReward = other.takenReward; challengeId = other.challengeId; + takenReward = other.takenReward; + stars = other.stars; extInfo.copyFrom(other.extInfo); } return this; @@ -278,17 +278,17 @@ public final class ChallengeOuterClass { return this; } cachedSize = -1; - if (other.hasStars()) { - setStars(other.stars); - } if (other.hasScore()) { setScore(other.score); } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } if (other.hasTakenReward()) { setTakenReward(other.takenReward); } - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); + if (other.hasStars()) { + setStars(other.stars); } if (other.hasExtInfo()) { getMutableExtInfo().mergeFrom(other.extInfo); @@ -303,10 +303,10 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; - stars = 0; score = 0; - takenReward = 0; challengeId = 0; + takenReward = 0; + stars = 0; extInfo.clear(); return this; } @@ -332,33 +332,33 @@ public final class ChallengeOuterClass { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ - && (!hasStars() || stars == other.stars) && (!hasScore() || score == other.score) - && (!hasTakenReward() || takenReward == other.takenReward) && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasTakenReward() || takenReward == other.takenReward) + && (!hasStars() || stars == other.stars) && (!hasExtInfo() || extInfo.equals(other.extInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(stars); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(score); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(challengeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(takenReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(extInfo); } } @@ -367,16 +367,16 @@ public final class ChallengeOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); @@ -391,43 +391,43 @@ public final class ChallengeOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // stars - stars = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 8: { // score score = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { + case 40: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // takenReward takenReward = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // challengeId - challengeId = input.readUInt32(); + case 112: { + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { + case 26: { // extInfo input.readMessage(extInfo); bitField0_ |= 0x00000010; @@ -454,16 +454,16 @@ public final class ChallengeOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.score, score); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenReward, takenReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.extInfo, extInfo); @@ -478,10 +478,10 @@ public final class ChallengeOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109757537: { - if (input.isAtField(FieldNames.stars)) { + case 109264530: { + if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { - stars = input.readUInt32(); + score = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -489,10 +489,11 @@ public final class ChallengeOuterClass { } break; } - case 109264530: { - if (input.isAtField(FieldNames.score)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - score = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -512,11 +513,10 @@ public final class ChallengeOuterClass { } break; } - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case 109757537: { + if (input.isAtField(FieldNames.stars)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + stars = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -588,13 +588,13 @@ public final class ChallengeOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stars = FieldName.forField("stars"); - static final FieldName score = FieldName.forField("score"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName stars = FieldName.forField("stars"); static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); } diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java index 42c0965..3b127ee 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeRewardOuterClass.java @@ -19,12 +19,12 @@ public final class ChallengeRewardOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 taken_challenge_reward = 8; + * optional uint64 taken_challenge_reward = 5; */ private long takenChallengeReward; /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 6; */ private int groupId; @@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 8; + * optional uint64 taken_challenge_reward = 5; * @return whether the takenChallengeReward field is set */ public boolean hasTakenChallengeReward() { @@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 8; + * optional uint64 taken_challenge_reward = 5; * @return this */ public ChallengeReward clearTakenChallengeReward() { @@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 8; + * optional uint64 taken_challenge_reward = 5; * @return the takenChallengeReward */ public long getTakenChallengeReward() { @@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 8; + * optional uint64 taken_challenge_reward = 5; * @param value the takenChallengeReward to set * @return this */ @@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 6; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 6; * @return this */ public ChallengeReward clearGroupId() { @@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 6; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 13; + * optional uint32 group_id = 6; * @param value the groupId to set * @return this */ @@ -177,11 +177,11 @@ public final class ChallengeRewardOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt64NoTag(takenChallengeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // takenChallengeReward takenChallengeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 48) { break; } } - case 104: { + case 48: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java index 3f44729..6b6002c 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,12 +19,12 @@ public final class ChallengeSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 1; */ private int scoreTwo; /** - * optional uint32 stars = 9; + * optional uint32 stars = 8; */ private int stars; @@ -34,17 +34,17 @@ public final class ChallengeSettleNotifyOuterClass { private int challengeScore; /** - * optional uint32 challenge_id = 12; + * optional uint32 challenge_id = 14; */ private int challengeId; /** - * optional bool is_win = 1; + * optional bool is_win = 5; */ private boolean isWin; /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -59,7 +59,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 1; * @return whether the scoreTwo field is set */ public boolean hasScoreTwo() { @@ -67,7 +67,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 1; * @return this */ public ChallengeSettleNotify clearScoreTwo() { @@ -77,7 +77,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 1; * @return the scoreTwo */ public int getScoreTwo() { @@ -85,7 +85,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 1; * @param value the scoreTwo to set * @return this */ @@ -96,7 +96,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 9; + * optional uint32 stars = 8; * @return whether the stars field is set */ public boolean hasStars() { @@ -104,7 +104,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 9; + * optional uint32 stars = 8; * @return this */ public ChallengeSettleNotify clearStars() { @@ -114,7 +114,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 9; + * optional uint32 stars = 8; * @return the stars */ public int getStars() { @@ -122,7 +122,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 9; + * optional uint32 stars = 8; * @param value the stars to set * @return this */ @@ -170,7 +170,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 12; + * optional uint32 challenge_id = 14; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -178,7 +178,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 12; + * optional uint32 challenge_id = 14; * @return this */ public ChallengeSettleNotify clearChallengeId() { @@ -188,7 +188,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 12; + * optional uint32 challenge_id = 14; * @return the challengeId */ public int getChallengeId() { @@ -196,7 +196,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 challenge_id = 12; + * optional uint32 challenge_id = 14; * @param value the challengeId to set * @return this */ @@ -207,7 +207,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 1; + * optional bool is_win = 5; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -215,7 +215,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 1; + * optional bool is_win = 5; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 1; + * optional bool is_win = 5; * @return the isWin */ public boolean getIsWin() { @@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 1; + * optional bool is_win = 5; * @param value the isWin to set * @return this */ @@ -244,7 +244,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; * @return whether the reward field is set */ public boolean hasReward() { @@ -252,7 +252,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; * @return this */ public ChallengeSettleNotify clearReward() { @@ -262,7 +262,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; * * 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. @@ -276,7 +276,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -290,7 +290,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 5; + * optional .ItemList reward = 9; * @param value the reward to set * @return this */ @@ -390,11 +390,11 @@ public final class ChallengeSettleNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000004) != 0) { @@ -402,15 +402,15 @@ public final class ChallengeSettleNotifyOuterClass { output.writeUInt32NoTag(challengeScore); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(reward); } } @@ -446,16 +446,16 @@ public final class ChallengeSettleNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // scoreTwo scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { // stars stars = input.readUInt32(); bitField0_ |= 0x00000002; @@ -469,29 +469,29 @@ public final class ChallengeSettleNotifyOuterClass { challengeScore = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { + case 40: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 42) { + if (tag != 74) { break; } } - case 42: { + case 74: { // reward input.readMessage(reward); bitField0_ |= 0x00000020; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java index 9fa0c38..032e221 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java @@ -20,7 +20,7 @@ public final class ChallengeStoryBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 3; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 3; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 3; * @return this */ public ChallengeStoryBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 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. @@ -67,7 +67,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 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 @@ -81,7 +81,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 3; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 15; + * repeated uint32 buff_list = 3; * @param values the buffList to add * @return this */ @@ -163,7 +163,7 @@ public final class ChallengeStoryBuffInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 26: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass { tag = input.readTag(); break; } - case 120: { + case 24: { // buffList [packed=false] tag = input.readRepeatedUInt32(buffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java index a80d4f5..571e0f9 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java @@ -19,15 +19,15 @@ public final class ChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; - */ - private final ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo curBossBuffs = ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo.newInstance(); - - /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; */ private final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo curStoryBuffs = ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo.newInstance(); + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + */ + private final ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo curBossBuffs = ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo.newInstance(); + private ChallengeStoryInfo() { } @@ -39,83 +39,25 @@ public final class ChallengeStoryInfoOuterClass { } /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; - * @return whether the curBossBuffs field is set + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; + * @return whether the curStoryBuffs field is set */ - public boolean hasCurBossBuffs() { + public boolean hasCurStoryBuffs() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; - * @return this - */ - public ChallengeStoryInfo clearCurBossBuffs() { - bitField0_ &= ~0x00000001; - curBossBuffs.clear(); - return this; - } - - /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 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 #getMutableCurBossBuffs()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo getCurBossBuffs() { - return curBossBuffs; - } - - /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 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 ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo getMutableCurBossBuffs() { - bitField0_ |= 0x00000001; - return curBossBuffs; - } - - /** - * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; - * @param value the curBossBuffs to set - * @return this - */ - public ChallengeStoryInfo setCurBossBuffs( - final ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo value) { - bitField0_ |= 0x00000001; - curBossBuffs.copyFrom(value); - return this; - } - - /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; - * @return whether the curStoryBuffs field is set - */ - public boolean hasCurStoryBuffs() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @return this */ public ChallengeStoryInfo clearCurStoryBuffs() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curStoryBuffs.clear(); return this; } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 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. @@ -129,7 +71,7 @@ public final class ChallengeStoryInfoOuterClass { } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 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 @@ -138,29 +80,87 @@ public final class ChallengeStoryInfoOuterClass { * @return internal storage object for modifications */ public ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo getMutableCurStoryBuffs() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return curStoryBuffs; } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 1; * @param value the curStoryBuffs to set * @return this */ public ChallengeStoryInfo setCurStoryBuffs( final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curStoryBuffs.copyFrom(value); return this; } + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + * @return whether the curBossBuffs field is set + */ + public boolean hasCurBossBuffs() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + * @return this + */ + public ChallengeStoryInfo clearCurBossBuffs() { + bitField0_ &= ~0x00000002; + curBossBuffs.clear(); + return this; + } + + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + * + * 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 #getMutableCurBossBuffs()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo getCurBossBuffs() { + return curBossBuffs; + } + + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + * + * 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 ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo getMutableCurBossBuffs() { + bitField0_ |= 0x00000002; + return curBossBuffs; + } + + /** + * optional .ChallengeBossBuffInfo cur_boss_buffs = 9; + * @param value the curBossBuffs to set + * @return this + */ + public ChallengeStoryInfo setCurBossBuffs( + final ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo value) { + bitField0_ |= 0x00000002; + curBossBuffs.copyFrom(value); + return this; + } + @Override public ChallengeStoryInfo copyFrom(final ChallengeStoryInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curBossBuffs.copyFrom(other.curBossBuffs); curStoryBuffs.copyFrom(other.curStoryBuffs); + curBossBuffs.copyFrom(other.curBossBuffs); } return this; } @@ -171,12 +171,12 @@ public final class ChallengeStoryInfoOuterClass { return this; } cachedSize = -1; - if (other.hasCurBossBuffs()) { - getMutableCurBossBuffs().mergeFrom(other.curBossBuffs); - } if (other.hasCurStoryBuffs()) { getMutableCurStoryBuffs().mergeFrom(other.curStoryBuffs); } + if (other.hasCurBossBuffs()) { + getMutableCurBossBuffs().mergeFrom(other.curBossBuffs); + } return this; } @@ -187,8 +187,8 @@ public final class ChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curBossBuffs.clear(); curStoryBuffs.clear(); + curBossBuffs.clear(); return this; } @@ -199,8 +199,8 @@ public final class ChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curBossBuffs.clearQuick(); curStoryBuffs.clearQuick(); + curBossBuffs.clearQuick(); return this; } @@ -214,19 +214,19 @@ public final class ChallengeStoryInfoOuterClass { } ChallengeStoryInfo other = (ChallengeStoryInfo) o; return bitField0_ == other.bitField0_ - && (!hasCurBossBuffs() || curBossBuffs.equals(other.curBossBuffs)) - && (!hasCurStoryBuffs() || curStoryBuffs.equals(other.curStoryBuffs)); + && (!hasCurStoryBuffs() || curStoryBuffs.equals(other.curStoryBuffs)) + && (!hasCurBossBuffs() || curBossBuffs.equals(other.curBossBuffs)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(curBossBuffs); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(curStoryBuffs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(curStoryBuffs); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(curBossBuffs); } } @@ -234,10 +234,10 @@ public final class ChallengeStoryInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(curBossBuffs); + size += 1 + ProtoSink.computeMessageSizeNoTag(curStoryBuffs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(curStoryBuffs); + size += 1 + ProtoSink.computeMessageSizeNoTag(curBossBuffs); } return size; } @@ -249,18 +249,18 @@ public final class ChallengeStoryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // curBossBuffs - input.readMessage(curBossBuffs); + case 10: { + // curStoryBuffs + input.readMessage(curStoryBuffs); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 74) { break; } } - case 82: { - // curStoryBuffs - input.readMessage(curStoryBuffs); + case 74: { + // curBossBuffs + input.readMessage(curBossBuffs); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -285,10 +285,10 @@ public final class ChallengeStoryInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.curBossBuffs, curBossBuffs); + output.writeMessage(FieldNames.curStoryBuffs, curStoryBuffs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.curStoryBuffs, curStoryBuffs); + output.writeMessage(FieldNames.curBossBuffs, curBossBuffs); } output.endObject(); } @@ -300,11 +300,11 @@ public final class ChallengeStoryInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1632186189: - case -340377971: { - if (input.isAtField(FieldNames.curBossBuffs)) { + case -587091733: + case -738440393: { + if (input.isAtField(FieldNames.curStoryBuffs)) { if (!input.trySkipNullValue()) { - input.readMessage(curBossBuffs); + input.readMessage(curStoryBuffs); bitField0_ |= 0x00000001; } } else { @@ -312,11 +312,11 @@ public final class ChallengeStoryInfoOuterClass { } break; } - case -587091733: - case -738440393: { - if (input.isAtField(FieldNames.curStoryBuffs)) { + case -1632186189: + case -340377971: { + if (input.isAtField(FieldNames.curBossBuffs)) { if (!input.trySkipNullValue()) { - input.readMessage(curStoryBuffs); + input.readMessage(curBossBuffs); bitField0_ |= 0x00000002; } } else { @@ -377,9 +377,9 @@ public final class ChallengeStoryInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curBossBuffs = FieldName.forField("curBossBuffs", "cur_boss_buffs"); - static final FieldName curStoryBuffs = FieldName.forField("curStoryBuffs", "cur_story_buffs"); + + static final FieldName curBossBuffs = FieldName.forField("curBossBuffs", "cur_boss_buffs"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index ab5f2d3..723b166 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 6; + * optional uint32 slot = 9; */ private int slot; @@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 6; + * optional uint32 slot = 9; * @return whether the slot field is set */ public boolean hasSlot() { @@ -42,7 +42,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 6; + * optional uint32 slot = 9; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 6; + * optional uint32 slot = 9; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 6; + * optional uint32 slot = 9; * @param value the slot to set * @return this */ @@ -129,7 +129,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 72: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java index ac43b2c..3f1de94 100644 --- a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderScRspOuterClass.java @@ -19,15 +19,15 @@ public final class ChangeLineupLeaderScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; - */ - private int retcode; - - /** - * optional uint32 slot = 15; + * optional uint32 slot = 5; */ private int slot; + /** + * optional uint32 retcode = 8; + */ + private int retcode; + private ChangeLineupLeaderScRsp() { } @@ -39,62 +39,25 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 11; - * @return whether the retcode field is set + * optional uint32 slot = 5; + * @return whether the slot field is set */ - public boolean hasRetcode() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 11; - * @return this - */ - public ChangeLineupLeaderScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 11; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 11; - * @param value the retcode to set - * @return this - */ - public ChangeLineupLeaderScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 slot = 15; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 15; + * optional uint32 slot = 5; * @return this */ public ChangeLineupLeaderScRsp clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } /** - * optional uint32 slot = 15; + * optional uint32 slot = 5; * @return the slot */ public int getSlot() { @@ -102,23 +65,60 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 15; + * optional uint32 slot = 5; * @param value the slot to set * @return this */ public ChangeLineupLeaderScRsp setSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; slot = value; return this; } + /** + * optional uint32 retcode = 8; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 8; + * @return this + */ + public ChangeLineupLeaderScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 8; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 8; + * @param value the retcode to set + * @return this + */ + public ChangeLineupLeaderScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public ChangeLineupLeaderScRsp copyFrom(final ChangeLineupLeaderScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; slot = other.slot; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class ChangeLineupLeaderScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class ChangeLineupLeaderScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; slot = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class ChangeLineupLeaderScRspOuterClass { } ChangeLineupLeaderScRsp other = (ChangeLineupLeaderScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasSlot() || slot == other.slot); + && (!hasSlot() || slot == other.slot) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class ChangeLineupLeaderScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class ChangeLineupLeaderScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // retcode - retcode = input.readUInt32(); + case 40: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { - // slot - slot = input.readUInt32(); + case 64: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ChangeLineupLeaderScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,10 @@ public final class ChangeLineupLeaderScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class ChangeLineupLeaderScRspOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class ChangeLineupLeaderScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName slot = FieldName.forField("slot"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java index 3602ac2..ee4a86f 100644 --- a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java @@ -20,27 +20,27 @@ public final class ChatOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 sent_time = 2; + * optional uint64 sent_time = 13; */ private long sentTime; /** - * optional uint32 emote = 1; - */ - private int emote; - - /** - * optional uint32 sender_uid = 7; + * optional uint32 sender_uid = 5; */ private int senderUid; /** - * optional .MsgType msg_type = 10; + * optional uint32 emote = 11; + */ + private int emote; + + /** + * optional .MsgType msg_type = 15; */ private int msgType; /** - * optional string text = 5; + * optional string text = 10; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 2; + * optional uint64 sent_time = 13; * @return whether the sentTime field is set */ public boolean hasSentTime() { @@ -63,7 +63,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 2; + * optional uint64 sent_time = 13; * @return this */ public Chat clearSentTime() { @@ -73,7 +73,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 2; + * optional uint64 sent_time = 13; * @return the sentTime */ public long getSentTime() { @@ -81,7 +81,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 2; + * optional uint64 sent_time = 13; * @param value the sentTime to set * @return this */ @@ -92,62 +92,25 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 1; - * @return whether the emote field is set + * optional uint32 sender_uid = 5; + * @return whether the senderUid field is set */ - public boolean hasEmote() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 emote = 1; - * @return this - */ - public Chat clearEmote() { - bitField0_ &= ~0x00000002; - emote = 0; - return this; - } - - /** - * optional uint32 emote = 1; - * @return the emote - */ - public int getEmote() { - return emote; - } - - /** - * optional uint32 emote = 1; - * @param value the emote to set - * @return this - */ - public Chat setEmote(final int value) { - bitField0_ |= 0x00000002; - emote = value; - return this; - } - - /** - * optional uint32 sender_uid = 7; - * @return whether the senderUid field is set - */ - public boolean hasSenderUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 sender_uid = 7; + * optional uint32 sender_uid = 5; * @return this */ public Chat clearSenderUid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; senderUid = 0; return this; } /** - * optional uint32 sender_uid = 7; + * optional uint32 sender_uid = 5; * @return the senderUid */ public int getSenderUid() { @@ -155,18 +118,55 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 7; + * optional uint32 sender_uid = 5; * @param value the senderUid to set * @return this */ public Chat setSenderUid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; senderUid = value; return this; } /** - * optional .MsgType msg_type = 10; + * optional uint32 emote = 11; + * @return whether the emote field is set + */ + public boolean hasEmote() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 emote = 11; + * @return this + */ + public Chat clearEmote() { + bitField0_ &= ~0x00000004; + emote = 0; + return this; + } + + /** + * optional uint32 emote = 11; + * @return the emote + */ + public int getEmote() { + return emote; + } + + /** + * optional uint32 emote = 11; + * @param value the emote to set + * @return this + */ + public Chat setEmote(final int value) { + bitField0_ |= 0x00000004; + emote = value; + return this; + } + + /** + * optional .MsgType msg_type = 15; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -174,7 +174,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 10; + * optional .MsgType msg_type = 15; * @return this */ public Chat clearMsgType() { @@ -184,7 +184,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 10; + * optional .MsgType msg_type = 15; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -217,7 +217,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 10; + * optional .MsgType msg_type = 15; * @param value the msgType to set * @return this */ @@ -228,7 +228,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @return whether the text field is set */ public boolean hasText() { @@ -236,7 +236,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @return this */ public Chat clearText() { @@ -246,7 +246,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @return the text */ public String getText() { @@ -254,7 +254,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -262,7 +262,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -271,7 +271,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class ChatOuterClass { } /** - * optional string text = 5; + * optional string text = 10; * @param value the text to set * @return this */ @@ -298,8 +298,8 @@ public final class ChatOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; sentTime = other.sentTime; - emote = other.emote; senderUid = other.senderUid; + emote = other.emote; msgType = other.msgType; text.copyFrom(other.text); } @@ -315,12 +315,12 @@ public final class ChatOuterClass { if (other.hasSentTime()) { setSentTime(other.sentTime); } - if (other.hasEmote()) { - setEmote(other.emote); - } if (other.hasSenderUid()) { setSenderUid(other.senderUid); } + if (other.hasEmote()) { + setEmote(other.emote); + } if (other.hasMsgType()) { setMsgTypeValue(other.msgType); } @@ -338,8 +338,8 @@ public final class ChatOuterClass { cachedSize = -1; bitField0_ = 0; sentTime = 0L; - emote = 0; senderUid = 0; + emote = 0; msgType = 0; text.clear(); return this; @@ -367,8 +367,8 @@ public final class ChatOuterClass { Chat other = (Chat) o; return bitField0_ == other.bitField0_ && (!hasSentTime() || sentTime == other.sentTime) - && (!hasEmote() || emote == other.emote) && (!hasSenderUid() || senderUid == other.senderUid) + && (!hasEmote() || emote == other.emote) && (!hasMsgType() || msgType == other.msgType) && (!hasText() || text.equals(other.text)); } @@ -376,23 +376,23 @@ public final class ChatOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 104); output.writeUInt64NoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(emote); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(senderUid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(emote); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 82); output.writeStringNoTag(text); } } @@ -404,10 +404,10 @@ public final class ChatOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); @@ -425,34 +425,34 @@ public final class ChatOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 104: { // sentTime sentTime = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { - // emote - emote = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 40: { // senderUid senderUid = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { + // emote + emote = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -460,11 +460,11 @@ public final class ChatOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 42) { + if (tag != 82) { break; } } - case 42: { + case 82: { // text input.readString(text); bitField0_ |= 0x00000010; @@ -494,10 +494,10 @@ public final class ChatOuterClass { output.writeUInt64(FieldNames.sentTime, sentTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.emote, emote); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); @@ -527,10 +527,11 @@ public final class ChatOuterClass { } break; } - case 96633208: { - if (input.isAtField(FieldNames.emote)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - emote = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -538,11 +539,10 @@ public final class ChatOuterClass { } break; } - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 96633208: { + if (input.isAtField(FieldNames.emote)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + emote = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -632,10 +632,10 @@ public final class ChatOuterClass { static class FieldNames { static final FieldName sentTime = FieldName.forField("sentTime", "sent_time"); - static final FieldName emote = FieldName.forField("emote"); - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + static final FieldName emote = FieldName.forField("emote"); + static final FieldName msgType = FieldName.forField("msgType", "msg_type"); static final FieldName text = FieldName.forField("text"); diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java index fab7955..e4aedc8 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java @@ -19,15 +19,15 @@ public final class ChessRogueSelectCellScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; - */ - private int retcode; - - /** - * optional uint32 cell_id = 14; + * optional uint32 cell_id = 8; */ private int cellId; + /** + * optional uint32 retcode = 15; + */ + private int retcode; + private ChessRogueSelectCellScRsp() { } @@ -39,62 +39,25 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set + * optional uint32 cell_id = 8; + * @return whether the cellId field is set */ - public boolean hasRetcode() { + public boolean hasCellId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 4; - * @return this - */ - public ChessRogueSelectCellScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 4; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 4; - * @param value the retcode to set - * @return this - */ - public ChessRogueSelectCellScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cell_id = 14; - * @return whether the cellId field is set - */ - public boolean hasCellId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cell_id = 14; + * optional uint32 cell_id = 8; * @return this */ public ChessRogueSelectCellScRsp clearCellId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; cellId = 0; return this; } /** - * optional uint32 cell_id = 14; + * optional uint32 cell_id = 8; * @return the cellId */ public int getCellId() { @@ -102,23 +65,60 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 14; + * optional uint32 cell_id = 8; * @param value the cellId to set * @return this */ public ChessRogueSelectCellScRsp setCellId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; cellId = value; return this; } + /** + * optional uint32 retcode = 15; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 15; + * @return this + */ + public ChessRogueSelectCellScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 15; + * @param value the retcode to set + * @return this + */ + public ChessRogueSelectCellScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public ChessRogueSelectCellScRsp copyFrom(final ChessRogueSelectCellScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; cellId = other.cellId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class ChessRogueSelectCellScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCellId()) { setCellId(other.cellId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class ChessRogueSelectCellScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; cellId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class ChessRogueSelectCellScRspOuterClass { } ChessRogueSelectCellScRsp other = (ChessRogueSelectCellScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasCellId() || cellId == other.cellId); + && (!hasCellId() || cellId == other.cellId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(cellId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(cellId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class ChessRogueSelectCellScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cellId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class ChessRogueSelectCellScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // retcode - retcode = input.readUInt32(); + case 64: { + // cellId + cellId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // cellId - cellId = input.readUInt32(); + case 120: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ChessRogueSelectCellScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.cellId, cellId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.cellId, cellId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class ChessRogueSelectCellScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1364082147: + case 663147800: { + if (input.isAtField(FieldNames.cellId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + cellId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class ChessRogueSelectCellScRspOuterClass { } break; } - case -1364082147: - case 663147800: { - if (input.isAtField(FieldNames.cellId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - cellId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class ChessRogueSelectCellScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName cellId = FieldName.forField("cellId", "cell_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java index 689d962..24561d9 100644 --- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java @@ -21,12 +21,12 @@ public final class ClientMailOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 expire_time = 8; + * optional int64 expire_time = 1; */ private long expireTime; /** - * optional int64 time = 14; + * optional int64 time = 6; */ private long time; @@ -41,32 +41,32 @@ public final class ClientMailOuterClass { private int id; /** - * optional bool is_read = 1; + * optional bool is_read = 4; */ private boolean isRead; /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 15; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * optional string title = 2; + * optional string title = 8; */ private final Utf8String title = Utf8String.newEmptyInstance(); /** - * optional string sender = 6; + * optional string sender = 9; */ private final Utf8String sender = Utf8String.newEmptyInstance(); /** - * optional string content = 11; + * optional string content = 10; */ private final Utf8String content = Utf8String.newEmptyInstance(); /** - * repeated string para_list = 9; + * repeated string para_list = 3; */ private final RepeatedString paraList = RepeatedString.newEmptyInstance(); @@ -81,7 +81,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 8; + * optional int64 expire_time = 1; * @return whether the expireTime field is set */ public boolean hasExpireTime() { @@ -89,7 +89,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 8; + * optional int64 expire_time = 1; * @return this */ public ClientMail clearExpireTime() { @@ -99,7 +99,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 8; + * optional int64 expire_time = 1; * @return the expireTime */ public long getExpireTime() { @@ -107,7 +107,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 8; + * optional int64 expire_time = 1; * @param value the expireTime to set * @return this */ @@ -118,7 +118,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 14; + * optional int64 time = 6; * @return whether the time field is set */ public boolean hasTime() { @@ -126,7 +126,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 14; + * optional int64 time = 6; * @return this */ public ClientMail clearTime() { @@ -136,7 +136,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 14; + * optional int64 time = 6; * @return the time */ public long getTime() { @@ -144,7 +144,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 14; + * optional int64 time = 6; * @param value the time to set * @return this */ @@ -229,7 +229,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 1; + * optional bool is_read = 4; * @return whether the isRead field is set */ public boolean hasIsRead() { @@ -237,7 +237,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 1; + * optional bool is_read = 4; * @return this */ public ClientMail clearIsRead() { @@ -247,7 +247,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 1; + * optional bool is_read = 4; * @return the isRead */ public boolean getIsRead() { @@ -255,7 +255,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 1; + * optional bool is_read = 4; * @param value the isRead to set * @return this */ @@ -266,7 +266,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 15; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -274,7 +274,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 15; * @return this */ public ClientMail clearAttachment() { @@ -284,7 +284,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 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. @@ -298,7 +298,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 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 @@ -312,7 +312,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 15; * @param value the attachment to set * @return this */ @@ -323,7 +323,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @return whether the title field is set */ public boolean hasTitle() { @@ -331,7 +331,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @return this */ public ClientMail clearTitle() { @@ -341,7 +341,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @return the title */ public String getTitle() { @@ -349,7 +349,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @return internal {@code Utf8String} representation of title for reading */ public Utf8String getTitleBytes() { @@ -357,7 +357,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @return internal {@code Utf8String} representation of title for modifications */ public Utf8String getMutableTitleBytes() { @@ -366,7 +366,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @param value the title to set * @return this */ @@ -377,7 +377,7 @@ public final class ClientMailOuterClass { } /** - * optional string title = 2; + * optional string title = 8; * @param value the title to set * @return this */ @@ -388,7 +388,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @return whether the sender field is set */ public boolean hasSender() { @@ -396,7 +396,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @return this */ public ClientMail clearSender() { @@ -406,7 +406,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @return the sender */ public String getSender() { @@ -414,7 +414,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @return internal {@code Utf8String} representation of sender for reading */ public Utf8String getSenderBytes() { @@ -422,7 +422,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @return internal {@code Utf8String} representation of sender for modifications */ public Utf8String getMutableSenderBytes() { @@ -431,7 +431,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @param value the sender to set * @return this */ @@ -442,7 +442,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 6; + * optional string sender = 9; * @param value the sender to set * @return this */ @@ -453,7 +453,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @return whether the content field is set */ public boolean hasContent() { @@ -461,7 +461,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @return this */ public ClientMail clearContent() { @@ -471,7 +471,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @return the content */ public String getContent() { @@ -479,7 +479,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @return internal {@code Utf8String} representation of content for reading */ public Utf8String getContentBytes() { @@ -487,7 +487,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @return internal {@code Utf8String} representation of content for modifications */ public Utf8String getMutableContentBytes() { @@ -496,7 +496,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @param value the content to set * @return this */ @@ -507,7 +507,7 @@ public final class ClientMailOuterClass { } /** - * optional string content = 11; + * optional string content = 10; * @param value the content to set * @return this */ @@ -518,7 +518,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 3; * @return whether the paraList field is set */ public boolean hasParaList() { @@ -526,7 +526,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 3; * @return this */ public ClientMail clearParaList() { @@ -536,7 +536,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 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. @@ -550,7 +550,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 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 @@ -564,7 +564,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 3; * @param value the paraList to add * @return this */ @@ -575,7 +575,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 9; + * repeated string para_list = 3; * @param values the paraList to add * @return this */ @@ -703,11 +703,11 @@ public final class ClientMailOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeInt64NoTag(expireTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeInt64NoTag(time); } if ((bitField0_ & 0x00000004) != 0) { @@ -719,28 +719,28 @@ public final class ClientMailOuterClass { output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isRead); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 66); output.writeStringNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 74); output.writeStringNoTag(sender); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 82); output.writeStringNoTag(content); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < paraList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 26); output.writeStringNoTag(paraList.get(i)); } } @@ -789,16 +789,16 @@ public final class ClientMailOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // expireTime expireTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 48) { break; } } - case 112: { + case 48: { // time time = input.readInt64(); bitField0_ |= 0x00000002; @@ -821,56 +821,56 @@ public final class ClientMailOuterClass { id = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 8) { + if (tag != 32) { break; } } - case 8: { + case 32: { // isRead isRead = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 18) { + if (tag != 66) { break; } } - case 18: { + case 66: { // title input.readString(title); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // sender - input.readString(sender); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // content - input.readString(content); - bitField0_ |= 0x00000100; - tag = input.readTag(); if (tag != 74) { break; } } case 74: { + // sender + input.readString(sender); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // content + input.readString(content); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { // paraList tag = input.readRepeatedString(paraList, tag); bitField0_ |= 0x00000200; diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java index aaf709a..39a4c8c 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class ComposeItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 compose_id = 7; - */ - private int composeId; - - /** - * optional uint32 count = 10; + * optional uint32 count = 4; */ private int count; + /** + * optional uint32 compose_id = 9; + */ + private int composeId; + /** * optional .ItemCostList compose_item_list = 8; */ @@ -44,62 +44,25 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 7; - * @return whether the composeId field is set + * optional uint32 count = 4; + * @return whether the count field is set */ - public boolean hasComposeId() { + public boolean hasCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 7; - * @return this - */ - public ComposeItemCsReq clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 7; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 7; - * @param value the composeId to set - * @return this - */ - public ComposeItemCsReq setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = value; - return this; - } - - /** - * optional uint32 count = 10; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 count = 10; + * optional uint32 count = 4; * @return this */ public ComposeItemCsReq clearCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; count = 0; return this; } /** - * optional uint32 count = 10; + * optional uint32 count = 4; * @return the count */ public int getCount() { @@ -107,16 +70,53 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 10; + * optional uint32 count = 4; * @param value the count to set * @return this */ public ComposeItemCsReq setCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; count = value; return this; } + /** + * optional uint32 compose_id = 9; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 compose_id = 9; + * @return this + */ + public ComposeItemCsReq clearComposeId() { + bitField0_ &= ~0x00000002; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 9; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 9; + * @param value the composeId to set + * @return this + */ + public ComposeItemCsReq setComposeId(final int value) { + bitField0_ |= 0x00000002; + composeId = value; + return this; + } + /** * optional .ItemCostList compose_item_list = 8; * @return whether the composeItemList field is set @@ -179,8 +179,8 @@ public final class ComposeItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - composeId = other.composeId; count = other.count; + composeId = other.composeId; composeItemList.copyFrom(other.composeItemList); } return this; @@ -192,12 +192,12 @@ public final class ComposeItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasComposeId()) { - setComposeId(other.composeId); - } if (other.hasCount()) { setCount(other.count); } + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); } @@ -211,8 +211,8 @@ public final class ComposeItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - composeId = 0; count = 0; + composeId = 0; composeItemList.clear(); return this; } @@ -238,20 +238,20 @@ public final class ComposeItemCsReqOuterClass { } ComposeItemCsReq other = (ComposeItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasComposeId() || composeId == other.composeId) && (!hasCount() || count == other.count) + && (!hasComposeId() || composeId == other.composeId) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(composeId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 66); @@ -263,10 +263,10 @@ public final class ComposeItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -281,18 +281,18 @@ public final class ComposeItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // composeId - composeId = input.readUInt32(); + case 32: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { - // count - count = input.readUInt32(); + case 72: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 66) { @@ -326,10 +326,10 @@ public final class ComposeItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -344,11 +344,10 @@ public final class ComposeItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,10 +355,11 @@ public final class ComposeItemCsReqOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ComposeItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName count = FieldName.forField("count"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java index 637c250..cdcdc5a 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java @@ -19,22 +19,22 @@ public final class ComposeItemScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; - */ - private int retcode; - - /** - * optional uint32 count = 6; + * optional uint32 count = 3; */ private int count; + /** + * optional uint32 retcode = 10; + */ + private int retcode; + /** * optional uint32 compose_id = 15; */ private int composeId; /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 14; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,62 +49,25 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set + * optional uint32 count = 3; + * @return whether the count field is set */ - public boolean hasRetcode() { + public boolean hasCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 2; - * @return this - */ - public ComposeItemScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 2; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 2; - * @param value the retcode to set - * @return this - */ - public ComposeItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 count = 6; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 count = 6; + * optional uint32 count = 3; * @return this */ public ComposeItemScRsp clearCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; count = 0; return this; } /** - * optional uint32 count = 6; + * optional uint32 count = 3; * @return the count */ public int getCount() { @@ -112,16 +75,53 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 count = 6; + * optional uint32 count = 3; * @param value the count to set * @return this */ public ComposeItemScRsp setCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; count = value; return this; } + /** + * optional uint32 retcode = 10; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public ComposeItemScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 10; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 10; + * @param value the retcode to set + * @return this + */ + public ComposeItemScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + /** * optional uint32 compose_id = 15; * @return whether the composeId field is set @@ -160,7 +160,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 14; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 14; * @return this */ public ComposeItemScRsp clearReturnItemList() { @@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_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. @@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_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 @@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 14; * @param value the returnItemList to set * @return this */ @@ -221,8 +221,8 @@ public final class ComposeItemScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; count = other.count; + retcode = other.retcode; composeId = other.composeId; returnItemList.copyFrom(other.returnItemList); } @@ -235,12 +235,12 @@ public final class ComposeItemScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCount()) { setCount(other.count); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasComposeId()) { setComposeId(other.composeId); } @@ -257,8 +257,8 @@ public final class ComposeItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; count = 0; + retcode = 0; composeId = 0; returnItemList.clear(); return this; @@ -285,8 +285,8 @@ public final class ComposeItemScRspOuterClass { } ComposeItemScRsp other = (ComposeItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCount() || count == other.count) + && (!hasRetcode() || retcode == other.retcode) && (!hasComposeId() || composeId == other.composeId) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @@ -294,19 +294,19 @@ public final class ComposeItemScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 114); output.writeMessageNoTag(returnItemList); } } @@ -315,10 +315,10 @@ public final class ComposeItemScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); @@ -336,18 +336,18 @@ public final class ComposeItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // retcode - retcode = input.readUInt32(); + case 24: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { - // count - count = input.readUInt32(); + case 80: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 120) { @@ -359,11 +359,11 @@ public final class ComposeItemScRspOuterClass { composeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 114) { break; } } - case 34: { + case 114: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000008; @@ -390,10 +390,10 @@ public final class ComposeItemScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.composeId, composeId); @@ -411,10 +411,10 @@ public final class ComposeItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -422,10 +422,10 @@ public final class ComposeItemScRspOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -510,10 +510,10 @@ public final class ComposeItemScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName count = FieldName.forField("count"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); static final FieldName returnItemList = FieldName.forField("returnItemList", "return_item_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java index 35c722a..a448370 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicCsReqOuterClass.java @@ -19,27 +19,27 @@ public final class ComposeSelectedRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 main_affix_id = 4; - */ - private int mainAffixId; - - /** - * optional uint32 count = 8; - */ - private int count; - - /** - * optional uint32 compose_relic_id = 11; - */ - private int composeRelicId; - - /** - * optional uint32 compose_id = 15; + * optional uint32 compose_id = 2; */ private int composeId; /** - * optional .ItemCostList compose_item_list = 1; + * optional uint32 main_affix_id = 3; + */ + private int mainAffixId; + + /** + * optional uint32 compose_relic_id = 6; + */ + private int composeRelicId; + + /** + * optional uint32 count = 7; + */ + private int count; + + /** + * optional .ItemCostList compose_item_list = 12; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -54,25 +54,62 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 main_affix_id = 4; - * @return whether the mainAffixId field is set + * optional uint32 compose_id = 2; + * @return whether the composeId field is set */ - public boolean hasMainAffixId() { + public boolean hasComposeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 main_affix_id = 4; + * optional uint32 compose_id = 2; + * @return this + */ + public ComposeSelectedRelicCsReq clearComposeId() { + bitField0_ &= ~0x00000001; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 2; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 2; + * @param value the composeId to set + * @return this + */ + public ComposeSelectedRelicCsReq setComposeId(final int value) { + bitField0_ |= 0x00000001; + composeId = value; + return this; + } + + /** + * optional uint32 main_affix_id = 3; + * @return whether the mainAffixId field is set + */ + public boolean hasMainAffixId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 main_affix_id = 3; * @return this */ public ComposeSelectedRelicCsReq clearMainAffixId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 4; + * optional uint32 main_affix_id = 3; * @return the mainAffixId */ public int getMainAffixId() { @@ -80,55 +117,18 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 main_affix_id = 4; + * optional uint32 main_affix_id = 3; * @param value the mainAffixId to set * @return this */ public ComposeSelectedRelicCsReq setMainAffixId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; mainAffixId = value; return this; } /** - * optional uint32 count = 8; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 count = 8; - * @return this - */ - public ComposeSelectedRelicCsReq clearCount() { - bitField0_ &= ~0x00000002; - count = 0; - return this; - } - - /** - * optional uint32 count = 8; - * @return the count - */ - public int getCount() { - return count; - } - - /** - * optional uint32 count = 8; - * @param value the count to set - * @return this - */ - public ComposeSelectedRelicCsReq setCount(final int value) { - bitField0_ |= 0x00000002; - count = value; - return this; - } - - /** - * optional uint32 compose_relic_id = 11; + * optional uint32 compose_relic_id = 6; * @return whether the composeRelicId field is set */ public boolean hasComposeRelicId() { @@ -136,7 +136,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_relic_id = 11; + * optional uint32 compose_relic_id = 6; * @return this */ public ComposeSelectedRelicCsReq clearComposeRelicId() { @@ -146,7 +146,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_relic_id = 11; + * optional uint32 compose_relic_id = 6; * @return the composeRelicId */ public int getComposeRelicId() { @@ -154,7 +154,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_relic_id = 11; + * optional uint32 compose_relic_id = 6; * @param value the composeRelicId to set * @return this */ @@ -165,44 +165,44 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 15; - * @return whether the composeId field is set + * optional uint32 count = 7; + * @return whether the count field is set */ - public boolean hasComposeId() { + public boolean hasCount() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 compose_id = 15; + * optional uint32 count = 7; * @return this */ - public ComposeSelectedRelicCsReq clearComposeId() { + public ComposeSelectedRelicCsReq clearCount() { bitField0_ &= ~0x00000008; - composeId = 0; + count = 0; return this; } /** - * optional uint32 compose_id = 15; - * @return the composeId + * optional uint32 count = 7; + * @return the count */ - public int getComposeId() { - return composeId; + public int getCount() { + return count; } /** - * optional uint32 compose_id = 15; - * @param value the composeId to set + * optional uint32 count = 7; + * @param value the count to set * @return this */ - public ComposeSelectedRelicCsReq setComposeId(final int value) { + public ComposeSelectedRelicCsReq setCount(final int value) { bitField0_ |= 0x00000008; - composeId = value; + count = value; return this; } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 12; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 12; * @return this */ public ComposeSelectedRelicCsReq clearComposeItemList() { @@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_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. @@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_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 @@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 1; + * optional .ItemCostList compose_item_list = 12; * @param value the composeItemList to set * @return this */ @@ -264,10 +264,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mainAffixId = other.mainAffixId; - count = other.count; - composeRelicId = other.composeRelicId; composeId = other.composeId; + mainAffixId = other.mainAffixId; + composeRelicId = other.composeRelicId; + count = other.count; composeItemList.copyFrom(other.composeItemList); } return this; @@ -279,17 +279,17 @@ public final class ComposeSelectedRelicCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasComposeId()) { + setComposeId(other.composeId); + } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } - if (other.hasCount()) { - setCount(other.count); - } if (other.hasComposeRelicId()) { setComposeRelicId(other.composeRelicId); } - if (other.hasComposeId()) { - setComposeId(other.composeId); + if (other.hasCount()) { + setCount(other.count); } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); @@ -304,10 +304,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - mainAffixId = 0; - count = 0; - composeRelicId = 0; composeId = 0; + mainAffixId = 0; + composeRelicId = 0; + count = 0; composeItemList.clear(); return this; } @@ -333,33 +333,33 @@ public final class ComposeSelectedRelicCsReqOuterClass { } ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o; return bitField0_ == other.bitField0_ - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasCount() || count == other.count) - && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) && (!hasComposeId() || composeId == other.composeId) + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) + && (!hasCount() || count == other.count) && (!hasComposeItemList() || composeItemList.equals(other.composeItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mainAffixId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(count); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(composeRelicId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(composeId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 98); output.writeMessageNoTag(composeItemList); } } @@ -368,16 +368,16 @@ public final class ComposeSelectedRelicCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(composeItemList); @@ -392,43 +392,43 @@ public final class ComposeSelectedRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // mainAffixId - mainAffixId = input.readUInt32(); + case 16: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 24) { break; } } - case 64: { - // count - count = input.readUInt32(); + case 24: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { + case 48: { // composeRelicId composeRelicId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { - // composeId - composeId = input.readUInt32(); + case 56: { + // count + count = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10) { + if (tag != 98) { break; } } - case 10: { + case 98: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000010; @@ -455,16 +455,16 @@ public final class ComposeSelectedRelicCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.count, count); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.composeRelicId, composeRelicId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -479,11 +479,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -491,10 +491,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -514,11 +515,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + count = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -591,13 +591,13 @@ public final class ComposeSelectedRelicCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - static final FieldName count = FieldName.forField("count"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + static final FieldName count = FieldName.forField("count"); static final FieldName composeItemList = FieldName.forField("composeItemList", "compose_item_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java index 159c2bf..1e7ddbd 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeSelectedRelicScRspOuterClass.java @@ -19,17 +19,17 @@ public final class ComposeSelectedRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 4; */ private int composeId; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 5; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -44,7 +44,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 4; * @return whether the composeId field is set */ public boolean hasComposeId() { @@ -52,7 +52,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 4; * @return this */ public ComposeSelectedRelicScRsp clearComposeId() { @@ -62,7 +62,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 4; * @return the composeId */ public int getComposeId() { @@ -70,7 +70,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 10; + * optional uint32 compose_id = 4; * @param value the composeId to set * @return this */ @@ -81,7 +81,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @return this */ public ComposeSelectedRelicScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 5; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 5; * @return this */ public ComposeSelectedRelicScRsp clearReturnItemList() { @@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 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. @@ -150,7 +150,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 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 @@ -164,7 +164,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 7; + * optional .ItemList return_item_list = 5; * @param value the returnItemList to set * @return this */ @@ -246,15 +246,15 @@ public final class ComposeSelectedRelicScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(returnItemList); } } @@ -281,25 +281,25 @@ public final class ComposeSelectedRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 32: { // composeId composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { + case 42: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java index d1a395a..d027968 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java @@ -20,12 +20,12 @@ public final class ContentPackageDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_content_id = 10; + * optional uint32 cur_content_id = 11; */ private int curContentId; /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_list = 13; */ private final RepeatedMessage contentPackageList = RepeatedMessage.newEmptyInstance(ContentPackageInfoOuterClass.ContentPackageInfo.getFactory()); @@ -40,7 +40,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 10; + * optional uint32 cur_content_id = 11; * @return whether the curContentId field is set */ public boolean hasCurContentId() { @@ -48,7 +48,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 10; + * optional uint32 cur_content_id = 11; * @return this */ public ContentPackageData clearCurContentId() { @@ -58,7 +58,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 10; + * optional uint32 cur_content_id = 11; * @return the curContentId */ public int getCurContentId() { @@ -66,7 +66,7 @@ public final class ContentPackageDataOuterClass { } /** - * optional uint32 cur_content_id = 10; + * optional uint32 cur_content_id = 11; * @param value the curContentId to set * @return this */ @@ -77,7 +77,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_list = 13; * @return whether the contentPackageList field is set */ public boolean hasContentPackageList() { @@ -85,7 +85,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_list = 13; * @return this */ public ContentPackageData clearContentPackageList() { @@ -95,7 +95,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_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. @@ -110,7 +110,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_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 @@ -125,7 +125,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_list = 13; * @param value the contentPackageList to add * @return this */ @@ -137,7 +137,7 @@ public final class ContentPackageDataOuterClass { } /** - * repeated .ContentPackageInfo content_package_list = 9; + * repeated .ContentPackageInfo content_package_list = 13; * @param values the contentPackageList to add * @return this */ @@ -214,12 +214,12 @@ public final class ContentPackageDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(curContentId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < contentPackageList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(contentPackageList.get(i)); } } @@ -244,16 +244,16 @@ public final class ContentPackageDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // curContentId curContentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // contentPackageList tag = input.readRepeatedMessage(contentPackageList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java index 209903f..d8b07d9 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ContentPackageGetDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 7; */ private final ContentPackageDataOuterClass.ContentPackageData data = ContentPackageDataOuterClass.ContentPackageData.newInstance(); @@ -39,7 +39,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return this */ public ContentPackageGetDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 7; * @return whether the data field is set */ public boolean hasData() { @@ -84,7 +84,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 7; * @return this */ public ContentPackageGetDataScRsp clearData() { @@ -94,7 +94,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 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. @@ -108,7 +108,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 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 @@ -122,7 +122,7 @@ public final class ContentPackageGetDataScRspOuterClass { } /** - * optional .ContentPackageData data = 3; + * optional .ContentPackageData data = 7; * @param value the data to set * @return this */ @@ -199,11 +199,11 @@ public final class ContentPackageGetDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 58); output.writeMessageNoTag(data); } } @@ -227,16 +227,16 @@ public final class ContentPackageGetDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { + case 58: { // data input.readMessage(data); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java index 0cbd580..be63f16 100644 --- a/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java @@ -19,12 +19,12 @@ public final class ContentPackageInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 content_id = 12; + * optional uint32 content_id = 8; */ private int contentId; /** - * optional .ContentPackageStatus status = 3; + * optional .ContentPackageStatus status = 7; */ private int status; @@ -39,7 +39,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional uint32 content_id = 12; + * optional uint32 content_id = 8; * @return whether the contentId field is set */ public boolean hasContentId() { @@ -47,7 +47,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional uint32 content_id = 12; + * optional uint32 content_id = 8; * @return this */ public ContentPackageInfo clearContentId() { @@ -57,7 +57,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional uint32 content_id = 12; + * optional uint32 content_id = 8; * @return the contentId */ public int getContentId() { @@ -65,7 +65,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional uint32 content_id = 12; + * optional uint32 content_id = 8; * @param value the contentId to set * @return this */ @@ -76,7 +76,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 3; + * optional .ContentPackageStatus status = 7; * @return whether the status field is set */ public boolean hasStatus() { @@ -84,7 +84,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 3; + * optional .ContentPackageStatus status = 7; * @return this */ public ContentPackageInfo clearStatus() { @@ -94,7 +94,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 3; + * optional .ContentPackageStatus status = 7; * @return the status */ public ContentPackageStatusOuterClass.ContentPackageStatus getStatus() { @@ -127,7 +127,7 @@ public final class ContentPackageInfoOuterClass { } /** - * optional .ContentPackageStatus status = 3; + * optional .ContentPackageStatus status = 7; * @param value the status to set * @return this */ @@ -203,11 +203,11 @@ public final class ContentPackageInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(contentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeEnumNoTag(status); } } @@ -231,16 +231,16 @@ public final class ContentPackageInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 64: { // contentId contentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 56) { break; } } - case 24: { + case 56: { // status final int value = input.readInt32(); if (ContentPackageStatusOuterClass.ContentPackageStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java index cddf8d2..2438821 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java @@ -21,17 +21,17 @@ public final class DailyActiveInfoNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 4; + * optional uint32 daily_active_point = 9; */ private int dailyActivePoint; /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 14; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 11; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -46,7 +46,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 4; + * optional uint32 daily_active_point = 9; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -54,7 +54,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 4; + * optional uint32 daily_active_point = 9; * @return this */ public DailyActiveInfoNotify clearDailyActivePoint() { @@ -64,7 +64,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 4; + * optional uint32 daily_active_point = 9; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -72,7 +72,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 4; + * optional uint32 daily_active_point = 9; * @param value the dailyActivePoint to set * @return this */ @@ -83,7 +83,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 14; * @return whether the dailyActiveQuestIdList field is set */ public boolean hasDailyActiveQuestIdList() { @@ -91,7 +91,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 14; * @return this */ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { @@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_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. @@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_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 @@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 14; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 15; + * repeated uint32 daily_active_quest_id_list = 14; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @return this */ public DailyActiveInfoNotify clearDailyActiveLevelList() { @@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 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. @@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 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 @@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @param value the dailyActiveLevelList to add * @return this */ @@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 8; + * repeated .DailyActivityInfo daily_active_level_list = 11; * @param values the dailyActiveLevelList to add * @return this */ @@ -295,18 +295,18 @@ public final class DailyActiveInfoNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 90); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -334,25 +334,25 @@ public final class DailyActiveInfoNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 72: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 90) { break; } } - case 66: { + case 90: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000004; @@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass { tag = input.readTag(); break; } - case 120: { + case 112: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java index 9bd3c4b..907e949 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,22 +19,22 @@ public final class DailyActivityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 7; - */ - private int dailyActivePoint; - - /** - * optional uint32 level = 8; + * optional uint32 level = 4; */ private int level; /** - * optional uint32 world_level = 9; + * optional uint32 daily_active_point = 10; + */ + private int dailyActivePoint; + + /** + * optional uint32 world_level = 11; */ private int worldLevel; /** - * optional bool is_has_taken = 4; + * optional bool is_has_taken = 13; */ private boolean isHasTaken; @@ -49,62 +49,25 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 7; - * @return whether the dailyActivePoint field is set + * optional uint32 level = 4; + * @return whether the level field is set */ - public boolean hasDailyActivePoint() { + public boolean hasLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 daily_active_point = 7; - * @return this - */ - public DailyActivityInfo clearDailyActivePoint() { - bitField0_ &= ~0x00000001; - dailyActivePoint = 0; - return this; - } - - /** - * optional uint32 daily_active_point = 7; - * @return the dailyActivePoint - */ - public int getDailyActivePoint() { - return dailyActivePoint; - } - - /** - * optional uint32 daily_active_point = 7; - * @param value the dailyActivePoint to set - * @return this - */ - public DailyActivityInfo setDailyActivePoint(final int value) { - bitField0_ |= 0x00000001; - dailyActivePoint = value; - return this; - } - - /** - * optional uint32 level = 8; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 8; + * optional uint32 level = 4; * @return this */ public DailyActivityInfo clearLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; level = 0; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 4; * @return the level */ public int getLevel() { @@ -112,18 +75,55 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 4; * @param value the level to set * @return this */ public DailyActivityInfo setLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; level = value; return this; } /** - * optional uint32 world_level = 9; + * optional uint32 daily_active_point = 10; + * @return whether the dailyActivePoint field is set + */ + public boolean hasDailyActivePoint() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 daily_active_point = 10; + * @return this + */ + public DailyActivityInfo clearDailyActivePoint() { + bitField0_ &= ~0x00000002; + dailyActivePoint = 0; + return this; + } + + /** + * optional uint32 daily_active_point = 10; + * @return the dailyActivePoint + */ + public int getDailyActivePoint() { + return dailyActivePoint; + } + + /** + * optional uint32 daily_active_point = 10; + * @param value the dailyActivePoint to set + * @return this + */ + public DailyActivityInfo setDailyActivePoint(final int value) { + bitField0_ |= 0x00000002; + dailyActivePoint = value; + return this; + } + + /** + * optional uint32 world_level = 11; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -131,7 +131,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 11; * @return this */ public DailyActivityInfo clearWorldLevel() { @@ -141,7 +141,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 11; * @return the worldLevel */ public int getWorldLevel() { @@ -149,7 +149,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 11; * @param value the worldLevel to set * @return this */ @@ -160,7 +160,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 4; + * optional bool is_has_taken = 13; * @return whether the isHasTaken field is set */ public boolean hasIsHasTaken() { @@ -168,7 +168,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 4; + * optional bool is_has_taken = 13; * @return this */ public DailyActivityInfo clearIsHasTaken() { @@ -178,7 +178,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 4; + * optional bool is_has_taken = 13; * @return the isHasTaken */ public boolean getIsHasTaken() { @@ -186,7 +186,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional bool is_has_taken = 4; + * optional bool is_has_taken = 13; * @param value the isHasTaken to set * @return this */ @@ -201,8 +201,8 @@ public final class DailyActivityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dailyActivePoint = other.dailyActivePoint; level = other.level; + dailyActivePoint = other.dailyActivePoint; worldLevel = other.worldLevel; isHasTaken = other.isHasTaken; } @@ -215,12 +215,12 @@ public final class DailyActivityInfoOuterClass { return this; } cachedSize = -1; - if (other.hasDailyActivePoint()) { - setDailyActivePoint(other.dailyActivePoint); - } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasDailyActivePoint()) { + setDailyActivePoint(other.dailyActivePoint); + } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } @@ -237,8 +237,8 @@ public final class DailyActivityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dailyActivePoint = 0; level = 0; + dailyActivePoint = 0; worldLevel = 0; isHasTaken = false; return this; @@ -264,8 +264,8 @@ public final class DailyActivityInfoOuterClass { } DailyActivityInfo other = (DailyActivityInfo) o; return bitField0_ == other.bitField0_ - && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasLevel() || level == other.level) + && (!hasDailyActivePoint() || dailyActivePoint == other.dailyActivePoint) && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasIsHasTaken() || isHasTaken == other.isHasTaken); } @@ -273,19 +273,19 @@ public final class DailyActivityInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(dailyActivePoint); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(dailyActivePoint); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeBoolNoTag(isHasTaken); } } @@ -294,10 +294,10 @@ public final class DailyActivityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); @@ -315,34 +315,34 @@ public final class DailyActivityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // dailyActivePoint - dailyActivePoint = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 32: { // level level = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { + case 80: { + // dailyActivePoint + dailyActivePoint = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 32) { + if (tag != 104) { break; } } - case 32: { + case 104: { // isHasTaken isHasTaken = input.readBool(); bitField0_ |= 0x00000008; @@ -369,10 +369,10 @@ public final class DailyActivityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.dailyActivePoint, dailyActivePoint); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); @@ -390,11 +390,10 @@ public final class DailyActivityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 859671121: - case 1952864125: { - if (input.isAtField(FieldNames.dailyActivePoint)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - dailyActivePoint = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,10 +401,11 @@ public final class DailyActivityInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 859671121: + case 1952864125: { + if (input.isAtField(FieldNames.dailyActivePoint)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -490,10 +490,10 @@ public final class DailyActivityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); - static final FieldName level = FieldName.forField("level"); + static final FieldName dailyActivePoint = FieldName.forField("dailyActivePoint", "daily_active_point"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); static final FieldName isHasTaken = FieldName.forField("isHasTaken", "is_has_taken"); diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java index d532e93..74bac16 100644 --- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class DeactivateFarmElementCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 3; */ private int entityId; @@ -34,7 +34,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 3; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -42,7 +42,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 3; * @return this */ public DeactivateFarmElementCsReq clearEntityId() { @@ -52,7 +52,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 3; * @return the entityId */ public int getEntityId() { @@ -60,7 +60,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 3; * @param value the entityId to set * @return this */ @@ -129,7 +129,7 @@ public final class DeactivateFarmElementCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(entityId); } } @@ -150,7 +150,7 @@ public final class DeactivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 24: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java index cc50543..2acdfd9 100644 --- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java @@ -19,7 +19,7 @@ public final class DeactivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; */ private int retcode; @@ -39,7 +39,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return this */ public DeactivateFarmElementScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -177,7 +177,7 @@ public final class DeactivateFarmElementScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class DeactivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java index a49eee1..a421ed1 100644 --- a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class DelMailCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 2; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 2; * @return whether the idList field is set */ public boolean hasIdList() { @@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 2; * @return this */ public DelMailCsReq clearIdList() { @@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 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. @@ -67,7 +67,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 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 @@ -81,7 +81,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 2; * @param value the idList to add * @return this */ @@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 6; + * repeated uint32 id_list = 2; * @param values the idList to add * @return this */ @@ -163,7 +163,7 @@ public final class DelMailCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(idList.array()[i]); } } @@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 18: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 16: { // idList [packed=false] tag = input.readRepeatedUInt32(idList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java index c3ae4ed..96c909f 100644 --- a/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DelMailScRspOuterClass.java @@ -20,12 +20,12 @@ public final class DelMailScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated uint32 id_list = 12; + * repeated uint32 id_list = 13; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return this */ public DelMailScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_list = 13; * @return whether the idList field is set */ public boolean hasIdList() { @@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_list = 13; * @return this */ public DelMailScRsp clearIdList() { @@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_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. @@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_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 @@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_list = 13; * @param value the idList to add * @return this */ @@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 12; + * repeated uint32 id_list = 13; * @param values the idList to add * @return this */ @@ -210,12 +210,12 @@ public final class DelMailScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(idList.array()[i]); } } @@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { + case 106: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass { tag = input.readTag(); break; } - case 96: { + case 104: { // idList [packed=false] tag = input.readRepeatedUInt32(idList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java index 6988ce6..304e9c7 100644 --- a/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeleteFriendCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class DeleteFriendCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 10; + * optional uint32 uid = 11; */ private int uid; @@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 11; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 11; * @return this */ public DeleteFriendCsReq clearUid() { @@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 11; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 11; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class DeleteFriendCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java index dbf79a8..4ea23b0 100644 --- a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java @@ -19,20 +19,20 @@ public final class DestroyItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_count = 2; + * optional uint32 item_count = 5; */ private int itemCount; /** - * optional uint32 item_id = 11; - */ - private int itemId; - - /** - * optional uint32 cur_item_count = 12; + * optional uint32 cur_item_count = 8; */ private int curItemCount; + /** + * optional uint32 item_id = 14; + */ + private int itemId; + private DestroyItemCsReq() { } @@ -44,7 +44,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 2; + * optional uint32 item_count = 5; * @return whether the itemCount field is set */ public boolean hasItemCount() { @@ -52,7 +52,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 2; + * optional uint32 item_count = 5; * @return this */ public DestroyItemCsReq clearItemCount() { @@ -62,7 +62,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 2; + * optional uint32 item_count = 5; * @return the itemCount */ public int getItemCount() { @@ -70,7 +70,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 2; + * optional uint32 item_count = 5; * @param value the itemCount to set * @return this */ @@ -81,62 +81,25 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_id = 11; - * @return whether the itemId field is set + * optional uint32 cur_item_count = 8; + * @return whether the curItemCount field is set */ - public boolean hasItemId() { + public boolean hasCurItemCount() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 item_id = 11; - * @return this - */ - public DestroyItemCsReq clearItemId() { - bitField0_ &= ~0x00000002; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 11; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 11; - * @param value the itemId to set - * @return this - */ - public DestroyItemCsReq setItemId(final int value) { - bitField0_ |= 0x00000002; - itemId = value; - return this; - } - - /** - * optional uint32 cur_item_count = 12; - * @return whether the curItemCount field is set - */ - public boolean hasCurItemCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_item_count = 12; + * optional uint32 cur_item_count = 8; * @return this */ public DestroyItemCsReq clearCurItemCount() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curItemCount = 0; return this; } /** - * optional uint32 cur_item_count = 12; + * optional uint32 cur_item_count = 8; * @return the curItemCount */ public int getCurItemCount() { @@ -144,24 +107,61 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 cur_item_count = 12; + * optional uint32 cur_item_count = 8; * @param value the curItemCount to set * @return this */ public DestroyItemCsReq setCurItemCount(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curItemCount = value; return this; } + /** + * optional uint32 item_id = 14; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 item_id = 14; + * @return this + */ + public DestroyItemCsReq clearItemId() { + bitField0_ &= ~0x00000004; + itemId = 0; + return this; + } + + /** + * optional uint32 item_id = 14; + * @return the itemId + */ + public int getItemId() { + return itemId; + } + + /** + * optional uint32 item_id = 14; + * @param value the itemId to set + * @return this + */ + public DestroyItemCsReq setItemId(final int value) { + bitField0_ |= 0x00000004; + itemId = value; + return this; + } + @Override public DestroyItemCsReq copyFrom(final DestroyItemCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; itemCount = other.itemCount; - itemId = other.itemId; curItemCount = other.curItemCount; + itemId = other.itemId; } return this; } @@ -175,12 +175,12 @@ public final class DestroyItemCsReqOuterClass { if (other.hasItemCount()) { setItemCount(other.itemCount); } - if (other.hasItemId()) { - setItemId(other.itemId); - } if (other.hasCurItemCount()) { setCurItemCount(other.curItemCount); } + if (other.hasItemId()) { + setItemId(other.itemId); + } return this; } @@ -192,8 +192,8 @@ public final class DestroyItemCsReqOuterClass { cachedSize = -1; bitField0_ = 0; itemCount = 0; - itemId = 0; curItemCount = 0; + itemId = 0; return this; } @@ -218,23 +218,23 @@ public final class DestroyItemCsReqOuterClass { DestroyItemCsReq other = (DestroyItemCsReq) o; return bitField0_ == other.bitField0_ && (!hasItemCount() || itemCount == other.itemCount) - && (!hasItemId() || itemId == other.itemId) - && (!hasCurItemCount() || curItemCount == other.curItemCount); + && (!hasCurItemCount() || curItemCount == other.curItemCount) + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(itemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(curItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(curItemCount); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(itemId); } } @@ -245,10 +245,10 @@ public final class DestroyItemCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(itemCount); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curItemCount); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curItemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -260,27 +260,27 @@ public final class DestroyItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // itemCount itemCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { - // itemId - itemId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 64: { // curItemCount curItemCount = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class DestroyItemCsReqOuterClass { output.writeUInt32(FieldNames.itemCount, itemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.curItemCount, curItemCount); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.curItemCount, curItemCount); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -335,11 +335,11 @@ public final class DestroyItemCsReqOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case -986513572: + case -1822146494: { + if (input.isAtField(FieldNames.curItemCount)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + curItemCount = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class DestroyItemCsReqOuterClass { } break; } - case -986513572: - case -1822146494: { - if (input.isAtField(FieldNames.curItemCount)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - curItemCount = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -414,9 +414,9 @@ public final class DestroyItemCsReqOuterClass { static class FieldNames { static final FieldName itemCount = FieldName.forField("itemCount", "item_count"); - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName curItemCount = FieldName.forField("curItemCount", "cur_item_count"); + + static final FieldName itemId = FieldName.forField("itemId", "item_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java index 15072f5..8c8b334 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.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 DisplayAvatarDetailInfoOuterClass { @@ -20,27 +21,27 @@ public final class DisplayAvatarDetailInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 exp = 1; - */ - private int exp; - - /** - * optional uint32 avatar_id = 2; - */ - private int avatarId; - - /** - * optional uint32 rank = 4; - */ - private int rank; - - /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 4; */ private int dressedSkinId; /** - * optional uint32 level = 8; + * optional uint32 rank = 7; + */ + private int rank; + + /** + * optional uint32 exp = 8; + */ + private int exp; + + /** + * optional uint32 avatar_id = 9; + */ + private int avatarId; + + /** + * optional uint32 level = 10; */ private int level; @@ -50,25 +51,35 @@ public final class DisplayAvatarDetailInfoOuterClass { private int pos; /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 14; */ private int promotion; /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 5; */ private final DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo equipment = DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo.newInstance(); /** - * repeated .DisplayRelicInfo relic_list = 10; + * repeated uint32 all_path_unlocked_special_point_id_list = 1; */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(DisplayRelicInfoOuterClass.DisplayRelicInfo.getFactory()); + private final RepeatedInt allPathUnlockedSpecialPointIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 2; */ private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + */ + private final RepeatedMessage allPathSpecialSkilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + + /** + * repeated .DisplayRelicInfo relic_list = 11; + */ + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(DisplayRelicInfoOuterClass.DisplayRelicInfo.getFactory()); + private DisplayAvatarDetailInfo() { } @@ -80,136 +91,25 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 exp = 1; - * @return whether the exp field is set + * optional uint32 dressed_skin_id = 4; + * @return whether the dressedSkinId field is set */ - public boolean hasExp() { + public boolean hasDressedSkinId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 exp = 1; - * @return this - */ - public DisplayAvatarDetailInfo clearExp() { - bitField0_ &= ~0x00000001; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 1; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 1; - * @param value the exp to set - * @return this - */ - public DisplayAvatarDetailInfo setExp(final int value) { - bitField0_ |= 0x00000001; - exp = value; - return this; - } - - /** - * optional uint32 avatar_id = 2; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 avatar_id = 2; - * @return this - */ - public DisplayAvatarDetailInfo clearAvatarId() { - bitField0_ &= ~0x00000002; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 2; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 2; - * @param value the avatarId to set - * @return this - */ - public DisplayAvatarDetailInfo setAvatarId(final int value) { - bitField0_ |= 0x00000002; - avatarId = value; - return this; - } - - /** - * optional uint32 rank = 4; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 rank = 4; - * @return this - */ - public DisplayAvatarDetailInfo clearRank() { - bitField0_ &= ~0x00000004; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 4; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 4; - * @param value the rank to set - * @return this - */ - public DisplayAvatarDetailInfo setRank(final int value) { - bitField0_ |= 0x00000004; - rank = value; - return this; - } - - /** - * optional uint32 dressed_skin_id = 6; - * @return whether the dressedSkinId field is set - */ - public boolean hasDressedSkinId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 4; * @return this */ public DisplayAvatarDetailInfo clearDressedSkinId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; dressedSkinId = 0; return this; } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 4; * @return the dressedSkinId */ public int getDressedSkinId() { @@ -217,18 +117,129 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 dressed_skin_id = 6; + * optional uint32 dressed_skin_id = 4; * @param value the dressedSkinId to set * @return this */ public DisplayAvatarDetailInfo setDressedSkinId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; dressedSkinId = value; return this; } /** - * optional uint32 level = 8; + * optional uint32 rank = 7; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 rank = 7; + * @return this + */ + public DisplayAvatarDetailInfo clearRank() { + bitField0_ &= ~0x00000002; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 7; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 7; + * @param value the rank to set + * @return this + */ + public DisplayAvatarDetailInfo setRank(final int value) { + bitField0_ |= 0x00000002; + rank = value; + return this; + } + + /** + * optional uint32 exp = 8; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 exp = 8; + * @return this + */ + public DisplayAvatarDetailInfo clearExp() { + bitField0_ &= ~0x00000004; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 8; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 8; + * @param value the exp to set + * @return this + */ + public DisplayAvatarDetailInfo setExp(final int value) { + bitField0_ |= 0x00000004; + exp = value; + return this; + } + + /** + * optional uint32 avatar_id = 9; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 avatar_id = 9; + * @return this + */ + public DisplayAvatarDetailInfo clearAvatarId() { + bitField0_ &= ~0x00000008; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 9; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 9; + * @param value the avatarId to set + * @return this + */ + public DisplayAvatarDetailInfo setAvatarId(final int value) { + bitField0_ |= 0x00000008; + avatarId = value; + return this; + } + + /** + * optional uint32 level = 10; * @return whether the level field is set */ public boolean hasLevel() { @@ -236,7 +247,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 10; * @return this */ public DisplayAvatarDetailInfo clearLevel() { @@ -246,7 +257,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 10; * @return the level */ public int getLevel() { @@ -254,7 +265,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 10; * @param value the level to set * @return this */ @@ -302,7 +313,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 14; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -310,7 +321,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 14; * @return this */ public DisplayAvatarDetailInfo clearPromotion() { @@ -320,7 +331,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 14; * @return the promotion */ public int getPromotion() { @@ -328,7 +339,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 15; + * optional uint32 promotion = 14; * @param value the promotion to set * @return this */ @@ -339,7 +350,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 5; * @return whether the equipment field is set */ public boolean hasEquipment() { @@ -347,7 +358,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 5; * @return this */ public DisplayAvatarDetailInfo clearEquipment() { @@ -357,7 +368,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 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. @@ -371,7 +382,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 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 @@ -385,7 +396,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 3; + * optional .DisplayEquipmentInfo equipment = 5; * @param value the equipment to set * @return this */ @@ -397,39 +408,39 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .DisplayRelicInfo relic_list = 10; - * @return whether the relicList field is set + * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * @return whether the allPathUnlockedSpecialPointIdList field is set */ - public boolean hasRelicList() { + public boolean hasAllPathUnlockedSpecialPointIdList() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .DisplayRelicInfo relic_list = 10; + * repeated uint32 all_path_unlocked_special_point_id_list = 1; * @return this */ - public DisplayAvatarDetailInfo clearRelicList() { + public DisplayAvatarDetailInfo clearAllPathUnlockedSpecialPointIdList() { bitField0_ &= ~0x00000100; - relicList.clear(); + allPathUnlockedSpecialPointIdList.clear(); return this; } /** - * repeated .DisplayRelicInfo relic_list = 10; + * repeated uint32 all_path_unlocked_special_point_id_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 #getMutableRelicList()} if you want to modify it. + * Use {@link #getMutableAllPathUnlockedSpecialPointIdList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getRelicList() { - return relicList; + public RepeatedInt getAllPathUnlockedSpecialPointIdList() { + return allPathUnlockedSpecialPointIdList; } /** - * repeated .DisplayRelicInfo relic_list = 10; + * repeated uint32 all_path_unlocked_special_point_id_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 @@ -437,37 +448,35 @@ public final class DisplayAvatarDetailInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableRelicList() { + public RepeatedInt getMutableAllPathUnlockedSpecialPointIdList() { bitField0_ |= 0x00000100; - return relicList; + return allPathUnlockedSpecialPointIdList; } /** - * repeated .DisplayRelicInfo relic_list = 10; - * @param value the relicList to add + * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * @param value the allPathUnlockedSpecialPointIdList to add * @return this */ - public DisplayAvatarDetailInfo addRelicList( - final DisplayRelicInfoOuterClass.DisplayRelicInfo value) { + public DisplayAvatarDetailInfo addAllPathUnlockedSpecialPointIdList(final int value) { bitField0_ |= 0x00000100; - relicList.add(value); + allPathUnlockedSpecialPointIdList.add(value); return this; } /** - * repeated .DisplayRelicInfo relic_list = 10; - * @param values the relicList to add + * repeated uint32 all_path_unlocked_special_point_id_list = 1; + * @param values the allPathUnlockedSpecialPointIdList to add * @return this */ - public DisplayAvatarDetailInfo addAllRelicList( - final DisplayRelicInfoOuterClass.DisplayRelicInfo... values) { + public DisplayAvatarDetailInfo addAllAllPathUnlockedSpecialPointIdList(final int... values) { bitField0_ |= 0x00000100; - relicList.addAll(values); + allPathUnlockedSpecialPointIdList.addAll(values); return this; } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 2; * @return whether the skilltreeList field is set */ public boolean hasSkilltreeList() { @@ -475,7 +484,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 2; * @return this */ public DisplayAvatarDetailInfo clearSkilltreeList() { @@ -485,7 +494,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 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. @@ -499,7 +508,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 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 @@ -513,7 +522,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 2; * @param value the skilltreeList to add * @return this */ @@ -525,7 +534,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 14; + * repeated .AvatarSkillTree skilltree_list = 2; * @param values the skilltreeList to add * @return this */ @@ -536,21 +545,165 @@ public final class DisplayAvatarDetailInfoOuterClass { return this; } + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * @return whether the allPathSpecialSkilltreeList field is set + */ + public boolean hasAllPathSpecialSkilltreeList() { + return (bitField0_ & 0x00000400) != 0; + } + + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * @return this + */ + public DisplayAvatarDetailInfo clearAllPathSpecialSkilltreeList() { + bitField0_ &= ~0x00000400; + allPathSpecialSkilltreeList.clear(); + return this; + } + + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 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 #getMutableAllPathSpecialSkilltreeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getAllPathSpecialSkilltreeList( + ) { + return allPathSpecialSkilltreeList; + } + + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 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 RepeatedMessage getMutableAllPathSpecialSkilltreeList( + ) { + bitField0_ |= 0x00000400; + return allPathSpecialSkilltreeList; + } + + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * @param value the allPathSpecialSkilltreeList to add + * @return this + */ + public DisplayAvatarDetailInfo addAllPathSpecialSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + bitField0_ |= 0x00000400; + allPathSpecialSkilltreeList.add(value); + return this; + } + + /** + * repeated .AvatarSkillTree all_path_special_skilltree_list = 3; + * @param values the allPathSpecialSkilltreeList to add + * @return this + */ + public DisplayAvatarDetailInfo addAllAllPathSpecialSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + bitField0_ |= 0x00000400; + allPathSpecialSkilltreeList.addAll(values); + return this; + } + + /** + * repeated .DisplayRelicInfo relic_list = 11; + * @return whether the relicList field is set + */ + public boolean hasRelicList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .DisplayRelicInfo relic_list = 11; + * @return this + */ + public DisplayAvatarDetailInfo clearRelicList() { + bitField0_ &= ~0x00000800; + relicList.clear(); + return this; + } + + /** + * repeated .DisplayRelicInfo relic_list = 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 #getMutableRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRelicList() { + return relicList; + } + + /** + * repeated .DisplayRelicInfo relic_list = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableRelicList() { + bitField0_ |= 0x00000800; + return relicList; + } + + /** + * repeated .DisplayRelicInfo relic_list = 11; + * @param value the relicList to add + * @return this + */ + public DisplayAvatarDetailInfo addRelicList( + final DisplayRelicInfoOuterClass.DisplayRelicInfo value) { + bitField0_ |= 0x00000800; + relicList.add(value); + return this; + } + + /** + * repeated .DisplayRelicInfo relic_list = 11; + * @param values the relicList to add + * @return this + */ + public DisplayAvatarDetailInfo addAllRelicList( + final DisplayRelicInfoOuterClass.DisplayRelicInfo... values) { + bitField0_ |= 0x00000800; + relicList.addAll(values); + return this; + } + @Override public DisplayAvatarDetailInfo copyFrom(final DisplayAvatarDetailInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + dressedSkinId = other.dressedSkinId; + rank = other.rank; exp = other.exp; avatarId = other.avatarId; - rank = other.rank; - dressedSkinId = other.dressedSkinId; level = other.level; pos = other.pos; promotion = other.promotion; equipment.copyFrom(other.equipment); - relicList.copyFrom(other.relicList); + allPathUnlockedSpecialPointIdList.copyFrom(other.allPathUnlockedSpecialPointIdList); skilltreeList.copyFrom(other.skilltreeList); + allPathSpecialSkilltreeList.copyFrom(other.allPathSpecialSkilltreeList); + relicList.copyFrom(other.relicList); } return this; } @@ -561,18 +714,18 @@ public final class DisplayAvatarDetailInfoOuterClass { return this; } cachedSize = -1; + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } + if (other.hasRank()) { + setRank(other.rank); + } if (other.hasExp()) { setExp(other.exp); } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } - if (other.hasRank()) { - setRank(other.rank); - } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); - } if (other.hasLevel()) { setLevel(other.level); } @@ -585,12 +738,18 @@ public final class DisplayAvatarDetailInfoOuterClass { if (other.hasEquipment()) { getMutableEquipment().mergeFrom(other.equipment); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); + if (other.hasAllPathUnlockedSpecialPointIdList()) { + getMutableAllPathUnlockedSpecialPointIdList().addAll(other.allPathUnlockedSpecialPointIdList); } if (other.hasSkilltreeList()) { getMutableSkilltreeList().addAll(other.skilltreeList); } + if (other.hasAllPathSpecialSkilltreeList()) { + getMutableAllPathSpecialSkilltreeList().addAll(other.allPathSpecialSkilltreeList); + } + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); + } return this; } @@ -601,16 +760,18 @@ public final class DisplayAvatarDetailInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + dressedSkinId = 0; + rank = 0; exp = 0; avatarId = 0; - rank = 0; - dressedSkinId = 0; level = 0; pos = 0; promotion = 0; equipment.clear(); - relicList.clear(); + allPathUnlockedSpecialPointIdList.clear(); skilltreeList.clear(); + allPathSpecialSkilltreeList.clear(); + relicList.clear(); return this; } @@ -622,8 +783,10 @@ public final class DisplayAvatarDetailInfoOuterClass { cachedSize = -1; bitField0_ = 0; equipment.clearQuick(); - relicList.clearQuick(); + allPathUnlockedSpecialPointIdList.clear(); skilltreeList.clearQuick(); + allPathSpecialSkilltreeList.clearQuick(); + relicList.clearQuick(); return this; } @@ -637,38 +800,40 @@ public final class DisplayAvatarDetailInfoOuterClass { } DisplayAvatarDetailInfo other = (DisplayAvatarDetailInfo) o; return bitField0_ == other.bitField0_ + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) + && (!hasRank() || rank == other.rank) && (!hasExp() || exp == other.exp) && (!hasAvatarId() || avatarId == other.avatarId) - && (!hasRank() || rank == other.rank) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasLevel() || level == other.level) && (!hasPos() || pos == other.pos) && (!hasPromotion() || promotion == other.promotion) && (!hasEquipment() || equipment.equals(other.equipment)) - && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); + && (!hasAllPathUnlockedSpecialPointIdList() || allPathUnlockedSpecialPointIdList.equals(other.allPathUnlockedSpecialPointIdList)) + && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) + && (!hasAllPathSpecialSkilltreeList() || allPathSpecialSkilltreeList.equals(other.allPathSpecialSkilltreeList)) + && (!hasRelicList() || relicList.equals(other.relicList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(exp); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(avatarId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); output.writeUInt32NoTag(dressedSkinId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(rank); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); + output.writeUInt32NoTag(exp); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(avatarId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { @@ -676,41 +841,53 @@ public final class DisplayAvatarDetailInfoOuterClass { output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < allPathUnlockedSpecialPointIdList.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(allPathUnlockedSpecialPointIdList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 18); output.writeMessageNoTag(skilltreeList.get(i)); } } + if ((bitField0_ & 0x00000400) != 0) { + for (int i = 0; i < allPathSpecialSkilltreeList.length(); i++) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(allPathSpecialSkilltreeList.get(i)); + } + } + if ((bitField0_ & 0x00000800) != 0) { + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(relicList.get(i)); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); @@ -725,11 +902,17 @@ public final class DisplayAvatarDetailInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * allPathUnlockedSpecialPointIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(allPathUnlockedSpecialPointIdList); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } + if ((bitField0_ & 0x00000400) != 0) { + size += (1 * allPathSpecialSkilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(allPathSpecialSkilltreeList); + } + if ((bitField0_ & 0x00000800) != 0) { + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + } return size; } @@ -740,43 +923,43 @@ public final class DisplayAvatarDetailInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // avatarId - avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } case 32: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // dressedSkinId dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 64) { break; } } case 64: { + // exp + exp = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // avatarId + avatarId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // level level = input.readUInt32(); bitField0_ |= 0x00000010; @@ -790,40 +973,57 @@ public final class DisplayAvatarDetailInfoOuterClass { pos = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // equipment + input.readMessage(equipment); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // allPathUnlockedSpecialPointIdList [packed=true] + input.readPackedUInt32(allPathUnlockedSpecialPointIdList, tag); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // skilltreeList + tag = input.readRepeatedMessage(skilltreeList, tag); + bitField0_ |= 0x00000200; if (tag != 26) { break; } } case 26: { - // equipment - input.readMessage(equipment); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 82) { + // allPathSpecialSkilltreeList + tag = input.readRepeatedMessage(allPathSpecialSkilltreeList, tag); + bitField0_ |= 0x00000400; + if (tag != 90) { break; } } - case 82: { + case 90: { // relicList tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000100; - if (tag != 114) { - break; - } - } - case 114: { - // skilltreeList - tag = input.readRepeatedMessage(skilltreeList, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000800; if (tag != 0) { break; } @@ -838,6 +1038,12 @@ public final class DisplayAvatarDetailInfoOuterClass { tag = input.readTag(); break; } + case 8: { + // allPathUnlockedSpecialPointIdList [packed=false] + tag = input.readRepeatedUInt32(allPathUnlockedSpecialPointIdList, tag); + bitField0_ |= 0x00000100; + break; + } } } } @@ -846,16 +1052,16 @@ public final class DisplayAvatarDetailInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.rank, rank); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); @@ -870,11 +1076,17 @@ public final class DisplayAvatarDetailInfoOuterClass { output.writeMessage(FieldNames.equipment, equipment); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedUInt32(FieldNames.allPathUnlockedSpecialPointIdList, allPathUnlockedSpecialPointIdList); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRepeatedMessage(FieldNames.allPathSpecialSkilltreeList, allPathSpecialSkilltreeList); + } + if ((bitField0_ & 0x00000800) != 0) { + output.writeRepeatedMessage(FieldNames.relicList, relicList); + } output.endObject(); } @@ -885,11 +1097,34 @@ public final class DisplayAvatarDetailInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { + if (!input.trySkipNullValue()) { + dressedSkinId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -901,29 +1136,6 @@ public final class DisplayAvatarDetailInfoOuterClass { if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { - if (!input.trySkipNullValue()) { - rank = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { - if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -975,11 +1187,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case -1970298407: + case -46072851: { + if (input.isAtField(FieldNames.allPathUnlockedSpecialPointIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedUInt32(allPathUnlockedSpecialPointIdList); bitField0_ |= 0x00000100; } } else { @@ -999,6 +1211,30 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } + case 1838433530: + case 1435588976: { + if (input.isAtField(FieldNames.allPathSpecialSkilltreeList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(allPathSpecialSkilltreeList); + bitField0_ |= 0x00000400; + } + } else { + input.skipUnknownField(); + } + break; + } + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(relicList); + bitField0_ |= 0x00000800; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -1052,13 +1288,13 @@ public final class DisplayAvatarDetailInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName exp = FieldName.forField("exp"); - - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); static final FieldName rank = FieldName.forField("rank"); - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName exp = FieldName.forField("exp"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName level = FieldName.forField("level"); @@ -1068,9 +1304,13 @@ public final class DisplayAvatarDetailInfoOuterClass { static final FieldName equipment = FieldName.forField("equipment"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + static final FieldName allPathUnlockedSpecialPointIdList = FieldName.forField("allPathUnlockedSpecialPointIdList", "all_path_unlocked_special_point_id_list"); static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); + + static final FieldName allPathSpecialSkilltreeList = FieldName.forField("allPathSpecialSkilltreeList", "all_path_special_skilltree_list"); + + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java index 71a72be..f7f0a80 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java @@ -19,12 +19,12 @@ public final class DisplayAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pos = 7; + * optional uint32 pos = 2; */ private int pos; /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; */ private int avatarId; @@ -39,7 +39,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 7; + * optional uint32 pos = 2; * @return whether the pos field is set */ public boolean hasPos() { @@ -47,7 +47,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 7; + * optional uint32 pos = 2; * @return this */ public DisplayAvatar clearPos() { @@ -57,7 +57,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 7; + * optional uint32 pos = 2; * @return the pos */ public int getPos() { @@ -65,7 +65,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 pos = 7; + * optional uint32 pos = 2; * @param value the pos to set * @return this */ @@ -76,7 +76,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -84,7 +84,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return this */ public DisplayAvatar clearAvatarId() { @@ -94,7 +94,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @return the avatarId */ public int getAvatarId() { @@ -102,7 +102,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 14; + * optional uint32 avatar_id = 13; * @param value the avatarId to set * @return this */ @@ -177,11 +177,11 @@ public final class DisplayAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(avatarId); } } @@ -205,16 +205,16 @@ public final class DisplayAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // pos pos = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java index 9278cbf..6696663 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarVecOuterClass.java @@ -20,12 +20,12 @@ public final class DisplayAvatarVecOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_display = 12; + * optional bool is_display = 13; */ private boolean isDisplay; /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_list = 8; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 12; + * optional bool is_display = 13; * @return whether the isDisplay field is set */ public boolean hasIsDisplay() { @@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 12; + * optional bool is_display = 13; * @return this */ public DisplayAvatarVec clearIsDisplay() { @@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 12; + * optional bool is_display = 13; * @return the isDisplay */ public boolean getIsDisplay() { @@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 12; + * optional bool is_display = 13; * @param value the isDisplay to set * @return this */ @@ -77,7 +77,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_list = 8; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_list = 8; * @return this */ public DisplayAvatarVec clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_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. @@ -109,7 +109,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_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 @@ -123,7 +123,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_list = 8; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 11; + * repeated .DisplayAvatar display_avatar_list = 8; * @param values the displayAvatarList to add * @return this */ @@ -212,12 +212,12 @@ public final class DisplayAvatarVecOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeBoolNoTag(isDisplay); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 66); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class DisplayAvatarVecOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 104: { // isDisplay isDisplay = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 66) { break; } } - case 90: { + case 66: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java index 88f2ba0..5697f33 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java @@ -19,25 +19,25 @@ public final class DisplayEquipmentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 4; - */ - private int promotion; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 rank = 9; + * optional uint32 rank = 1; */ private int rank; /** - * optional uint32 exp = 10; + * optional uint32 exp = 3; */ private int exp; + /** + * optional uint32 promotion = 5; + */ + private int promotion; + + /** + * optional uint32 level = 7; + */ + private int level; + /** * optional uint32 tid = 11; */ @@ -54,99 +54,25 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 promotion = 4; - * @return whether the promotion field is set + * optional uint32 rank = 1; + * @return whether the rank field is set */ - public boolean hasPromotion() { + public boolean hasRank() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 promotion = 4; - * @return this - */ - public DisplayEquipmentInfo clearPromotion() { - bitField0_ &= ~0x00000001; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 4; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 4; - * @param value the promotion to set - * @return this - */ - public DisplayEquipmentInfo setPromotion(final int value) { - bitField0_ |= 0x00000001; - promotion = value; - return this; - } - - /** - * optional uint32 level = 8; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 8; - * @return this - */ - public DisplayEquipmentInfo clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 8; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 8; - * @param value the level to set - * @return this - */ - public DisplayEquipmentInfo setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 rank = 9; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 rank = 9; + * optional uint32 rank = 1; * @return this */ public DisplayEquipmentInfo clearRank() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; rank = 0; return this; } /** - * optional uint32 rank = 9; + * optional uint32 rank = 1; * @return the rank */ public int getRank() { @@ -154,36 +80,36 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 rank = 9; + * optional uint32 rank = 1; * @param value the rank to set * @return this */ public DisplayEquipmentInfo setRank(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; rank = value; return this; } /** - * optional uint32 exp = 10; + * optional uint32 exp = 3; * @return whether the exp field is set */ public boolean hasExp() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 exp = 10; + * optional uint32 exp = 3; * @return this */ public DisplayEquipmentInfo clearExp() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; exp = 0; return this; } /** - * optional uint32 exp = 10; + * optional uint32 exp = 3; * @return the exp */ public int getExp() { @@ -191,16 +117,90 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 exp = 10; + * optional uint32 exp = 3; * @param value the exp to set * @return this */ public DisplayEquipmentInfo setExp(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; exp = value; return this; } + /** + * optional uint32 promotion = 5; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 promotion = 5; + * @return this + */ + public DisplayEquipmentInfo clearPromotion() { + bitField0_ &= ~0x00000004; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 5; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 5; + * @param value the promotion to set + * @return this + */ + public DisplayEquipmentInfo setPromotion(final int value) { + bitField0_ |= 0x00000004; + promotion = value; + return this; + } + + /** + * optional uint32 level = 7; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 level = 7; + * @return this + */ + public DisplayEquipmentInfo clearLevel() { + bitField0_ &= ~0x00000008; + level = 0; + return this; + } + + /** + * optional uint32 level = 7; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 7; + * @param value the level to set + * @return this + */ + public DisplayEquipmentInfo setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + /** * optional uint32 tid = 11; * @return whether the tid field is set @@ -243,10 +243,10 @@ public final class DisplayEquipmentInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - promotion = other.promotion; - level = other.level; rank = other.rank; exp = other.exp; + promotion = other.promotion; + level = other.level; tid = other.tid; } return this; @@ -258,18 +258,18 @@ public final class DisplayEquipmentInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasRank()) { setRank(other.rank); } if (other.hasExp()) { setExp(other.exp); } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasTid()) { setTid(other.tid); } @@ -283,10 +283,10 @@ public final class DisplayEquipmentInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - promotion = 0; - level = 0; rank = 0; exp = 0; + promotion = 0; + level = 0; tid = 0; return this; } @@ -311,31 +311,31 @@ public final class DisplayEquipmentInfoOuterClass { } DisplayEquipmentInfo other = (DisplayEquipmentInfo) o; return bitField0_ == other.bitField0_ - && (!hasPromotion() || promotion == other.promotion) - && (!hasLevel() || level == other.level) && (!hasRank() || rank == other.rank) && (!hasExp() || exp == other.exp) + && (!hasPromotion() || promotion == other.promotion) + && (!hasLevel() || level == other.level) && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(rank); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); output.writeUInt32NoTag(exp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(promotion); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 88); output.writeUInt32NoTag(tid); @@ -346,17 +346,17 @@ public final class DisplayEquipmentInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } @@ -370,36 +370,36 @@ public final class DisplayEquipmentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 8: { // rank rank = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 24) { break; } } - case 80: { + case 24: { // exp exp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // promotion + promotion = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 88) { @@ -433,17 +433,17 @@ public final class DisplayEquipmentInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.exp, exp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.promotion, promotion); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.tid, tid); } @@ -457,33 +457,11 @@ public final class DisplayEquipmentInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 3492908: { if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { rank = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -494,6 +472,28 @@ public final class DisplayEquipmentInfoOuterClass { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { + if (!input.trySkipNullValue()) { + promotion = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -565,14 +565,14 @@ public final class DisplayEquipmentInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName promotion = FieldName.forField("promotion"); - - static final FieldName level = FieldName.forField("level"); - static final FieldName rank = FieldName.forField("rank"); static final FieldName exp = FieldName.forField("exp"); + static final FieldName promotion = FieldName.forField("promotion"); + + static final FieldName level = FieldName.forField("level"); + static final FieldName tid = FieldName.forField("tid"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java index 5e277b2..2958ff3 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java @@ -20,14 +20,9 @@ public final class DisplayRelicInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 exp = 4; + * optional uint32 slot = 5; */ - private int exp; - - /** - * optional uint32 level = 7; - */ - private int level; + private int slot; /** * optional uint32 tid = 8; @@ -35,17 +30,22 @@ public final class DisplayRelicInfoOuterClass { private int tid; /** - * optional uint32 slot = 11; + * optional uint32 level = 12; */ - private int slot; + private int level; /** - * optional uint32 main_affix_id = 12; + * optional uint32 exp = 13; + */ + private int exp; + + /** + * optional uint32 main_affix_id = 15; */ private int mainAffixId; /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 10; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -60,76 +60,39 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 4; - * @return whether the exp field is set + * optional uint32 slot = 5; + * @return whether the slot field is set */ - public boolean hasExp() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 exp = 4; + * optional uint32 slot = 5; * @return this */ - public DisplayRelicInfo clearExp() { + public DisplayRelicInfo clearSlot() { bitField0_ &= ~0x00000001; - exp = 0; + slot = 0; return this; } /** - * optional uint32 exp = 4; - * @return the exp + * optional uint32 slot = 5; + * @return the slot */ - public int getExp() { - return exp; + public int getSlot() { + return slot; } /** - * optional uint32 exp = 4; - * @param value the exp to set + * optional uint32 slot = 5; + * @param value the slot to set * @return this */ - public DisplayRelicInfo setExp(final int value) { + public DisplayRelicInfo setSlot(final int value) { bitField0_ |= 0x00000001; - exp = value; - return this; - } - - /** - * optional uint32 level = 7; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 7; - * @return this - */ - public DisplayRelicInfo clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 7; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 7; - * @param value the level to set - * @return this - */ - public DisplayRelicInfo setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; + slot = value; return this; } @@ -138,7 +101,7 @@ public final class DisplayRelicInfoOuterClass { * @return whether the tid field is set */ public boolean hasTid() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -146,7 +109,7 @@ public final class DisplayRelicInfoOuterClass { * @return this */ public DisplayRelicInfo clearTid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; tid = 0; return this; } @@ -165,50 +128,87 @@ public final class DisplayRelicInfoOuterClass { * @return this */ public DisplayRelicInfo setTid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tid = value; return this; } /** - * optional uint32 slot = 11; - * @return whether the slot field is set + * optional uint32 level = 12; + * @return whether the level field is set */ - public boolean hasSlot() { + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 12; + * @return this + */ + public DisplayRelicInfo clearLevel() { + bitField0_ &= ~0x00000004; + level = 0; + return this; + } + + /** + * optional uint32 level = 12; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 12; + * @param value the level to set + * @return this + */ + public DisplayRelicInfo setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + + /** + * optional uint32 exp = 13; + * @return whether the exp field is set + */ + public boolean hasExp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 slot = 11; + * optional uint32 exp = 13; * @return this */ - public DisplayRelicInfo clearSlot() { + public DisplayRelicInfo clearExp() { bitField0_ &= ~0x00000008; - slot = 0; + exp = 0; return this; } /** - * optional uint32 slot = 11; - * @return the slot + * optional uint32 exp = 13; + * @return the exp */ - public int getSlot() { - return slot; + public int getExp() { + return exp; } /** - * optional uint32 slot = 11; - * @param value the slot to set + * optional uint32 exp = 13; + * @param value the exp to set * @return this */ - public DisplayRelicInfo setSlot(final int value) { + public DisplayRelicInfo setExp(final int value) { bitField0_ |= 0x00000008; - slot = value; + exp = value; return this; } /** - * optional uint32 main_affix_id = 12; + * optional uint32 main_affix_id = 15; * @return whether the mainAffixId field is set */ public boolean hasMainAffixId() { @@ -216,7 +216,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 main_affix_id = 12; + * optional uint32 main_affix_id = 15; * @return this */ public DisplayRelicInfo clearMainAffixId() { @@ -226,7 +226,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 main_affix_id = 12; + * optional uint32 main_affix_id = 15; * @return the mainAffixId */ public int getMainAffixId() { @@ -234,7 +234,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 main_affix_id = 12; + * optional uint32 main_affix_id = 15; * @param value the mainAffixId to set * @return this */ @@ -245,7 +245,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 10; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -253,7 +253,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 10; * @return this */ public DisplayRelicInfo clearSubAffixList() { @@ -263,7 +263,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 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. @@ -277,7 +277,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 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 @@ -291,7 +291,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 10; * @param value the subAffixList to add * @return this */ @@ -302,7 +302,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 9; + * repeated .RelicAffix sub_affix_list = 10; * @param values the subAffixList to add * @return this */ @@ -317,10 +317,10 @@ public final class DisplayRelicInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - exp = other.exp; - level = other.level; - tid = other.tid; slot = other.slot; + tid = other.tid; + level = other.level; + exp = other.exp; mainAffixId = other.mainAffixId; subAffixList.copyFrom(other.subAffixList); } @@ -333,17 +333,17 @@ public final class DisplayRelicInfoOuterClass { return this; } cachedSize = -1; - if (other.hasExp()) { - setExp(other.exp); - } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasSlot()) { + setSlot(other.slot); } if (other.hasTid()) { setTid(other.tid); } - if (other.hasSlot()) { - setSlot(other.slot); + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasExp()) { + setExp(other.exp); } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); @@ -361,10 +361,10 @@ public final class DisplayRelicInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - exp = 0; - level = 0; - tid = 0; slot = 0; + tid = 0; + level = 0; + exp = 0; mainAffixId = 0; subAffixList.clear(); return this; @@ -391,10 +391,10 @@ public final class DisplayRelicInfoOuterClass { } DisplayRelicInfo other = (DisplayRelicInfo) o; return bitField0_ == other.bitField0_ - && (!hasExp() || exp == other.exp) - && (!hasLevel() || level == other.level) - && (!hasTid() || tid == other.tid) && (!hasSlot() || slot == other.slot) + && (!hasTid() || tid == other.tid) + && (!hasLevel() || level == other.level) + && (!hasExp() || exp == other.exp) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @@ -402,28 +402,28 @@ public final class DisplayRelicInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(tid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -433,16 +433,16 @@ public final class DisplayRelicInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); @@ -460,20 +460,11 @@ public final class DisplayRelicInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // exp - exp = input.readUInt32(); + case 40: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 64) { break; } @@ -481,31 +472,40 @@ public final class DisplayRelicInfoOuterClass { case 64: { // tid tid = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // slot - slot = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 96) { break; } } case 96: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // exp + exp = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // mainAffixId mainAffixId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { + case 82: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000020; @@ -531,16 +531,16 @@ public final class DisplayRelicInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.tid, tid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); @@ -558,10 +558,10 @@ public final class DisplayRelicInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -569,21 +569,21 @@ public final class DisplayRelicInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 114831: { if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { tid = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -591,10 +591,10 @@ public final class DisplayRelicInfoOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -679,13 +679,13 @@ public final class DisplayRelicInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName exp = FieldName.forField("exp"); - - static final FieldName level = FieldName.forField("level"); + static final FieldName slot = FieldName.forField("slot"); static final FieldName tid = FieldName.forField("tid"); - static final FieldName slot = FieldName.forField("slot"); + static final FieldName level = FieldName.forField("level"); + + static final FieldName exp = FieldName.forField("exp"); static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java index 377bc7a..4a67f4b 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java @@ -19,25 +19,25 @@ public final class DoGachaCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_id = 7; - */ - private int gachaId; - - /** - * optional uint32 gacha_random = 9; - */ - private int gachaRandom; - - /** - * optional uint32 gacha_num = 10; + * optional uint32 gacha_num = 6; */ private int gachaNum; /** - * optional uint32 simulate_magic = 13; + * optional uint32 simulate_magic = 7; */ private int simulateMagic; + /** + * optional uint32 gacha_id = 12; + */ + private int gachaId; + + /** + * optional uint32 gacha_random = 14; + */ + private int gachaRandom; + private DoGachaCsReq() { } @@ -49,99 +49,25 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_id = 7; - * @return whether the gachaId field is set + * optional uint32 gacha_num = 6; + * @return whether the gachaNum field is set */ - public boolean hasGachaId() { + public boolean hasGachaNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_id = 7; - * @return this - */ - public DoGachaCsReq clearGachaId() { - bitField0_ &= ~0x00000001; - gachaId = 0; - return this; - } - - /** - * optional uint32 gacha_id = 7; - * @return the gachaId - */ - public int getGachaId() { - return gachaId; - } - - /** - * optional uint32 gacha_id = 7; - * @param value the gachaId to set - * @return this - */ - public DoGachaCsReq setGachaId(final int value) { - bitField0_ |= 0x00000001; - gachaId = value; - return this; - } - - /** - * optional uint32 gacha_random = 9; - * @return whether the gachaRandom field is set - */ - public boolean hasGachaRandom() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_random = 9; - * @return this - */ - public DoGachaCsReq clearGachaRandom() { - bitField0_ &= ~0x00000002; - gachaRandom = 0; - return this; - } - - /** - * optional uint32 gacha_random = 9; - * @return the gachaRandom - */ - public int getGachaRandom() { - return gachaRandom; - } - - /** - * optional uint32 gacha_random = 9; - * @param value the gachaRandom to set - * @return this - */ - public DoGachaCsReq setGachaRandom(final int value) { - bitField0_ |= 0x00000002; - gachaRandom = value; - return this; - } - - /** - * optional uint32 gacha_num = 10; - * @return whether the gachaNum field is set - */ - public boolean hasGachaNum() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_num = 10; + * optional uint32 gacha_num = 6; * @return this */ public DoGachaCsReq clearGachaNum() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; gachaNum = 0; return this; } /** - * optional uint32 gacha_num = 10; + * optional uint32 gacha_num = 6; * @return the gachaNum */ public int getGachaNum() { @@ -149,36 +75,36 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_num = 10; + * optional uint32 gacha_num = 6; * @param value the gachaNum to set * @return this */ public DoGachaCsReq setGachaNum(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; gachaNum = value; return this; } /** - * optional uint32 simulate_magic = 13; + * optional uint32 simulate_magic = 7; * @return whether the simulateMagic field is set */ public boolean hasSimulateMagic() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 simulate_magic = 13; + * optional uint32 simulate_magic = 7; * @return this */ public DoGachaCsReq clearSimulateMagic() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; simulateMagic = 0; return this; } /** - * optional uint32 simulate_magic = 13; + * optional uint32 simulate_magic = 7; * @return the simulateMagic */ public int getSimulateMagic() { @@ -186,25 +112,99 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 simulate_magic = 13; + * optional uint32 simulate_magic = 7; * @param value the simulateMagic to set * @return this */ public DoGachaCsReq setSimulateMagic(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; simulateMagic = value; return this; } + /** + * optional uint32 gacha_id = 12; + * @return whether the gachaId field is set + */ + public boolean hasGachaId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 gacha_id = 12; + * @return this + */ + public DoGachaCsReq clearGachaId() { + bitField0_ &= ~0x00000004; + gachaId = 0; + return this; + } + + /** + * optional uint32 gacha_id = 12; + * @return the gachaId + */ + public int getGachaId() { + return gachaId; + } + + /** + * optional uint32 gacha_id = 12; + * @param value the gachaId to set + * @return this + */ + public DoGachaCsReq setGachaId(final int value) { + bitField0_ |= 0x00000004; + gachaId = value; + return this; + } + + /** + * optional uint32 gacha_random = 14; + * @return whether the gachaRandom field is set + */ + public boolean hasGachaRandom() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 gacha_random = 14; + * @return this + */ + public DoGachaCsReq clearGachaRandom() { + bitField0_ &= ~0x00000008; + gachaRandom = 0; + return this; + } + + /** + * optional uint32 gacha_random = 14; + * @return the gachaRandom + */ + public int getGachaRandom() { + return gachaRandom; + } + + /** + * optional uint32 gacha_random = 14; + * @param value the gachaRandom to set + * @return this + */ + public DoGachaCsReq setGachaRandom(final int value) { + bitField0_ |= 0x00000008; + gachaRandom = value; + return this; + } + @Override public DoGachaCsReq copyFrom(final DoGachaCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaId = other.gachaId; - gachaRandom = other.gachaRandom; gachaNum = other.gachaNum; simulateMagic = other.simulateMagic; + gachaId = other.gachaId; + gachaRandom = other.gachaRandom; } return this; } @@ -215,18 +215,18 @@ public final class DoGachaCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGachaId()) { - setGachaId(other.gachaId); - } - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } if (other.hasSimulateMagic()) { setSimulateMagic(other.simulateMagic); } + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); + } return this; } @@ -237,10 +237,10 @@ public final class DoGachaCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - gachaId = 0; - gachaRandom = 0; gachaNum = 0; simulateMagic = 0; + gachaId = 0; + gachaRandom = 0; return this; } @@ -264,47 +264,47 @@ public final class DoGachaCsReqOuterClass { } DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGachaId() || gachaId == other.gachaId) - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasGachaNum() || gachaNum == other.gachaNum) - && (!hasSimulateMagic() || simulateMagic == other.simulateMagic); + && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) + && (!hasGachaId() || gachaId == other.gachaId) + && (!hasGachaRandom() || gachaRandom == other.gachaRandom); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(gachaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(gachaNum); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); output.writeUInt32NoTag(simulateMagic); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(gachaId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(gachaRandom); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + } return size; } @@ -315,36 +315,36 @@ public final class DoGachaCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // gachaId - gachaId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // gachaRandom - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 48: { // gachaNum gachaNum = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { + case 56: { // simulateMagic simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // gachaId + gachaId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // gachaRandom + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +369,17 @@ public final class DoGachaCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaNum, gachaNum); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.simulateMagic, simulateMagic); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.gachaId, gachaId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + } output.endObject(); } @@ -390,36 +390,12 @@ public final class DoGachaCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { - if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { - if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -2052317532: case 803166025: { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -431,6 +407,30 @@ public final class DoGachaCsReqOuterClass { if (input.isAtField(FieldNames.simulateMagic)) { if (!input.trySkipNullValue()) { simulateMagic = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { + if (!input.trySkipNullValue()) { + gachaId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { + if (!input.trySkipNullValue()) { + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public final class DoGachaCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - - static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); + + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + + static final FieldName gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index 3f63af2..60672f5 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -20,9 +20,14 @@ public final class DoGachaScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 ceiling_num = 3; */ - private int retcode; + private int ceilingNum; + + /** + * optional uint32 gacha_num = 8; + */ + private int gachaNum; /** * optional uint32 gacha_id = 10; @@ -30,21 +35,12 @@ public final class DoGachaScRspOuterClass { private int gachaId; /** - * optional uint32 gacha_num = 12; + * optional uint32 retcode = 14; */ - private int gachaNum; + private int retcode; /** - * 
-     *  TODO (possible value: 13, 3, 6, 4, 7)
-     *
- * - * optional uint32 ceiling_num = 13; - */ - private int ceilingNum; - - /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 2; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -59,39 +55,76 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set + * optional uint32 ceiling_num = 3; + * @return whether the ceilingNum field is set */ - public boolean hasRetcode() { + public boolean hasCeilingNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 8; + * optional uint32 ceiling_num = 3; * @return this */ - public DoGachaScRsp clearRetcode() { + public DoGachaScRsp clearCeilingNum() { bitField0_ &= ~0x00000001; - retcode = 0; + ceilingNum = 0; return this; } /** - * optional uint32 retcode = 8; - * @return the retcode + * optional uint32 ceiling_num = 3; + * @return the ceilingNum */ - public int getRetcode() { - return retcode; + public int getCeilingNum() { + return ceilingNum; } /** - * optional uint32 retcode = 8; - * @param value the retcode to set + * optional uint32 ceiling_num = 3; + * @param value the ceilingNum to set * @return this */ - public DoGachaScRsp setRetcode(final int value) { + public DoGachaScRsp setCeilingNum(final int value) { bitField0_ |= 0x00000001; - retcode = value; + ceilingNum = value; + return this; + } + + /** + * optional uint32 gacha_num = 8; + * @return whether the gachaNum field is set + */ + public boolean hasGachaNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 gacha_num = 8; + * @return this + */ + public DoGachaScRsp clearGachaNum() { + bitField0_ &= ~0x00000002; + gachaNum = 0; + return this; + } + + /** + * optional uint32 gacha_num = 8; + * @return the gachaNum + */ + public int getGachaNum() { + return gachaNum; + } + + /** + * optional uint32 gacha_num = 8; + * @param value the gachaNum to set + * @return this + */ + public DoGachaScRsp setGachaNum(final int value) { + bitField0_ |= 0x00000002; + gachaNum = value; return this; } @@ -100,7 +133,7 @@ public final class DoGachaScRspOuterClass { * @return whether the gachaId field is set */ public boolean hasGachaId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -108,7 +141,7 @@ public final class DoGachaScRspOuterClass { * @return this */ public DoGachaScRsp clearGachaId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; gachaId = 0; return this; } @@ -127,103 +160,50 @@ public final class DoGachaScRspOuterClass { * @return this */ public DoGachaScRsp setGachaId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; gachaId = value; return this; } /** - * optional uint32 gacha_num = 12; - * @return whether the gachaNum field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasGachaNum() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 gacha_num = 12; - * @return this - */ - public DoGachaScRsp clearGachaNum() { - bitField0_ &= ~0x00000004; - gachaNum = 0; - return this; - } - - /** - * optional uint32 gacha_num = 12; - * @return the gachaNum - */ - public int getGachaNum() { - return gachaNum; - } - - /** - * optional uint32 gacha_num = 12; - * @param value the gachaNum to set - * @return this - */ - public DoGachaScRsp setGachaNum(final int value) { - bitField0_ |= 0x00000004; - gachaNum = value; - return this; - } - - /** - * 
-     *  TODO (possible value: 13, 3, 6, 4, 7)
-     *
- * - * optional uint32 ceiling_num = 13; - * @return whether the ceilingNum field is set - */ - public boolean hasCeilingNum() { + public boolean hasRetcode() { return (bitField0_ & 0x00000008) != 0; } /** - * 
-     *  TODO (possible value: 13, 3, 6, 4, 7)
-     *
- * - * optional uint32 ceiling_num = 13; + * optional uint32 retcode = 14; * @return this */ - public DoGachaScRsp clearCeilingNum() { + public DoGachaScRsp clearRetcode() { bitField0_ &= ~0x00000008; - ceilingNum = 0; + retcode = 0; return this; } /** - * 
-     *  TODO (possible value: 13, 3, 6, 4, 7)
-     *
- * - * optional uint32 ceiling_num = 13; - * @return the ceilingNum + * optional uint32 retcode = 14; + * @return the retcode */ - public int getCeilingNum() { - return ceilingNum; + public int getRetcode() { + return retcode; } /** - * 
-     *  TODO (possible value: 13, 3, 6, 4, 7)
-     *
- * - * optional uint32 ceiling_num = 13; - * @param value the ceilingNum to set + * optional uint32 retcode = 14; + * @param value the retcode to set * @return this */ - public DoGachaScRsp setCeilingNum(final int value) { + public DoGachaScRsp setRetcode(final int value) { bitField0_ |= 0x00000008; - ceilingNum = value; + retcode = value; return this; } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 2; * @return whether the gachaItemList field is set */ public boolean hasGachaItemList() { @@ -231,7 +211,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 2; * @return this */ public DoGachaScRsp clearGachaItemList() { @@ -241,7 +221,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 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. @@ -255,7 +235,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 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 @@ -269,7 +249,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 2; * @param value the gachaItemList to add * @return this */ @@ -280,7 +260,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 1; + * repeated .GachaItem gacha_item_list = 2; * @param values the gachaItemList to add * @return this */ @@ -295,10 +275,10 @@ public final class DoGachaScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; - gachaId = other.gachaId; - gachaNum = other.gachaNum; ceilingNum = other.ceilingNum; + gachaNum = other.gachaNum; + gachaId = other.gachaId; + retcode = other.retcode; gachaItemList.copyFrom(other.gachaItemList); } return this; @@ -310,17 +290,17 @@ public final class DoGachaScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasGachaId()) { - setGachaId(other.gachaId); + if (other.hasCeilingNum()) { + setCeilingNum(other.ceilingNum); } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } - if (other.hasCeilingNum()) { - setCeilingNum(other.ceilingNum); + if (other.hasGachaId()) { + setGachaId(other.gachaId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasGachaItemList()) { getMutableGachaItemList().addAll(other.gachaItemList); @@ -335,10 +315,10 @@ public final class DoGachaScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - gachaId = 0; - gachaNum = 0; ceilingNum = 0; + gachaNum = 0; + gachaId = 0; + retcode = 0; gachaItemList.clear(); return this; } @@ -364,34 +344,34 @@ public final class DoGachaScRspOuterClass { } DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasGachaId() || gachaId == other.gachaId) - && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasCeilingNum() || ceilingNum == other.ceilingNum) + && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasGachaId() || gachaId == other.gachaId) + && (!hasRetcode() || retcode == other.retcode) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(gachaNum); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(gachaId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(gachaNum); - } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(ceilingNum); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -401,16 +381,16 @@ public final class DoGachaScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); @@ -425,11 +405,20 @@ public final class DoGachaScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // retcode - retcode = input.readUInt32(); + case 24: { + // ceilingNum + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // gachaNum + gachaNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 80) { break; } @@ -437,31 +426,22 @@ public final class DoGachaScRspOuterClass { case 80: { // gachaId gachaId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // gachaNum - gachaNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // ceilingNum - ceilingNum = input.readUInt32(); + case 112: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); bitField0_ |= 0x00000010; @@ -487,16 +467,16 @@ public final class DoGachaScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.ceilingNum, ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaId, gachaId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaNum, gachaNum); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.gachaId, gachaId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.ceilingNum, ceilingNum); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); @@ -511,10 +491,11 @@ public final class DoGachaScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1655838327: + case 209119492: { + if (input.isAtField(FieldNames.ceilingNum)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -522,23 +503,23 @@ public final class DoGachaScRspOuterClass { } break; } - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { - if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -2052317532: case 803166025: { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { + if (!input.trySkipNullValue()) { + gachaId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -546,11 +527,10 @@ public final class DoGachaScRspOuterClass { } break; } - case -1655838327: - case 209119492: { - if (input.isAtField(FieldNames.ceilingNum)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - ceilingNum = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -622,13 +602,13 @@ public final class DoGachaScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); - static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); + + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName gachaItemList = FieldName.forField("gachaItemList", "gacha_item_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java index da3af14..9d34887 100644 --- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java @@ -19,16 +19,12 @@ public final class DressAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equip_avatar_id = 2; + * optional uint32 avatar_id = 2; */ - private int equipAvatarId; + private int avatarId; /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * optional uint32 equipment_unique_id = 14; + * optional uint32 equipment_unique_id = 4; */ private int equipmentUniqueId; @@ -43,48 +39,44 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equip_avatar_id = 2; - * @return whether the equipAvatarId field is set + * optional uint32 avatar_id = 2; + * @return whether the avatarId field is set */ - public boolean hasEquipAvatarId() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equip_avatar_id = 2; + * optional uint32 avatar_id = 2; * @return this */ - public DressAvatarCsReq clearEquipAvatarId() { + public DressAvatarCsReq clearAvatarId() { bitField0_ &= ~0x00000001; - equipAvatarId = 0; + avatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 2; - * @return the equipAvatarId + * optional uint32 avatar_id = 2; + * @return the avatarId */ - public int getEquipAvatarId() { - return equipAvatarId; + public int getAvatarId() { + return avatarId; } /** - * optional uint32 equip_avatar_id = 2; - * @param value the equipAvatarId to set + * optional uint32 avatar_id = 2; + * @param value the avatarId to set * @return this */ - public DressAvatarCsReq setEquipAvatarId(final int value) { + public DressAvatarCsReq setAvatarId(final int value) { bitField0_ |= 0x00000001; - equipAvatarId = value; + avatarId = value; return this; } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * optional uint32 equipment_unique_id = 14; + * optional uint32 equipment_unique_id = 4; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -92,11 +84,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * optional uint32 equipment_unique_id = 14; + * optional uint32 equipment_unique_id = 4; * @return this */ public DressAvatarCsReq clearEquipmentUniqueId() { @@ -106,11 +94,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * optional uint32 equipment_unique_id = 14; + * optional uint32 equipment_unique_id = 4; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -118,11 +102,7 @@ public final class DressAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * optional uint32 equipment_unique_id = 14; + * optional uint32 equipment_unique_id = 4; * @param value the equipmentUniqueId to set * @return this */ @@ -137,7 +117,7 @@ public final class DressAvatarCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipAvatarId = other.equipAvatarId; + avatarId = other.avatarId; equipmentUniqueId = other.equipmentUniqueId; } return this; @@ -149,8 +129,8 @@ public final class DressAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); @@ -165,7 +145,7 @@ public final class DressAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - equipAvatarId = 0; + avatarId = 0; equipmentUniqueId = 0; return this; } @@ -190,7 +170,7 @@ public final class DressAvatarCsReqOuterClass { } DressAvatarCsReq other = (DressAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId); } @@ -198,10 +178,10 @@ public final class DressAvatarCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(equipAvatarId); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(equipmentUniqueId); } } @@ -210,7 +190,7 @@ public final class DressAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); @@ -226,15 +206,15 @@ public final class DressAvatarCsReqOuterClass { while (true) { switch (tag) { case 16: { - // equipAvatarId - equipAvatarId = input.readUInt32(); + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -261,7 +241,7 @@ public final class DressAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); @@ -276,11 +256,11 @@ public final class DressAvatarCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -353,7 +333,7 @@ public final class DressAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); } diff --git a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java index a4b7a5a..d144664 100644 --- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java @@ -20,16 +20,12 @@ public final class DressRelicAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equip_avatar_id = 2; + * optional uint32 avatar_id = 1; */ - private int equipAvatarId; + private int avatarId; /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_list = 4; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -44,48 +40,44 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 equip_avatar_id = 2; - * @return whether the equipAvatarId field is set + * optional uint32 avatar_id = 1; + * @return whether the avatarId field is set */ - public boolean hasEquipAvatarId() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equip_avatar_id = 2; + * optional uint32 avatar_id = 1; * @return this */ - public DressRelicAvatarCsReq clearEquipAvatarId() { + public DressRelicAvatarCsReq clearAvatarId() { bitField0_ &= ~0x00000001; - equipAvatarId = 0; + avatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 2; - * @return the equipAvatarId + * optional uint32 avatar_id = 1; + * @return the avatarId */ - public int getEquipAvatarId() { - return equipAvatarId; + public int getAvatarId() { + return avatarId; } /** - * optional uint32 equip_avatar_id = 2; - * @param value the equipAvatarId to set + * optional uint32 avatar_id = 1; + * @param value the avatarId to set * @return this */ - public DressRelicAvatarCsReq setEquipAvatarId(final int value) { + public DressRelicAvatarCsReq setAvatarId(final int value) { bitField0_ |= 0x00000001; - equipAvatarId = value; + avatarId = value; return this; } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_list = 4; * @return whether the paramList field is set */ public boolean hasParamList() { @@ -93,11 +85,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_list = 4; * @return this */ public DressRelicAvatarCsReq clearParamList() { @@ -107,11 +95,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_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. @@ -125,11 +109,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_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 @@ -143,11 +123,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_list = 4; * @param value the paramList to add * @return this */ @@ -158,11 +134,7 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 15;
-     *
- * - * repeated .RelicParam param_list = 1; + * repeated .RelicParam param_list = 4; * @param values the paramList to add * @return this */ @@ -177,7 +149,7 @@ public final class DressRelicAvatarCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipAvatarId = other.equipAvatarId; + avatarId = other.avatarId; paramList.copyFrom(other.paramList); } return this; @@ -189,8 +161,8 @@ public final class DressRelicAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); } if (other.hasParamList()) { getMutableParamList().addAll(other.paramList); @@ -205,7 +177,7 @@ public final class DressRelicAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - equipAvatarId = 0; + avatarId = 0; paramList.clear(); return this; } @@ -231,19 +203,19 @@ public final class DressRelicAvatarCsReqOuterClass { } DressRelicAvatarCsReq other = (DressRelicAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasParamList() || paramList.equals(other.paramList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(equipAvatarId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 34); output.writeMessageNoTag(paramList.get(i)); } } @@ -253,7 +225,7 @@ public final class DressRelicAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { size += (1 * paramList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(paramList); @@ -268,16 +240,16 @@ public final class DressRelicAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // equipAvatarId - equipAvatarId = input.readUInt32(); + case 8: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 34) { break; } } - case 10: { + case 34: { // paramList tag = input.readRepeatedMessage(paramList, tag); bitField0_ |= 0x00000002; @@ -303,7 +275,7 @@ public final class DressRelicAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.paramList, paramList); @@ -318,11 +290,11 @@ public final class DressRelicAvatarCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -395,7 +367,7 @@ public final class DressRelicAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName paramList = FieldName.forField("paramList", "param_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java index b6736c0..306c67f 100644 --- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class EnableRogueTalentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 talent_id = 9; + * optional uint32 talent_id = 8; */ private int talentId; @@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 9; + * optional uint32 talent_id = 8; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 9; + * optional uint32 talent_id = 8; * @return this */ public EnableRogueTalentCsReq clearTalentId() { @@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 9; + * optional uint32 talent_id = 8; * @return the talentId */ public int getTalentId() { @@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 9; + * optional uint32 talent_id = 8; * @param value the talentId to set * @return this */ @@ -129,7 +129,7 @@ public final class EnableRogueTalentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(talentId); } } @@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 64: { // talentId talentId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java index bccc344..40dd29a 100644 --- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java @@ -19,12 +19,12 @@ public final class EnableRogueTalentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 13; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_info = 3; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 13; * @return this */ public EnableRogueTalentScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_info = 3; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_info = 3; * @return this */ public EnableRogueTalentScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_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. @@ -108,7 +108,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_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 @@ -122,7 +122,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 13; + * optional .RogueTalentInfo talent_info = 3; * @param value the talentInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class EnableRogueTalentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class EnableRogueTalentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 26) { break; } } - case 106: { + case 26: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java index 26cc072..5a76293 100644 --- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 8; */ private int buffId; @@ -34,7 +34,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 8; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 8; * @return this */ public EnhanceRogueBuffCsReq clearBuffId() { @@ -52,7 +52,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 8; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { } /** - * optional uint32 buff_id = 12; + * optional uint32 buff_id = 8; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class EnhanceRogueBuffCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 64: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java index d55dea5..7f1d305 100644 --- a/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnhanceRogueBuffScRspOuterClass.java @@ -19,17 +19,17 @@ public final class EnhanceRogueBuffScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional bool is_success = 13; + * optional bool is_success = 3; */ private boolean isSuccess; /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 11; */ private final RogueBuffOuterClass.RogueBuff rogueBuff = RogueBuffOuterClass.RogueBuff.newInstance(); @@ -44,7 +44,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return this */ public EnhanceRogueBuffScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 13; + * optional bool is_success = 3; * @return whether the isSuccess field is set */ public boolean hasIsSuccess() { @@ -89,7 +89,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 13; + * optional bool is_success = 3; * @return this */ public EnhanceRogueBuffScRsp clearIsSuccess() { @@ -99,7 +99,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 13; + * optional bool is_success = 3; * @return the isSuccess */ public boolean getIsSuccess() { @@ -107,7 +107,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional bool is_success = 13; + * optional bool is_success = 3; * @param value the isSuccess to set * @return this */ @@ -118,7 +118,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 11; * @return whether the rogueBuff field is set */ public boolean hasRogueBuff() { @@ -126,7 +126,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 11; * @return this */ public EnhanceRogueBuffScRsp clearRogueBuff() { @@ -136,7 +136,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 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. @@ -150,7 +150,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 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 @@ -164,7 +164,7 @@ public final class EnhanceRogueBuffScRspOuterClass { } /** - * optional .RogueBuff rogue_buff = 15; + * optional .RogueBuff rogue_buff = 11; * @param value the rogueBuff to set * @return this */ @@ -246,15 +246,15 @@ public final class EnhanceRogueBuffScRspOuterClass { @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) 104); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isSuccess); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueBuff); } } @@ -281,25 +281,25 @@ public final class EnhanceRogueBuffScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 24) { break; } } - case 104: { + case 24: { // isSuccess isSuccess = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // rogueBuff input.readMessage(rogueBuff); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java index 228f3d3..618b680 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 14; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 14; * @return whether the motion field is set */ public boolean hasMotion() { @@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 14; * @return this */ public EnterMapRotationRegionCsReq clearMotion() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 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. @@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 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 @@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 5; + * optional .MotionInfo motion = 14; * @param value the motion to set * @return this */ @@ -150,7 +150,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 114); output.writeMessageNoTag(motion); } } @@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 114: { // motion input.readMessage(motion); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java index 0252ca0..f1572b1 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java @@ -19,17 +19,17 @@ public final class EnterMapRotationRegionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 15; */ private int clientPosVersion; /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 6; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 14; * @return this */ public EnterMapRotationRegionScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 15; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { @@ -89,7 +89,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 15; * @return this */ public EnterMapRotationRegionScRsp clearClientPosVersion() { @@ -99,7 +99,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 15; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,7 +107,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 client_pos_version = 14; + * optional uint32 client_pos_version = 15; * @param value the clientPosVersion to set * @return this */ @@ -118,7 +118,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 6; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 6; * @return this */ public EnterMapRotationRegionScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 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. @@ -150,7 +150,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 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 @@ -164,7 +164,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 9; + * optional .MotionInfo motion = 6; * @param value the motion to set * @return this */ @@ -246,15 +246,15 @@ public final class EnterMapRotationRegionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class EnterMapRotationRegionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { + case 120: { // clientPosVersion clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java index 2e6a3f4..8af781e 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 1; */ private int roomId; @@ -39,7 +39,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 1; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -47,7 +47,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 1; * @return this */ public EnterRogueMapRoomCsReq clearRoomId() { @@ -57,7 +57,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 1; * @return the roomId */ public int getRoomId() { @@ -65,7 +65,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 1; * @param value the roomId to set * @return this */ @@ -177,7 +177,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class EnterRogueMapRoomCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 8: { // roomId roomId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java index 7f1e879..a3a5c9e 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java @@ -19,25 +19,25 @@ public final class EnterRogueMapRoomScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_site_id = 3; - */ - private int curSiteId; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .LineupInfo lineup = 5; + * optional uint32 cur_site_id = 10; */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private int curSiteId; /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 13; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + /** + * optional .LineupInfo lineup = 15; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private EnterRogueMapRoomScRsp() { } @@ -49,62 +49,25 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 cur_site_id = 3; - * @return whether the curSiteId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasCurSiteId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_site_id = 3; - * @return this - */ - public EnterRogueMapRoomScRsp clearCurSiteId() { - bitField0_ &= ~0x00000001; - curSiteId = 0; - return this; - } - - /** - * optional uint32 cur_site_id = 3; - * @return the curSiteId - */ - public int getCurSiteId() { - return curSiteId; - } - - /** - * optional uint32 cur_site_id = 3; - * @param value the curSiteId to set - * @return this - */ - public EnterRogueMapRoomScRsp setCurSiteId(final int value) { - bitField0_ |= 0x00000001; - curSiteId = value; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return this */ public EnterRogueMapRoomScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -112,93 +75,73 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ public EnterRogueMapRoomScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .LineupInfo lineup = 5; - * @return whether the lineup field is set + * optional uint32 cur_site_id = 10; + * @return whether the curSiteId field is set */ - public boolean hasLineup() { + public boolean hasCurSiteId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cur_site_id = 10; + * @return this + */ + public EnterRogueMapRoomScRsp clearCurSiteId() { + bitField0_ &= ~0x00000002; + curSiteId = 0; + return this; + } + + /** + * optional uint32 cur_site_id = 10; + * @return the curSiteId + */ + public int getCurSiteId() { + return curSiteId; + } + + /** + * optional uint32 cur_site_id = 10; + * @param value the curSiteId to set + * @return this + */ + public EnterRogueMapRoomScRsp setCurSiteId(final int value) { + bitField0_ |= 0x00000002; + curSiteId = value; + return this; + } + + /** + * optional .SceneInfo scene = 13; + * @return whether the scene field is set + */ + public boolean hasScene() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .LineupInfo lineup = 5; - * @return this - */ - public EnterRogueMapRoomScRsp clearLineup() { - bitField0_ &= ~0x00000004; - lineup.clear(); - return this; - } - - /** - * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. - * - * @return internal storage object for reading - */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; - } - - /** - * optional .LineupInfo lineup = 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; - return lineup; - } - - /** - * optional .LineupInfo lineup = 5; - * @param value the lineup to set - * @return this - */ - public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; - lineup.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 7; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 13; * @return this */ public EnterRogueMapRoomScRsp clearScene() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; scene.clear(); return this; } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 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. @@ -212,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 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 @@ -221,30 +164,87 @@ public final class EnterRogueMapRoomScRspOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return scene; } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 13; * @param value the scene to set * @return this */ public EnterRogueMapRoomScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; scene.copyFrom(value); return this; } + /** + * optional .LineupInfo lineup = 15; + * @return whether the lineup field is set + */ + public boolean hasLineup() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .LineupInfo lineup = 15; + * @return this + */ + public EnterRogueMapRoomScRsp clearLineup() { + bitField0_ &= ~0x00000008; + lineup.clear(); + return this; + } + + /** + * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; + } + + /** + * optional .LineupInfo lineup = 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 LineupInfoOuterClass.LineupInfo getMutableLineup() { + bitField0_ |= 0x00000008; + return lineup; + } + + /** + * optional .LineupInfo lineup = 15; + * @param value the lineup to set + * @return this + */ + public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000008; + lineup.copyFrom(value); + return this; + } + @Override public EnterRogueMapRoomScRsp copyFrom(final EnterRogueMapRoomScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curSiteId = other.curSiteId; retcode = other.retcode; - lineup.copyFrom(other.lineup); + curSiteId = other.curSiteId; scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); } return this; } @@ -255,18 +255,18 @@ public final class EnterRogueMapRoomScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCurSiteId()) { - setCurSiteId(other.curSiteId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); + if (other.hasCurSiteId()) { + setCurSiteId(other.curSiteId); } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } return this; } @@ -277,10 +277,10 @@ public final class EnterRogueMapRoomScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - curSiteId = 0; retcode = 0; - lineup.clear(); + curSiteId = 0; scene.clear(); + lineup.clear(); return this; } @@ -291,8 +291,8 @@ public final class EnterRogueMapRoomScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); return this; } @@ -306,29 +306,29 @@ public final class EnterRogueMapRoomScRspOuterClass { } EnterRogueMapRoomScRsp other = (EnterRogueMapRoomScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurSiteId() || curSiteId == other.curSiteId) && (!hasRetcode() || retcode == other.retcode) - && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasScene() || scene.equals(other.scene)); + && (!hasCurSiteId() || curSiteId == other.curSiteId) + && (!hasScene() || scene.equals(other.scene)) + && (!hasLineup() || lineup.equals(other.lineup)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curSiteId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(curSiteId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(lineup); } } @@ -336,16 +336,16 @@ public final class EnterRogueMapRoomScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @@ -357,9 +357,9 @@ public final class EnterRogueMapRoomScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // curSiteId - curSiteId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { @@ -367,26 +367,26 @@ public final class EnterRogueMapRoomScRspOuterClass { } } case 80: { - // retcode - retcode = input.readUInt32(); + // curSiteId + curSiteId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 106) { break; } } - case 42: { - // lineup - input.readMessage(lineup); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { + case 106: { // scene input.readMessage(scene); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -411,16 +411,16 @@ public final class EnterRogueMapRoomScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curSiteId, curSiteId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.curSiteId, curSiteId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @@ -432,11 +432,10 @@ public final class EnterRogueMapRoomScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -226037470: - case 1245078036: { - if (input.isAtField(FieldNames.curSiteId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curSiteId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -444,10 +443,11 @@ public final class EnterRogueMapRoomScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -226037470: + case 1245078036: { + if (input.isAtField(FieldNames.curSiteId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curSiteId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -455,21 +455,21 @@ public final class EnterRogueMapRoomScRspOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { - if (!input.trySkipNullValue()) { - input.readMessage(lineup); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 109254796: { if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { input.readMessage(scene); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { + if (!input.trySkipNullValue()) { + input.readMessage(lineup); bitField0_ |= 0x00000008; } } else { @@ -530,13 +530,13 @@ public final class EnterRogueMapRoomScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName lineup = FieldName.forField("lineup"); + static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); static final FieldName scene = FieldName.forField("scene"); + + static final FieldName lineup = FieldName.forField("lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index 09d08eb..b75b675 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java @@ -19,17 +19,17 @@ public final class EnterSceneByServerScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 1; */ private int reason; /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 7; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 10; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 1; * @return whether the reason field is set */ public boolean hasReason() { @@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 1; * @return this */ public EnterSceneByServerScNotify clearReason() { @@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 1; * @return the reason */ public EnterSceneReasonOuterClass.EnterSceneReason getReason() { @@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 5; + * optional .EnterSceneReason reason = 1; * @param value the reason to set * @return this */ @@ -107,7 +107,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 7; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -115,7 +115,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 7; * @return this */ public EnterSceneByServerScNotify clearLineup() { @@ -125,7 +125,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 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. @@ -139,7 +139,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 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 @@ -153,7 +153,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 3; + * optional .LineupInfo lineup = 7; * @param value the lineup to set * @return this */ @@ -164,7 +164,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 10; * @return whether the scene field is set */ public boolean hasScene() { @@ -172,7 +172,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 10; * @return this */ public EnterSceneByServerScNotify clearScene() { @@ -182,7 +182,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 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. @@ -196,7 +196,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 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 @@ -210,7 +210,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 8; + * optional .SceneInfo scene = 10; * @param value the scene to set * @return this */ @@ -293,15 +293,15 @@ public final class EnterSceneByServerScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 58); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(scene); } } @@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // reason final int value = input.readInt32(); if (EnterSceneReasonOuterClass.EnterSceneReason.forNumber(value) != null) { @@ -336,20 +336,20 @@ public final class EnterSceneByServerScNotifyOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { + case 58: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // scene input.readMessage(scene); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java index 1031c72..8fc9b7c 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterSceneCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class EnterSceneCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 teleport_id = 2; - */ - private int teleportId; - - /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; */ private int entryId; + /** + * optional uint32 teleport_id = 10; + */ + private int teleportId; + private EnterSceneCsReq() { } @@ -39,62 +39,25 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 2; - * @return whether the teleportId field is set + * optional uint32 entry_id = 4; + * @return whether the entryId field is set */ - public boolean hasTeleportId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 teleport_id = 2; - * @return this - */ - public EnterSceneCsReq clearTeleportId() { - bitField0_ &= ~0x00000001; - teleportId = 0; - return this; - } - - /** - * optional uint32 teleport_id = 2; - * @return the teleportId - */ - public int getTeleportId() { - return teleportId; - } - - /** - * optional uint32 teleport_id = 2; - * @param value the teleportId to set - * @return this - */ - public EnterSceneCsReq setTeleportId(final int value) { - bitField0_ |= 0x00000001; - teleportId = value; - return this; - } - - /** - * optional uint32 entry_id = 5; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @return this */ public EnterSceneCsReq clearEntryId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entryId = 0; return this; } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @return the entryId */ public int getEntryId() { @@ -102,23 +65,60 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @param value the entryId to set * @return this */ public EnterSceneCsReq setEntryId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entryId = value; return this; } + /** + * optional uint32 teleport_id = 10; + * @return whether the teleportId field is set + */ + public boolean hasTeleportId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 teleport_id = 10; + * @return this + */ + public EnterSceneCsReq clearTeleportId() { + bitField0_ &= ~0x00000002; + teleportId = 0; + return this; + } + + /** + * optional uint32 teleport_id = 10; + * @return the teleportId + */ + public int getTeleportId() { + return teleportId; + } + + /** + * optional uint32 teleport_id = 10; + * @param value the teleportId to set + * @return this + */ + public EnterSceneCsReq setTeleportId(final int value) { + bitField0_ |= 0x00000002; + teleportId = value; + return this; + } + @Override public EnterSceneCsReq copyFrom(final EnterSceneCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - teleportId = other.teleportId; entryId = other.entryId; + teleportId = other.teleportId; } return this; } @@ -129,12 +129,12 @@ public final class EnterSceneCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasTeleportId()) { - setTeleportId(other.teleportId); - } if (other.hasEntryId()) { setEntryId(other.entryId); } + if (other.hasTeleportId()) { + setTeleportId(other.teleportId); + } return this; } @@ -145,8 +145,8 @@ public final class EnterSceneCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - teleportId = 0; entryId = 0; + teleportId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnterSceneCsReqOuterClass { } EnterSceneCsReq other = (EnterSceneCsReq) o; return bitField0_ == other.bitField0_ - && (!hasTeleportId() || teleportId == other.teleportId) - && (!hasEntryId() || entryId == other.entryId); + && (!hasEntryId() || entryId == other.entryId) + && (!hasTeleportId() || teleportId == other.teleportId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(teleportId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(teleportId); } } @@ -190,10 +190,10 @@ public final class EnterSceneCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); } return size; } @@ -205,18 +205,18 @@ public final class EnterSceneCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // teleportId - teleportId = input.readUInt32(); + case 32: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 80) { break; } } - case 40: { - // entryId - entryId = input.readUInt32(); + case 80: { + // teleportId + teleportId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class EnterSceneCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.teleportId, teleportId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.teleportId, teleportId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnterSceneCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1484004954: - case 1240508079: { - if (input.isAtField(FieldNames.teleportId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - teleportId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnterSceneCsReqOuterClass { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case -1484004954: + case 1240508079: { + if (input.isAtField(FieldNames.teleportId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + teleportId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnterSceneCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java index 8e469bc..7a48cc1 100644 --- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java @@ -19,12 +19,12 @@ public final class EnteredSceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 6; */ private int planeId; /** - * optional uint32 floor_id = 15; + * optional uint32 floor_id = 11; */ private int floorId; @@ -39,7 +39,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 6; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -47,7 +47,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 6; * @return this */ public EnteredSceneInfo clearPlaneId() { @@ -57,7 +57,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 6; * @return the planeId */ public int getPlaneId() { @@ -65,7 +65,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 6; * @param value the planeId to set * @return this */ @@ -76,7 +76,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 15; + * optional uint32 floor_id = 11; * @return whether the floorId field is set */ public boolean hasFloorId() { @@ -84,7 +84,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 15; + * optional uint32 floor_id = 11; * @return this */ public EnteredSceneInfo clearFloorId() { @@ -94,7 +94,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 15; + * optional uint32 floor_id = 11; * @return the floorId */ public int getFloorId() { @@ -102,7 +102,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 15; + * optional uint32 floor_id = 11; * @param value the floorId to set * @return this */ @@ -177,11 +177,11 @@ public final class EnteredSceneInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(floorId); } } @@ -205,16 +205,16 @@ public final class EnteredSceneInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 48: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { + case 88: { // floorId floorId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java index 0327417..439a9c2 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java @@ -29,7 +29,7 @@ public final class EntityBuffChangeInfoOuterClass { private int removeBuffId; /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_info = 5; */ private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance(); @@ -118,7 +118,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_info = 5; * @return whether the addBuffInfo field is set */ public boolean hasAddBuffInfo() { @@ -126,7 +126,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_info = 5; * @return this */ public EntityBuffChangeInfo clearAddBuffInfo() { @@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_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. @@ -150,7 +150,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_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 @@ -164,7 +164,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 13; + * optional .BuffInfo add_buff_info = 5; * @param value the addBuffInfo to set * @return this */ @@ -254,7 +254,7 @@ public final class EntityBuffChangeInfoOuterClass { output.writeUInt32NoTag(removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 42); output.writeMessageNoTag(addBuffInfo); } } @@ -295,11 +295,11 @@ public final class EntityBuffChangeInfoOuterClass { removeBuffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 42) { break; } } - case 106: { + case 42: { // addBuffInfo input.readMessage(addBuffInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index bbda166..2da1db3 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java @@ -19,17 +19,17 @@ public final class EntityMotionOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 4; */ private int entityId; /** - * optional uint32 map_layer = 14; + * optional uint32 map_layer = 6; */ private int mapLayer; /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 4; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -52,7 +52,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 4; * @return this */ public EntityMotion clearEntityId() { @@ -62,7 +62,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 4; * @return the entityId */ public int getEntityId() { @@ -70,7 +70,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 4; * @param value the entityId to set * @return this */ @@ -81,7 +81,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 14; + * optional uint32 map_layer = 6; * @return whether the mapLayer field is set */ public boolean hasMapLayer() { @@ -89,7 +89,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 14; + * optional uint32 map_layer = 6; * @return this */ public EntityMotion clearMapLayer() { @@ -99,7 +99,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 14; + * optional uint32 map_layer = 6; * @return the mapLayer */ public int getMapLayer() { @@ -107,7 +107,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 14; + * optional uint32 map_layer = 6; * @param value the mapLayer to set * @return this */ @@ -118,7 +118,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 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. @@ -150,7 +150,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 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 @@ -164,7 +164,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 15; * @param value the motion to set * @return this */ @@ -246,15 +246,15 @@ public final class EntityMotionOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class EntityMotionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 32: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 48) { break; } } - case 112: { + case 48: { // mapLayer mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 122) { break; } } - case 34: { + case 122: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java index f5cfb8d..488557b 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipRelicOuterClass.java @@ -19,15 +19,15 @@ public final class EquipRelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 5; - */ - private int relicUniqueId; - - /** - * optional uint32 slot = 12; + * optional uint32 slot = 1; */ private int slot; + /** + * optional uint32 relic_unique_id = 14; + */ + private int relicUniqueId; + private EquipRelic() { } @@ -39,62 +39,25 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 5; - * @return whether the relicUniqueId field is set + * optional uint32 slot = 1; + * @return whether the slot field is set */ - public boolean hasRelicUniqueId() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 relic_unique_id = 5; - * @return this - */ - public EquipRelic clearRelicUniqueId() { - bitField0_ &= ~0x00000001; - relicUniqueId = 0; - return this; - } - - /** - * optional uint32 relic_unique_id = 5; - * @return the relicUniqueId - */ - public int getRelicUniqueId() { - return relicUniqueId; - } - - /** - * optional uint32 relic_unique_id = 5; - * @param value the relicUniqueId to set - * @return this - */ - public EquipRelic setRelicUniqueId(final int value) { - bitField0_ |= 0x00000001; - relicUniqueId = value; - return this; - } - - /** - * optional uint32 slot = 12; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 12; + * optional uint32 slot = 1; * @return this */ public EquipRelic clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } /** - * optional uint32 slot = 12; + * optional uint32 slot = 1; * @return the slot */ public int getSlot() { @@ -102,23 +65,60 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 12; + * optional uint32 slot = 1; * @param value the slot to set * @return this */ public EquipRelic setSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; slot = value; return this; } + /** + * optional uint32 relic_unique_id = 14; + * @return whether the relicUniqueId field is set + */ + public boolean hasRelicUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 relic_unique_id = 14; + * @return this + */ + public EquipRelic clearRelicUniqueId() { + bitField0_ &= ~0x00000002; + relicUniqueId = 0; + return this; + } + + /** + * optional uint32 relic_unique_id = 14; + * @return the relicUniqueId + */ + public int getRelicUniqueId() { + return relicUniqueId; + } + + /** + * optional uint32 relic_unique_id = 14; + * @param value the relicUniqueId to set + * @return this + */ + public EquipRelic setRelicUniqueId(final int value) { + bitField0_ |= 0x00000002; + relicUniqueId = value; + return this; + } + @Override public EquipRelic copyFrom(final EquipRelic other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - relicUniqueId = other.relicUniqueId; slot = other.slot; + relicUniqueId = other.relicUniqueId; } return this; } @@ -129,12 +129,12 @@ public final class EquipRelicOuterClass { return this; } cachedSize = -1; - if (other.hasRelicUniqueId()) { - setRelicUniqueId(other.relicUniqueId); - } if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasRelicUniqueId()) { + setRelicUniqueId(other.relicUniqueId); + } return this; } @@ -145,8 +145,8 @@ public final class EquipRelicOuterClass { } cachedSize = -1; bitField0_ = 0; - relicUniqueId = 0; slot = 0; + relicUniqueId = 0; return this; } @@ -170,19 +170,19 @@ public final class EquipRelicOuterClass { } EquipRelic other = (EquipRelic) o; return bitField0_ == other.bitField0_ - && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) - && (!hasSlot() || slot == other.slot); + && (!hasSlot() || slot == other.slot) + && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(relicUniqueId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(relicUniqueId); } } @@ -190,10 +190,10 @@ public final class EquipRelicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } return size; } @@ -205,18 +205,18 @@ public final class EquipRelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // relicUniqueId - relicUniqueId = input.readUInt32(); + case 8: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { - // slot - slot = input.readUInt32(); + case 112: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class EquipRelicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class EquipRelicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1966200481: - case 49648253: { - if (input.isAtField(FieldNames.relicUniqueId)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - relicUniqueId = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class EquipRelicOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case -1966200481: + case 49648253: { + if (input.isAtField(FieldNames.relicUniqueId)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class EquipRelicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); - static final FieldName slot = FieldName.forField("slot"); + + static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java index 28c1d9a..a03cb77 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java @@ -19,46 +19,42 @@ public final class EquipmentOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rank = 5; - */ - private int rank; - - /** - * optional uint32 exp = 7; - */ - private int exp; - - /** - * optional uint32 level = 9; - */ - private int level; - - /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 1; */ private int promotion; /** - * optional uint32 unique_id = 11; + * optional uint32 rank = 3; */ - private int uniqueId; + private int rank; /** - * optional uint32 tid = 12; - */ - private int tid; - - /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 4; */ private int equipAvatarId; /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional bool is_protected = 14; + * optional uint32 unique_id = 6; + */ + private int uniqueId; + + /** + * optional uint32 exp = 9; + */ + private int exp; + + /** + * optional uint32 level = 13; + */ + private int level; + + /** + * optional uint32 tid = 14; + */ + private int tid; + + /** + * optional bool is_protected = 15; */ private boolean isProtected; @@ -73,136 +69,25 @@ public final class EquipmentOuterClass { } /** - * optional uint32 rank = 5; - * @return whether the rank field is set + * optional uint32 promotion = 1; + * @return whether the promotion field is set */ - public boolean hasRank() { + public boolean hasPromotion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rank = 5; - * @return this - */ - public Equipment clearRank() { - bitField0_ &= ~0x00000001; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 5; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 5; - * @param value the rank to set - * @return this - */ - public Equipment setRank(final int value) { - bitField0_ |= 0x00000001; - rank = value; - return this; - } - - /** - * optional uint32 exp = 7; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 exp = 7; - * @return this - */ - public Equipment clearExp() { - bitField0_ &= ~0x00000002; - exp = 0; - return this; - } - - /** - * optional uint32 exp = 7; - * @return the exp - */ - public int getExp() { - return exp; - } - - /** - * optional uint32 exp = 7; - * @param value the exp to set - * @return this - */ - public Equipment setExp(final int value) { - bitField0_ |= 0x00000002; - exp = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public Equipment clearLevel() { - bitField0_ &= ~0x00000004; - level = 0; - return this; - } - - /** - * optional uint32 level = 9; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 9; - * @param value the level to set - * @return this - */ - public Equipment setLevel(final int value) { - bitField0_ |= 0x00000004; - level = value; - return this; - } - - /** - * optional uint32 promotion = 10; - * @return whether the promotion field is set - */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 1; * @return this */ public Equipment clearPromotion() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; promotion = 0; return this; } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 1; * @return the promotion */ public int getPromotion() { @@ -210,110 +95,73 @@ public final class EquipmentOuterClass { } /** - * optional uint32 promotion = 10; + * optional uint32 promotion = 1; * @param value the promotion to set * @return this */ public Equipment setPromotion(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; promotion = value; return this; } /** - * optional uint32 unique_id = 11; - * @return whether the uniqueId field is set + * optional uint32 rank = 3; + * @return whether the rank field is set */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasRank() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 unique_id = 11; + * optional uint32 rank = 3; * @return this */ - public Equipment clearUniqueId() { - bitField0_ &= ~0x00000010; - uniqueId = 0; + public Equipment clearRank() { + bitField0_ &= ~0x00000002; + rank = 0; return this; } /** - * optional uint32 unique_id = 11; - * @return the uniqueId + * optional uint32 rank = 3; + * @return the rank */ - public int getUniqueId() { - return uniqueId; + public int getRank() { + return rank; } /** - * optional uint32 unique_id = 11; - * @param value the uniqueId to set + * optional uint32 rank = 3; + * @param value the rank to set * @return this */ - public Equipment setUniqueId(final int value) { - bitField0_ |= 0x00000010; - uniqueId = value; + public Equipment setRank(final int value) { + bitField0_ |= 0x00000002; + rank = value; return this; } /** - * optional uint32 tid = 12; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 tid = 12; - * @return this - */ - public Equipment clearTid() { - bitField0_ &= ~0x00000020; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 12; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 12; - * @param value the tid to set - * @return this - */ - public Equipment setTid(final int value) { - bitField0_ |= 0x00000020; - tid = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 4; * @return whether the equipAvatarId field is set */ public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 4; * @return this */ public Equipment clearEquipAvatarId() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000004; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 4; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -321,22 +169,166 @@ public final class EquipmentOuterClass { } /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 4; * @param value the equipAvatarId to set * @return this */ public Equipment setEquipAvatarId(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; equipAvatarId = value; return this; } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional bool is_protected = 14; + * optional uint32 unique_id = 6; + * @return whether the uniqueId field is set + */ + public boolean hasUniqueId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 unique_id = 6; + * @return this + */ + public Equipment clearUniqueId() { + bitField0_ &= ~0x00000008; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 6; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 6; + * @param value the uniqueId to set + * @return this + */ + public Equipment setUniqueId(final int value) { + bitField0_ |= 0x00000008; + uniqueId = value; + return this; + } + + /** + * optional uint32 exp = 9; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 exp = 9; + * @return this + */ + public Equipment clearExp() { + bitField0_ &= ~0x00000010; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 9; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 9; + * @param value the exp to set + * @return this + */ + public Equipment setExp(final int value) { + bitField0_ |= 0x00000010; + exp = value; + return this; + } + + /** + * optional uint32 level = 13; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 level = 13; + * @return this + */ + public Equipment clearLevel() { + bitField0_ &= ~0x00000020; + level = 0; + return this; + } + + /** + * optional uint32 level = 13; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 13; + * @param value the level to set + * @return this + */ + public Equipment setLevel(final int value) { + bitField0_ |= 0x00000020; + level = value; + return this; + } + + /** + * optional uint32 tid = 14; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 tid = 14; + * @return this + */ + public Equipment clearTid() { + bitField0_ &= ~0x00000040; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 14; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 14; + * @param value the tid to set + * @return this + */ + public Equipment setTid(final int value) { + bitField0_ |= 0x00000040; + tid = value; + return this; + } + + /** + * optional bool is_protected = 15; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -344,11 +336,7 @@ public final class EquipmentOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional bool is_protected = 14; + * optional bool is_protected = 15; * @return this */ public Equipment clearIsProtected() { @@ -358,11 +346,7 @@ public final class EquipmentOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional bool is_protected = 14; + * optional bool is_protected = 15; * @return the isProtected */ public boolean getIsProtected() { @@ -370,11 +354,7 @@ public final class EquipmentOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional bool is_protected = 14; + * optional bool is_protected = 15; * @param value the isProtected to set * @return this */ @@ -389,13 +369,13 @@ public final class EquipmentOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + promotion = other.promotion; rank = other.rank; + equipAvatarId = other.equipAvatarId; + uniqueId = other.uniqueId; exp = other.exp; level = other.level; - promotion = other.promotion; - uniqueId = other.uniqueId; tid = other.tid; - equipAvatarId = other.equipAvatarId; isProtected = other.isProtected; } return this; @@ -407,27 +387,27 @@ public final class EquipmentOuterClass { return this; } cachedSize = -1; + if (other.hasPromotion()) { + setPromotion(other.promotion); + } if (other.hasRank()) { setRank(other.rank); } + if (other.hasEquipAvatarId()) { + setEquipAvatarId(other.equipAvatarId); + } + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); + } if (other.hasExp()) { setExp(other.exp); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } if (other.hasTid()) { setTid(other.tid); } - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); - } if (other.hasIsProtected()) { setIsProtected(other.isProtected); } @@ -441,13 +421,13 @@ public final class EquipmentOuterClass { } cachedSize = -1; bitField0_ = 0; + promotion = 0; rank = 0; + equipAvatarId = 0; + uniqueId = 0; exp = 0; level = 0; - promotion = 0; - uniqueId = 0; tid = 0; - equipAvatarId = 0; isProtected = false; return this; } @@ -472,48 +452,48 @@ public final class EquipmentOuterClass { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ + && (!hasPromotion() || promotion == other.promotion) && (!hasRank() || rank == other.rank) + && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) - && (!hasPromotion() || promotion == other.promotion) - && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasTid() || tid == other.tid) - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasIsProtected() || isProtected == other.isProtected); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(exp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(promotion); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(uniqueId); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(rank); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(tid); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); output.writeUInt32NoTag(equipAvatarId); } - if ((bitField0_ & 0x00000080) != 0) { + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(uniqueId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(exp); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 112); + output.writeUInt32NoTag(tid); + } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 120); output.writeBoolNoTag(isProtected); } } @@ -522,25 +502,25 @@ public final class EquipmentOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + } + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000080) != 0) { size += 2; @@ -555,70 +535,70 @@ public final class EquipmentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // rank - rank = input.readUInt32(); + case 8: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 24) { break; } } - case 56: { - // exp - exp = input.readUInt32(); + case 24: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // equipAvatarId + equipAvatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // uniqueId + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // uniqueId - uniqueId = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // equipAvatarId - equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000040; + // level + level = input.readUInt32(); + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 112) { break; } } case 112: { + // tid + tid = input.readUInt32(); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000080; @@ -645,25 +625,25 @@ public final class EquipmentOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rank, rank); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.promotion, promotion); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.uniqueId, uniqueId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.tid, tid); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); @@ -678,10 +658,10 @@ public final class EquipmentOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -689,10 +669,10 @@ public final class EquipmentOuterClass { } break; } - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -700,56 +680,56 @@ public final class EquipmentOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { - if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case 169047204: case 33057906: { if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { equipAvatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { + if (!input.trySkipNullValue()) { + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -821,20 +801,20 @@ public final class EquipmentOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName rank = FieldName.forField("rank"); + static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + + static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + static final FieldName exp = FieldName.forField("exp"); static final FieldName level = FieldName.forField("level"); - static final FieldName promotion = FieldName.forField("promotion"); - - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName tid = FieldName.forField("tid"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); - static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java index 0eebe75..1e50324 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ExchangeGachaCeilingCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; */ private int avatarId; /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 14; */ private int gachaType; @@ -39,7 +39,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return this */ public ExchangeGachaCeilingCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 11; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 14; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -84,7 +84,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 14; * @return this */ public ExchangeGachaCeilingCsReq clearGachaType() { @@ -94,7 +94,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 14; * @return the gachaType */ public int getGachaType() { @@ -102,7 +102,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 14; * @param value the gachaType to set * @return this */ @@ -177,11 +177,11 @@ public final class ExchangeGachaCeilingCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(gachaType); } } @@ -205,16 +205,16 @@ public final class ExchangeGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java index 72dc4e4..ac9461f 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeGachaCeilingScRspOuterClass.java @@ -19,27 +19,27 @@ public final class ExchangeGachaCeilingScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; */ private int avatarId; /** - * optional uint32 gacha_type = 15; + * optional uint32 retcode = 3; + */ + private int retcode; + + /** + * optional uint32 gacha_type = 5; */ private int gachaType; /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_list = 8; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -54,62 +54,25 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 avatar_id = 1; + * @return whether the avatarId field is set */ - public boolean hasRetcode() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public ExchangeGachaCeilingScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 1; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 1; - * @param value the retcode to set - * @return this - */ - public ExchangeGachaCeilingScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 avatar_id = 9; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return this */ public ExchangeGachaCeilingScRsp clearAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return the avatarId */ public int getAvatarId() { @@ -117,18 +80,55 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @param value the avatarId to set * @return this */ public ExchangeGachaCeilingScRsp setAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; avatarId = value; return this; } /** - * optional uint32 gacha_type = 15; + * optional uint32 retcode = 3; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 3; + * @return this + */ + public ExchangeGachaCeilingScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 3; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 3; + * @param value the retcode to set + * @return this + */ + public ExchangeGachaCeilingScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 gacha_type = 5; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -136,7 +136,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 5; * @return this */ public ExchangeGachaCeilingScRsp clearGachaType() { @@ -146,7 +146,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 5; * @return the gachaType */ public int getGachaType() { @@ -154,7 +154,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 15; + * optional uint32 gacha_type = 5; * @param value the gachaType to set * @return this */ @@ -165,7 +165,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_list = 8; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -173,7 +173,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_list = 8; * @return this */ public ExchangeGachaCeilingScRsp clearTransferItemList() { @@ -183,7 +183,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_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. @@ -197,7 +197,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_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 @@ -211,7 +211,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 6; + * optional .ItemList transfer_item_list = 8; * @param value the transferItemList to set * @return this */ @@ -222,7 +222,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -230,7 +230,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; * @return this */ public ExchangeGachaCeilingScRsp clearGachaCeiling() { @@ -240,7 +240,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; * * 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. @@ -254,7 +254,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -268,7 +268,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 14; + * optional .GachaCeiling gacha_ceiling = 9; * @param value the gachaCeiling to set * @return this */ @@ -284,8 +284,8 @@ public final class ExchangeGachaCeilingScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; avatarId = other.avatarId; + retcode = other.retcode; gachaType = other.gachaType; transferItemList.copyFrom(other.transferItemList); gachaCeiling.copyFrom(other.gachaCeiling); @@ -299,12 +299,12 @@ public final class ExchangeGachaCeilingScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasGachaType()) { setGachaType(other.gachaType); } @@ -324,8 +324,8 @@ public final class ExchangeGachaCeilingScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; avatarId = 0; + retcode = 0; gachaType = 0; transferItemList.clear(); gachaCeiling.clear(); @@ -354,8 +354,8 @@ public final class ExchangeGachaCeilingScRspOuterClass { } ExchangeGachaCeilingScRsp other = (ExchangeGachaCeilingScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasRetcode() || retcode == other.retcode) && (!hasGachaType() || gachaType == other.gachaType) && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)); @@ -365,22 +365,22 @@ public final class ExchangeGachaCeilingScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(avatarId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeMessageNoTag(transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 74); output.writeMessageNoTag(gachaCeiling); } } @@ -389,10 +389,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); @@ -414,42 +414,42 @@ public final class ExchangeGachaCeilingScRspOuterClass { while (true) { switch (tag) { case 8: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { // avatarId avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 24) { break; } } - case 120: { + case 24: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 66) { break; } } - case 50: { + case 66: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 74) { break; } } - case 114: { + case 74: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000010; @@ -476,10 +476,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaType, gachaType); @@ -500,10 +500,11 @@ public final class ExchangeGachaCeilingScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -511,11 +512,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { } break; } - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -612,10 +612,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java index 783af0e..cf9fd01 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ExchangeHcoinCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 11; + * optional uint32 num = 5; */ private int num; @@ -34,7 +34,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 5; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 5; * @return this */ public ExchangeHcoinCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 5; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ExchangeHcoinCsReqOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 5; * @param value the num to set * @return this */ @@ -129,7 +129,7 @@ public final class ExchangeHcoinCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ExchangeHcoinCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 40: { // num num = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java index a997031..fe7241d 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java @@ -19,15 +19,15 @@ public final class ExchangeHcoinScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; - */ - private int retcode; - - /** - * optional uint32 num = 11; + * optional uint32 num = 4; */ private int num; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + private ExchangeHcoinScRsp() { } @@ -39,62 +39,25 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 num = 4; + * @return whether the num field is set */ - public boolean hasRetcode() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; - * @return this - */ - public ExchangeHcoinScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 6; - * @param value the retcode to set - * @return this - */ - public ExchangeHcoinScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 num = 11; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 num = 11; + * optional uint32 num = 4; * @return this */ public ExchangeHcoinScRsp clearNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; num = 0; return this; } /** - * optional uint32 num = 11; + * optional uint32 num = 4; * @return the num */ public int getNum() { @@ -102,23 +65,60 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 11; + * optional uint32 num = 4; * @param value the num to set * @return this */ public ExchangeHcoinScRsp setNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; num = value; return this; } + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public ExchangeHcoinScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 12; + * @param value the retcode to set + * @return this + */ + public ExchangeHcoinScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public ExchangeHcoinScRsp copyFrom(final ExchangeHcoinScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; num = other.num; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class ExchangeHcoinScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class ExchangeHcoinScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; num = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class ExchangeHcoinScRspOuterClass { } ExchangeHcoinScRsp other = (ExchangeHcoinScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class ExchangeHcoinScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class ExchangeHcoinScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); + case 32: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // num - num = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ExchangeHcoinScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,10 @@ public final class ExchangeHcoinScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class ExchangeHcoinScRspOuterClass { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class ExchangeHcoinScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java index a221c2f..2227458 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ExpUpEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 1; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 1; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 1; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 8; + * optional .ItemCostList item_cost_list = 1; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class ExpUpEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 40: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 10) { break; } } - case 66: { + case 10: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java index 395c149..8672f0f 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentScRspOuterClass.java @@ -20,12 +20,12 @@ public final class ExpUpEquipmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 10; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public ExpUpEquipmentScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 10; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 10; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 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. @@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 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 @@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 10; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 11; + * repeated .PileItem return_item_list = 10; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public final class ExpUpEquipmentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 82); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 82) { break; } } - case 90: { + case 82: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java index 22c2c0a..f3065e3 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class ExpUpRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 15; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 13; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 15; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 15; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 15; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 15; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 13; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 13; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 13; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class ExpUpRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 106); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 106) { break; } } - case 10: { + case 106: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java index 629388f..7653038 100644 --- a/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExpUpRelicScRspOuterClass.java @@ -20,12 +20,12 @@ public final class ExpUpRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 6; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return this */ public ExpUpRelicScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 6; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 6; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_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. @@ -109,7 +109,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_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 @@ -123,7 +123,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 6; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 10; + * repeated .PileItem return_item_list = 6; * @param values the returnItemList to add * @return this */ @@ -210,12 +210,12 @@ public final class ExpUpRelicScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 50) { break; } } - case 82: { + case 50: { // returnItemList tag = input.readRepeatedMessage(returnItemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java index f552876..115fe36 100644 --- a/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FarmStageGachaInfoOuterClass.java @@ -19,17 +19,17 @@ public final class FarmStageGachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 2; - */ - private long endTime; - - /** - * optional int64 begin_time = 11; + * optional int64 begin_time = 7; */ private long beginTime; /** - * optional uint32 gacha_id = 1; + * optional int64 end_time = 12; + */ + private long endTime; + + /** + * optional uint32 gacha_id = 9; */ private int gachaId; @@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 2; - * @return whether the endTime field is set + * optional int64 begin_time = 7; + * @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 FarmStageGachaInfo 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 FarmStageGachaInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - - /** - * optional int64 begin_time = 11; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 begin_time = 11; + * optional int64 begin_time = 7; * @return this */ public FarmStageGachaInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** - * optional int64 begin_time = 11; + * optional int64 begin_time = 7; * @return the beginTime */ public long getBeginTime() { @@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 11; + * optional int64 begin_time = 7; * @param value the beginTime to set * @return this */ public FarmStageGachaInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 gacha_id = 1; + * optional int64 end_time = 12; + * @return whether the endTime field is set + */ + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 end_time = 12; + * @return this + */ + public FarmStageGachaInfo clearEndTime() { + bitField0_ &= ~0x00000002; + endTime = 0L; + return this; + } + + /** + * optional int64 end_time = 12; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * optional int64 end_time = 12; + * @param value the endTime to set + * @return this + */ + public FarmStageGachaInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 gacha_id = 9; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 1; + * optional uint32 gacha_id = 9; * @return this */ public FarmStageGachaInfo clearGachaId() { @@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 1; + * optional uint32 gacha_id = 9; * @return the gachaId */ public int getGachaId() { @@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 1; + * optional uint32 gacha_id = 9; * @param value the gachaId to set * @return this */ @@ -159,8 +159,8 @@ public final class FarmStageGachaInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; gachaId = other.gachaId; } return this; @@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasEndTime()) { + setEndTime(other.endTime); + } if (other.hasGachaId()) { setGachaId(other.gachaId); } @@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; gachaId = 0; return this; } @@ -217,23 +217,23 @@ public final class FarmStageGachaInfoOuterClass { } FarmStageGachaInfo other = (FarmStageGachaInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) && (!hasGachaId() || gachaId == other.gachaId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeInt64NoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeInt64NoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(gachaId); } } @@ -242,10 +242,10 @@ public final class FarmStageGachaInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); @@ -260,25 +260,25 @@ public final class FarmStageGachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 56: { // beginTime beginTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 96) { break; } } - case 8: { + case 96: { + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class FarmStageGachaInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); @@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass { } 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 { @@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass { } 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 { @@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass { * 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 endTime = FieldName.forField("endTime", "end_time"); + static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java index 4a5531a..4491678 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java @@ -21,17 +21,17 @@ public final class FinishTalkMissionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 sub_mission_id = 11; + * optional uint32 sub_mission_id = 15; */ private int subMissionId; /** - * optional string talk_str = 2; + * optional string talk_str = 1; */ private final Utf8String talkStr = Utf8String.newEmptyInstance(); /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; */ private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); @@ -46,7 +46,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 11; + * optional uint32 sub_mission_id = 15; * @return whether the subMissionId field is set */ public boolean hasSubMissionId() { @@ -54,7 +54,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 11; + * optional uint32 sub_mission_id = 15; * @return this */ public FinishTalkMissionCsReq clearSubMissionId() { @@ -64,7 +64,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 11; + * optional uint32 sub_mission_id = 15; * @return the subMissionId */ public int getSubMissionId() { @@ -72,7 +72,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional uint32 sub_mission_id = 11; + * optional uint32 sub_mission_id = 15; * @param value the subMissionId to set * @return this */ @@ -83,7 +83,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @return whether the talkStr field is set */ public boolean hasTalkStr() { @@ -91,7 +91,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @return this */ public FinishTalkMissionCsReq clearTalkStr() { @@ -101,7 +101,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @return the talkStr */ public String getTalkStr() { @@ -109,7 +109,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @return internal {@code Utf8String} representation of talkStr for reading */ public Utf8String getTalkStrBytes() { @@ -117,7 +117,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @return internal {@code Utf8String} representation of talkStr for modifications */ public Utf8String getMutableTalkStrBytes() { @@ -126,7 +126,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @param value the talkStr to set * @return this */ @@ -137,7 +137,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * optional string talk_str = 2; + * optional string talk_str = 1; * @param value the talkStr to set * @return this */ @@ -148,7 +148,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * @return whether the customValueList field is set */ public boolean hasCustomValueList() { @@ -156,7 +156,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * @return this */ public FinishTalkMissionCsReq clearCustomValueList() { @@ -166,7 +166,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * * 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. @@ -181,7 +181,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -196,7 +196,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * @param value the customValueList to add * @return this */ @@ -208,7 +208,7 @@ public final class FinishTalkMissionCsReqOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 5; + * repeated .MissionCustomValueData custom_value_list = 9; * @param values the customValueList to add * @return this */ @@ -292,16 +292,16 @@ public final class FinishTalkMissionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(subMissionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeStringNoTag(talkStr); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < customValueList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(customValueList.get(i)); } } @@ -329,25 +329,25 @@ public final class FinishTalkMissionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // subMissionId subMissionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // talkStr input.readString(talkStr); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 74) { break; } } - case 42: { + case 74: { // customValueList tag = input.readRepeatedMessage(customValueList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java index c7bdc01..bc1a16e 100644 --- a/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java @@ -21,22 +21,22 @@ public final class FinishTalkMissionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 sub_mission_id = 3; - */ - private int subMissionId; - - /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional string talk_str = 9; + * optional uint32 sub_mission_id = 13; + */ + private int subMissionId; + + /** + * optional string talk_str = 11; */ private final Utf8String talkStr = Utf8String.newEmptyInstance(); /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_list = 12; */ private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); @@ -51,62 +51,25 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 sub_mission_id = 3; - * @return whether the subMissionId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasSubMissionId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 sub_mission_id = 3; - * @return this - */ - public FinishTalkMissionScRsp clearSubMissionId() { - bitField0_ &= ~0x00000001; - subMissionId = 0; - return this; - } - - /** - * optional uint32 sub_mission_id = 3; - * @return the subMissionId - */ - public int getSubMissionId() { - return subMissionId; - } - - /** - * optional uint32 sub_mission_id = 3; - * @param value the subMissionId to set - * @return this - */ - public FinishTalkMissionScRsp setSubMissionId(final int value) { - bitField0_ |= 0x00000001; - subMissionId = value; - return this; - } - - /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public FinishTalkMissionScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -114,18 +77,55 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public FinishTalkMissionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional string talk_str = 9; + * optional uint32 sub_mission_id = 13; + * @return whether the subMissionId field is set + */ + public boolean hasSubMissionId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 sub_mission_id = 13; + * @return this + */ + public FinishTalkMissionScRsp clearSubMissionId() { + bitField0_ &= ~0x00000002; + subMissionId = 0; + return this; + } + + /** + * optional uint32 sub_mission_id = 13; + * @return the subMissionId + */ + public int getSubMissionId() { + return subMissionId; + } + + /** + * optional uint32 sub_mission_id = 13; + * @param value the subMissionId to set + * @return this + */ + public FinishTalkMissionScRsp setSubMissionId(final int value) { + bitField0_ |= 0x00000002; + subMissionId = value; + return this; + } + + /** + * optional string talk_str = 11; * @return whether the talkStr field is set */ public boolean hasTalkStr() { @@ -133,7 +133,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @return this */ public FinishTalkMissionScRsp clearTalkStr() { @@ -143,7 +143,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @return the talkStr */ public String getTalkStr() { @@ -151,7 +151,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @return internal {@code Utf8String} representation of talkStr for reading */ public Utf8String getTalkStrBytes() { @@ -159,7 +159,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @return internal {@code Utf8String} representation of talkStr for modifications */ public Utf8String getMutableTalkStrBytes() { @@ -168,7 +168,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @param value the talkStr to set * @return this */ @@ -179,7 +179,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * optional string talk_str = 9; + * optional string talk_str = 11; * @param value the talkStr to set * @return this */ @@ -190,7 +190,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_list = 12; * @return whether the customValueList field is set */ public boolean hasCustomValueList() { @@ -198,7 +198,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_list = 12; * @return this */ public FinishTalkMissionScRsp clearCustomValueList() { @@ -208,7 +208,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_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. @@ -223,7 +223,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_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 @@ -238,7 +238,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_list = 12; * @param value the customValueList to add * @return this */ @@ -250,7 +250,7 @@ public final class FinishTalkMissionScRspOuterClass { } /** - * repeated .MissionCustomValueData custom_value_list = 7; + * repeated .MissionCustomValueData custom_value_list = 12; * @param values the customValueList to add * @return this */ @@ -266,8 +266,8 @@ public final class FinishTalkMissionScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - subMissionId = other.subMissionId; retcode = other.retcode; + subMissionId = other.subMissionId; talkStr.copyFrom(other.talkStr); customValueList.copyFrom(other.customValueList); } @@ -280,12 +280,12 @@ public final class FinishTalkMissionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasSubMissionId()) { - setSubMissionId(other.subMissionId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasSubMissionId()) { + setSubMissionId(other.subMissionId); + } if (other.hasTalkStr()) { getMutableTalkStrBytes().copyFrom(other.talkStr); } @@ -302,8 +302,8 @@ public final class FinishTalkMissionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - subMissionId = 0; retcode = 0; + subMissionId = 0; talkStr.clear(); customValueList.clear(); return this; @@ -331,8 +331,8 @@ public final class FinishTalkMissionScRspOuterClass { } FinishTalkMissionScRsp other = (FinishTalkMissionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasSubMissionId() || subMissionId == other.subMissionId) && (!hasRetcode() || retcode == other.retcode) + && (!hasSubMissionId() || subMissionId == other.subMissionId) && (!hasTalkStr() || talkStr.equals(other.talkStr)) && (!hasCustomValueList() || customValueList.equals(other.customValueList)); } @@ -340,20 +340,20 @@ public final class FinishTalkMissionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(subMissionId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(subMissionId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 90); output.writeStringNoTag(talkStr); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < customValueList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 98); output.writeMessageNoTag(customValueList.get(i)); } } @@ -363,10 +363,10 @@ public final class FinishTalkMissionScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(subMissionId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(subMissionId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(talkStr); @@ -384,34 +384,34 @@ public final class FinishTalkMissionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // subMissionId - subMissionId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 8: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 104) { break; } } - case 74: { + case 104: { + // subMissionId + subMissionId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // talkStr input.readString(talkStr); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 98) { break; } } - case 58: { + case 98: { // customValueList tag = input.readRepeatedMessage(customValueList, tag); bitField0_ |= 0x00000008; @@ -437,10 +437,10 @@ public final class FinishTalkMissionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.subMissionId, subMissionId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.subMissionId, subMissionId); } if ((bitField0_ & 0x00000004) != 0) { output.writeString(FieldNames.talkStr, talkStr); @@ -458,11 +458,10 @@ public final class FinishTalkMissionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -955858585: - case -1513479155: { - if (input.isAtField(FieldNames.subMissionId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - subMissionId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -470,10 +469,11 @@ public final class FinishTalkMissionScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -955858585: + case -1513479155: { + if (input.isAtField(FieldNames.subMissionId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + subMissionId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -558,10 +558,10 @@ public final class FinishTalkMissionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName subMissionId = FieldName.forField("subMissionId", "sub_mission_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName subMissionId = FieldName.forField("subMissionId", "sub_mission_id"); + static final FieldName talkStr = FieldName.forField("talkStr", "talk_str"); static final FieldName customValueList = FieldName.forField("customValueList", "custom_value_list"); diff --git a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java index fc8725e..4eab1f8 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendApplyInfoOuterClass.java @@ -19,7 +19,7 @@ public final class FriendApplyInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; * @return this */ public FriendApplyInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; * * 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. @@ -66,7 +66,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; * * 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,7 +80,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 12; + * optional .SimpleInfo simple_info = 9; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class FriendApplyInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 74); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendApplyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 74: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java index 46af1af..6318869 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java @@ -20,17 +20,17 @@ public final class FriendListInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .PlayingState playing_state = 9; + * optional .PlayingState playing_state = 14; */ private int playingState; /** - * optional bool is_marked = 7; + * optional bool is_marked = 8; */ private boolean isMarked; /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 1; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -50,7 +50,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 9; + * optional .PlayingState playing_state = 14; * @return whether the playingState field is set */ public boolean hasPlayingState() { @@ -58,7 +58,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 9; + * optional .PlayingState playing_state = 14; * @return this */ public FriendListInfo clearPlayingState() { @@ -68,7 +68,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 9; + * optional .PlayingState playing_state = 14; * @return the playingState */ public PlayingStateOuterClass.PlayingState getPlayingState() { @@ -101,7 +101,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 9; + * optional .PlayingState playing_state = 14; * @param value the playingState to set * @return this */ @@ -112,7 +112,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 7; + * optional bool is_marked = 8; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -120,7 +120,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 7; + * optional bool is_marked = 8; * @return this */ public FriendListInfo clearIsMarked() { @@ -130,7 +130,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 7; + * optional bool is_marked = 8; * @return the isMarked */ public boolean getIsMarked() { @@ -138,7 +138,7 @@ public final class FriendListInfoOuterClass { } /** - * optional bool is_marked = 7; + * optional bool is_marked = 8; * @param value the isMarked to set * @return this */ @@ -149,7 +149,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 1; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -157,7 +157,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 1; * @return this */ public FriendListInfo clearSimpleInfo() { @@ -167,7 +167,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 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. @@ -181,7 +181,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 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 @@ -195,7 +195,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 2; + * optional .SimpleInfo simple_info = 1; * @param value the simpleInfo to set * @return this */ @@ -349,15 +349,15 @@ public final class FriendListInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeEnumNoTag(playingState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isMarked); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(simpleInfo); } if ((bitField0_ & 0x00000008) != 0) { @@ -391,7 +391,7 @@ public final class FriendListInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 112: { // playingState final int value = input.readInt32(); if (PlayingStateOuterClass.PlayingState.forNumber(value) != null) { @@ -399,20 +399,20 @@ public final class FriendListInfoOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { + case 64: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java index ff8b69c..508bc53 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java @@ -19,7 +19,7 @@ public final class FriendRecommendInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_info = 10; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_info = 10; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_info = 10; * @return this */ public FriendRecommendInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_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. @@ -66,7 +66,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_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 @@ -80,7 +80,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 3; + * optional .SimpleInfo simple_info = 10; * @param value the simpleInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class FriendRecommendInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 82); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendRecommendInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 82: { // simpleInfo input.readMessage(simpleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java index e39bcb0..120bb00 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java @@ -24,7 +24,7 @@ public final class GachaCeilingAvatarOuterClass { private int avatarId; /** - * optional uint32 repeated_cnt = 14; + * optional uint32 repeated_cnt = 13; */ private int repeatedCnt; @@ -76,7 +76,7 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 14; + * optional uint32 repeated_cnt = 13; * @return whether the repeatedCnt field is set */ public boolean hasRepeatedCnt() { @@ -84,7 +84,7 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 14; + * optional uint32 repeated_cnt = 13; * @return this */ public GachaCeilingAvatar clearRepeatedCnt() { @@ -94,7 +94,7 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 14; + * optional uint32 repeated_cnt = 13; * @return the repeatedCnt */ public int getRepeatedCnt() { @@ -102,7 +102,7 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 14; + * optional uint32 repeated_cnt = 13; * @param value the repeatedCnt to set * @return this */ @@ -181,7 +181,7 @@ public final class GachaCeilingAvatarOuterClass { output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(repeatedCnt); } } @@ -210,11 +210,11 @@ public final class GachaCeilingAvatarOuterClass { avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // repeatedCnt repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java index c11a01b..e11f7cb 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java @@ -20,17 +20,17 @@ public final class GachaCeilingOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 ceiling_num = 14; + * optional uint32 ceiling_num = 5; */ private int ceilingNum; /** - * optional bool is_claimed = 9; + * optional bool is_claimed = 4; */ private boolean isClaimed; /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 3; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(GachaCeilingAvatarOuterClass.GachaCeilingAvatar.getFactory()); @@ -45,7 +45,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 14; + * optional uint32 ceiling_num = 5; * @return whether the ceilingNum field is set */ public boolean hasCeilingNum() { @@ -53,7 +53,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 14; + * optional uint32 ceiling_num = 5; * @return this */ public GachaCeiling clearCeilingNum() { @@ -63,7 +63,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 14; + * optional uint32 ceiling_num = 5; * @return the ceilingNum */ public int getCeilingNum() { @@ -71,7 +71,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 14; + * optional uint32 ceiling_num = 5; * @param value the ceilingNum to set * @return this */ @@ -82,7 +82,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 9; + * optional bool is_claimed = 4; * @return whether the isClaimed field is set */ public boolean hasIsClaimed() { @@ -90,7 +90,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 9; + * optional bool is_claimed = 4; * @return this */ public GachaCeiling clearIsClaimed() { @@ -100,7 +100,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 9; + * optional bool is_claimed = 4; * @return the isClaimed */ public boolean getIsClaimed() { @@ -108,7 +108,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 9; + * optional bool is_claimed = 4; * @param value the isClaimed to set * @return this */ @@ -119,7 +119,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 3; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 3; * @return this */ public GachaCeiling clearAvatarList() { @@ -137,7 +137,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 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. @@ -151,7 +151,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 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 @@ -165,7 +165,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 3; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 5; + * repeated .GachaCeilingAvatar avatar_list = 3; * @param values the avatarList to add * @return this */ @@ -259,16 +259,16 @@ public final class GachaCeilingOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isClaimed); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(avatarList.get(i)); } } @@ -296,25 +296,25 @@ public final class GachaCeilingOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 40: { // ceilingNum ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { + case 32: { // isClaimed isClaimed = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java index 123e683..4c1189c 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaInfoOuterClass.java @@ -21,45 +21,45 @@ public final class GachaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 end_time = 3; + * optional int64 end_time = 1; */ private long endTime; /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 6; */ private long beginTime; /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 12; */ private int gachaId; /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 10; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); - /** - * optional string detail_url = 2; - */ - private final Utf8String detailUrl = Utf8String.newEmptyInstance(); - /** * optional string history_url = 7; */ private final Utf8String historyUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 featured = 4; + * optional string detail_url = 14; */ - private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); + private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 4; */ private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 featured = 8; + */ + private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); + private GachaInfo() { } @@ -71,7 +71,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 1; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -79,7 +79,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 1; * @return this */ public GachaInfo clearEndTime() { @@ -89,7 +89,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 1; * @return the endTime */ public long getEndTime() { @@ -97,7 +97,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 1; * @param value the endTime to set * @return this */ @@ -108,7 +108,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 6; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -116,7 +116,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 6; * @return this */ public GachaInfo clearBeginTime() { @@ -126,7 +126,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 6; * @return the beginTime */ public long getBeginTime() { @@ -134,7 +134,7 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 6; * @param value the beginTime to set * @return this */ @@ -145,7 +145,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 12; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -153,7 +153,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 12; * @return this */ public GachaInfo clearGachaId() { @@ -163,7 +163,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 12; * @return the gachaId */ public int getGachaId() { @@ -171,7 +171,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 9; + * optional uint32 gacha_id = 12; * @param value the gachaId to set * @return this */ @@ -182,7 +182,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 10; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -190,7 +190,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 10; * @return this */ public GachaInfo clearGachaCeiling() { @@ -200,7 +200,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 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. @@ -214,7 +214,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 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 @@ -228,7 +228,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 1; + * optional .GachaCeiling gacha_ceiling = 10; * @param value the gachaCeiling to set * @return this */ @@ -238,77 +238,12 @@ public final class GachaInfoOuterClass { return this; } - /** - * optional string detail_url = 2; - * @return whether the detailUrl field is set - */ - public boolean hasDetailUrl() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional string detail_url = 2; - * @return this - */ - public GachaInfo clearDetailUrl() { - bitField0_ &= ~0x00000010; - detailUrl.clear(); - return this; - } - - /** - * optional string detail_url = 2; - * @return the detailUrl - */ - public String getDetailUrl() { - return detailUrl.getString(); - } - - /** - * optional string detail_url = 2; - * @return internal {@code Utf8String} representation of detailUrl for reading - */ - public Utf8String getDetailUrlBytes() { - return this.detailUrl; - } - - /** - * optional string detail_url = 2; - * @return internal {@code Utf8String} representation of detailUrl for modifications - */ - public Utf8String getMutableDetailUrlBytes() { - bitField0_ |= 0x00000010; - return this.detailUrl; - } - - /** - * optional string detail_url = 2; - * @param value the detailUrl to set - * @return this - */ - public GachaInfo setDetailUrl(final CharSequence value) { - bitField0_ |= 0x00000010; - detailUrl.copyFrom(value); - return this; - } - - /** - * optional string detail_url = 2; - * @param value the detailUrl to set - * @return this - */ - public GachaInfo setDetailUrl(final Utf8String value) { - bitField0_ |= 0x00000010; - detailUrl.copyFrom(value); - return this; - } - /** * optional string history_url = 7; * @return whether the historyUrl field is set */ public boolean hasHistoryUrl() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -316,7 +251,7 @@ public final class GachaInfoOuterClass { * @return this */ public GachaInfo clearHistoryUrl() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; historyUrl.clear(); return this; } @@ -342,7 +277,7 @@ public final class GachaInfoOuterClass { * @return internal {@code Utf8String} representation of historyUrl for modifications */ public Utf8String getMutableHistoryUrlBytes() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return this.historyUrl; } @@ -352,7 +287,7 @@ public final class GachaInfoOuterClass { * @return this */ public GachaInfo setHistoryUrl(final CharSequence value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; historyUrl.copyFrom(value); return this; } @@ -363,99 +298,96 @@ public final class GachaInfoOuterClass { * @return this */ public GachaInfo setHistoryUrl(final Utf8String value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; historyUrl.copyFrom(value); return this; } /** - * repeated uint32 featured = 4; - * @return whether the featured field is set + * optional string detail_url = 14; + * @return whether the detailUrl field is set */ - public boolean hasFeatured() { + public boolean hasDetailUrl() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional string detail_url = 14; + * @return this + */ + public GachaInfo clearDetailUrl() { + bitField0_ &= ~0x00000020; + detailUrl.clear(); + return this; + } + + /** + * optional string detail_url = 14; + * @return the detailUrl + */ + public String getDetailUrl() { + return detailUrl.getString(); + } + + /** + * optional string detail_url = 14; + * @return internal {@code Utf8String} representation of detailUrl for reading + */ + public Utf8String getDetailUrlBytes() { + return this.detailUrl; + } + + /** + * optional string detail_url = 14; + * @return internal {@code Utf8String} representation of detailUrl for modifications + */ + public Utf8String getMutableDetailUrlBytes() { + bitField0_ |= 0x00000020; + return this.detailUrl; + } + + /** + * optional string detail_url = 14; + * @param value the detailUrl to set + * @return this + */ + public GachaInfo setDetailUrl(final CharSequence value) { + bitField0_ |= 0x00000020; + detailUrl.copyFrom(value); + return this; + } + + /** + * optional string detail_url = 14; + * @param value the detailUrl to set + * @return this + */ + public GachaInfo setDetailUrl(final Utf8String value) { + bitField0_ |= 0x00000020; + detailUrl.copyFrom(value); + return this; + } + + /** + * repeated uint32 up_info = 4; + * @return whether the upInfo field is set + */ + public boolean hasUpInfo() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated uint32 featured = 4; - * @return this - */ - public GachaInfo clearFeatured() { - bitField0_ &= ~0x00000040; - featured.clear(); - return this; - } - - /** - * repeated uint32 featured = 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 #getMutableFeatured()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getFeatured() { - return featured; - } - - /** - * repeated uint32 featured = 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 getMutableFeatured() { - bitField0_ |= 0x00000040; - return featured; - } - - /** - * repeated uint32 featured = 4; - * @param value the featured to add - * @return this - */ - public GachaInfo addFeatured(final int value) { - bitField0_ |= 0x00000040; - featured.add(value); - return this; - } - - /** - * repeated uint32 featured = 4; - * @param values the featured to add - * @return this - */ - public GachaInfo addAllFeatured(final int... values) { - bitField0_ |= 0x00000040; - featured.addAll(values); - return this; - } - - /** - * repeated uint32 up_info = 10; - * @return whether the upInfo field is set - */ - public boolean hasUpInfo() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 4; * @return this */ public GachaInfo clearUpInfo() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; upInfo.clear(); return this; } /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 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. @@ -469,7 +401,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 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 @@ -478,32 +410,100 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableUpInfo() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return upInfo; } /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 4; * @param value the upInfo to add * @return this */ public GachaInfo addUpInfo(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; upInfo.add(value); return this; } /** - * repeated uint32 up_info = 10; + * repeated uint32 up_info = 4; * @param values the upInfo to add * @return this */ public GachaInfo addAllUpInfo(final int... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; upInfo.addAll(values); return this; } + /** + * repeated uint32 featured = 8; + * @return whether the featured field is set + */ + public boolean hasFeatured() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated uint32 featured = 8; + * @return this + */ + public GachaInfo clearFeatured() { + bitField0_ &= ~0x00000080; + featured.clear(); + return this; + } + + /** + * repeated uint32 featured = 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 #getMutableFeatured()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getFeatured() { + return featured; + } + + /** + * repeated uint32 featured = 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 getMutableFeatured() { + bitField0_ |= 0x00000080; + return featured; + } + + /** + * repeated uint32 featured = 8; + * @param value the featured to add + * @return this + */ + public GachaInfo addFeatured(final int value) { + bitField0_ |= 0x00000080; + featured.add(value); + return this; + } + + /** + * repeated uint32 featured = 8; + * @param values the featured to add + * @return this + */ + public GachaInfo addAllFeatured(final int... values) { + bitField0_ |= 0x00000080; + featured.addAll(values); + return this; + } + @Override public GachaInfo copyFrom(final GachaInfo other) { cachedSize = other.cachedSize; @@ -513,10 +513,10 @@ public final class GachaInfoOuterClass { beginTime = other.beginTime; gachaId = other.gachaId; gachaCeiling.copyFrom(other.gachaCeiling); - detailUrl.copyFrom(other.detailUrl); historyUrl.copyFrom(other.historyUrl); - featured.copyFrom(other.featured); + detailUrl.copyFrom(other.detailUrl); upInfo.copyFrom(other.upInfo); + featured.copyFrom(other.featured); } return this; } @@ -539,18 +539,18 @@ public final class GachaInfoOuterClass { if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } - if (other.hasDetailUrl()) { - getMutableDetailUrlBytes().copyFrom(other.detailUrl); - } if (other.hasHistoryUrl()) { getMutableHistoryUrlBytes().copyFrom(other.historyUrl); } - if (other.hasFeatured()) { - getMutableFeatured().addAll(other.featured); + if (other.hasDetailUrl()) { + getMutableDetailUrlBytes().copyFrom(other.detailUrl); } if (other.hasUpInfo()) { getMutableUpInfo().addAll(other.upInfo); } + if (other.hasFeatured()) { + getMutableFeatured().addAll(other.featured); + } return this; } @@ -565,10 +565,10 @@ public final class GachaInfoOuterClass { beginTime = 0L; gachaId = 0; gachaCeiling.clear(); - detailUrl.clear(); historyUrl.clear(); - featured.clear(); + detailUrl.clear(); upInfo.clear(); + featured.clear(); return this; } @@ -580,10 +580,10 @@ public final class GachaInfoOuterClass { cachedSize = -1; bitField0_ = 0; gachaCeiling.clearQuick(); - detailUrl.clear(); historyUrl.clear(); - featured.clear(); + detailUrl.clear(); upInfo.clear(); + featured.clear(); return this; } @@ -601,48 +601,48 @@ public final class GachaInfoOuterClass { && (!hasBeginTime() || beginTime == other.beginTime) && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) - && (!hasFeatured() || featured.equals(other.featured)) - && (!hasUpInfo() || upInfo.equals(other.upInfo)); + && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) + && (!hasUpInfo() || upInfo.equals(other.upInfo)) + && (!hasFeatured() || featured.equals(other.featured)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 82); output.writeMessageNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 18); - output.writeStringNoTag(detailUrl); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 58); output.writeStringNoTag(historyUrl); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 114); + output.writeStringNoTag(detailUrl); + } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < featured.length(); i++) { + for (int i = 0; i < upInfo.length(); i++) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(featured.array()[i]); + output.writeUInt32NoTag(upInfo.array()[i]); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(upInfo.array()[i]); + for (int i = 0; i < featured.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(featured.array()[i]); } } } @@ -663,16 +663,16 @@ public final class GachaInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); + } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); + size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); + size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); } return size; } @@ -684,47 +684,38 @@ public final class GachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 8: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 48) { break; } } - case 40: { + case 48: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { + case 96: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 82) { break; } } - case 10: { + case 82: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // detailUrl - input.readString(detailUrl); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 58) { break; } @@ -732,6 +723,15 @@ public final class GachaInfoOuterClass { case 58: { // historyUrl input.readString(historyUrl); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // detailUrl + input.readString(detailUrl); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 34) { @@ -739,17 +739,17 @@ public final class GachaInfoOuterClass { } } case 34: { - // featured [packed=true] - input.readPackedUInt32(featured, tag); + // upInfo [packed=true] + input.readPackedUInt32(upInfo, tag); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { - // upInfo [packed=true] - input.readPackedUInt32(upInfo, tag); + case 66: { + // featured [packed=true] + input.readPackedUInt32(featured, tag); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -767,14 +767,14 @@ public final class GachaInfoOuterClass { break; } case 32: { - // featured [packed=false] - tag = input.readRepeatedUInt32(featured, tag); + // upInfo [packed=false] + tag = input.readRepeatedUInt32(upInfo, tag); bitField0_ |= 0x00000040; break; } - case 80: { - // upInfo [packed=false] - tag = input.readRepeatedUInt32(upInfo, tag); + case 64: { + // featured [packed=false] + tag = input.readRepeatedUInt32(featured, tag); bitField0_ |= 0x00000080; break; } @@ -798,16 +798,16 @@ public final class GachaInfoOuterClass { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeString(FieldNames.detailUrl, detailUrl); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeString(FieldNames.historyUrl, historyUrl); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeString(FieldNames.detailUrl, detailUrl); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedUInt32(FieldNames.featured, featured); + output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); + output.writeRepeatedUInt32(FieldNames.featured, featured); } output.endObject(); } @@ -867,11 +867,11 @@ public final class GachaInfoOuterClass { } break; } - case -1973090466: - case -1035961215: { - if (input.isAtField(FieldNames.detailUrl)) { + case 1951019067: + case 352350020: { + if (input.isAtField(FieldNames.historyUrl)) { if (!input.trySkipNullValue()) { - input.readString(detailUrl); + input.readString(historyUrl); bitField0_ |= 0x00000010; } } else { @@ -879,11 +879,11 @@ public final class GachaInfoOuterClass { } break; } - case 1951019067: - case 352350020: { - if (input.isAtField(FieldNames.historyUrl)) { + case -1973090466: + case -1035961215: { + if (input.isAtField(FieldNames.detailUrl)) { if (!input.trySkipNullValue()) { - input.readString(historyUrl); + input.readString(detailUrl); bitField0_ |= 0x00000020; } } else { @@ -891,22 +891,22 @@ public final class GachaInfoOuterClass { } break; } - case -290659282: { - if (input.isAtField(FieldNames.featured)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(featured); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case -839638551: case -238815278: { if (input.isAtField(FieldNames.upInfo)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(upInfo); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case -290659282: { + if (input.isAtField(FieldNames.featured)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(featured); bitField0_ |= 0x00000080; } } else { @@ -974,13 +974,13 @@ public final class GachaInfoOuterClass { static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); - static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url"); - static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); - static final FieldName featured = FieldName.forField("featured"); + static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url"); static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); + + static final FieldName featured = FieldName.forField("featured"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index 29a1d3b..b2d4486 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -19,22 +19,22 @@ public final class GachaItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_new = 10; + * optional bool is_new = 9; */ private boolean isNew; /** - * optional .ItemList token_item = 8; - */ - private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .Item gacha_item = 13; + * optional .Item gacha_item = 3; */ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList token_item = 12; + */ + private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); + + /** + * optional .ItemList transfer_item_list = 13; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 10; + * optional bool is_new = 9; * @return whether the isNew field is set */ public boolean hasIsNew() { @@ -57,7 +57,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 10; + * optional bool is_new = 9; * @return this */ public GachaItem clearIsNew() { @@ -67,7 +67,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 10; + * optional bool is_new = 9; * @return the isNew */ public boolean getIsNew() { @@ -75,7 +75,7 @@ public final class GachaItemOuterClass { } /** - * optional bool is_new = 10; + * optional bool is_new = 9; * @param value the isNew to set * @return this */ @@ -86,82 +86,25 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 8; - * @return whether the tokenItem field is set + * optional .Item gacha_item = 3; + * @return whether the gachaItem field is set */ - public boolean hasTokenItem() { + public boolean hasGachaItem() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ItemList token_item = 8; - * @return this - */ - public GachaItem clearTokenItem() { - bitField0_ &= ~0x00000002; - tokenItem.clear(); - return this; - } - - /** - * optional .ItemList token_item = 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 #getMutableTokenItem()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getTokenItem() { - return tokenItem; - } - - /** - * optional .ItemList token_item = 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 ItemListOuterClass.ItemList getMutableTokenItem() { - bitField0_ |= 0x00000002; - return tokenItem; - } - - /** - * optional .ItemList token_item = 8; - * @param value the tokenItem to set - * @return this - */ - public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000002; - tokenItem.copyFrom(value); - return this; - } - - /** - * optional .Item gacha_item = 13; - * @return whether the gachaItem field is set - */ - public boolean hasGachaItem() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .Item gacha_item = 13; + * optional .Item gacha_item = 3; * @return this */ public GachaItem clearGachaItem() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; gachaItem.clear(); return this; } /** - * optional .Item gacha_item = 13; + * optional .Item gacha_item = 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. @@ -175,7 +118,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 13; + * optional .Item gacha_item = 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 @@ -184,23 +127,80 @@ public final class GachaItemOuterClass { * @return internal storage object for modifications */ public ItemOuterClass.Item getMutableGachaItem() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return gachaItem; } /** - * optional .Item gacha_item = 13; + * optional .Item gacha_item = 3; * @param value the gachaItem to set * @return this */ public GachaItem setGachaItem(final ItemOuterClass.Item value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; gachaItem.copyFrom(value); return this; } /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList token_item = 12; + * @return whether the tokenItem field is set + */ + public boolean hasTokenItem() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .ItemList token_item = 12; + * @return this + */ + public GachaItem clearTokenItem() { + bitField0_ &= ~0x00000004; + tokenItem.clear(); + return this; + } + + /** + * optional .ItemList token_item = 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 #getMutableTokenItem()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getTokenItem() { + return tokenItem; + } + + /** + * optional .ItemList token_item = 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 ItemListOuterClass.ItemList getMutableTokenItem() { + bitField0_ |= 0x00000004; + return tokenItem; + } + + /** + * optional .ItemList token_item = 12; + * @param value the tokenItem to set + * @return this + */ + public GachaItem setTokenItem(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000004; + tokenItem.copyFrom(value); + return this; + } + + /** + * optional .ItemList transfer_item_list = 13; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -208,7 +208,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList transfer_item_list = 13; * @return this */ public GachaItem clearTransferItemList() { @@ -218,7 +218,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList transfer_item_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. @@ -232,7 +232,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList transfer_item_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 @@ -246,7 +246,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 15; + * optional .ItemList transfer_item_list = 13; * @param value the transferItemList to set * @return this */ @@ -262,8 +262,8 @@ public final class GachaItemOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; isNew = other.isNew; - tokenItem.copyFrom(other.tokenItem); gachaItem.copyFrom(other.gachaItem); + tokenItem.copyFrom(other.tokenItem); transferItemList.copyFrom(other.transferItemList); } return this; @@ -278,12 +278,12 @@ public final class GachaItemOuterClass { if (other.hasIsNew()) { setIsNew(other.isNew); } - if (other.hasTokenItem()) { - getMutableTokenItem().mergeFrom(other.tokenItem); - } if (other.hasGachaItem()) { getMutableGachaItem().mergeFrom(other.gachaItem); } + if (other.hasTokenItem()) { + getMutableTokenItem().mergeFrom(other.tokenItem); + } if (other.hasTransferItemList()) { getMutableTransferItemList().mergeFrom(other.transferItemList); } @@ -298,8 +298,8 @@ public final class GachaItemOuterClass { cachedSize = -1; bitField0_ = 0; isNew = false; - tokenItem.clear(); gachaItem.clear(); + tokenItem.clear(); transferItemList.clear(); return this; } @@ -311,8 +311,8 @@ public final class GachaItemOuterClass { } cachedSize = -1; bitField0_ = 0; - tokenItem.clearQuick(); gachaItem.clearQuick(); + tokenItem.clearQuick(); transferItemList.clearQuick(); return this; } @@ -328,27 +328,27 @@ public final class GachaItemOuterClass { GachaItem other = (GachaItem) o; return bitField0_ == other.bitField0_ && (!hasIsNew() || isNew == other.isNew) - && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) && (!hasGachaItem() || gachaItem.equals(other.gachaItem)) + && (!hasTokenItem() || tokenItem.equals(other.tokenItem)) && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(tokenItem); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeMessageNoTag(gachaItem); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(tokenItem); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(transferItemList); } } @@ -360,10 +360,10 @@ public final class GachaItemOuterClass { size += 2; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(gachaItem); + size += 1 + ProtoSink.computeMessageSizeNoTag(tokenItem); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(transferItemList); @@ -378,34 +378,34 @@ public final class GachaItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // isNew isNew = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 26) { break; } } - case 66: { + case 26: { + // gachaItem + input.readMessage(gachaItem); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // tokenItem input.readMessage(tokenItem); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 106) { break; } } case 106: { - // gachaItem - input.readMessage(gachaItem); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; @@ -435,10 +435,10 @@ public final class GachaItemOuterClass { output.writeBool(FieldNames.isNew, isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.tokenItem, tokenItem); + output.writeMessage(FieldNames.gachaItem, gachaItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.gachaItem, gachaItem); + output.writeMessage(FieldNames.tokenItem, tokenItem); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.transferItemList, transferItemList); @@ -465,11 +465,11 @@ public final class GachaItemOuterClass { } break; } - case 141165740: - case 101174681: { - if (input.isAtField(FieldNames.tokenItem)) { + case 802515893: + case -871807056: { + if (input.isAtField(FieldNames.gachaItem)) { if (!input.trySkipNullValue()) { - input.readMessage(tokenItem); + input.readMessage(gachaItem); bitField0_ |= 0x00000002; } } else { @@ -477,11 +477,11 @@ public final class GachaItemOuterClass { } break; } - case 802515893: - case -871807056: { - if (input.isAtField(FieldNames.gachaItem)) { + case 141165740: + case 101174681: { + if (input.isAtField(FieldNames.tokenItem)) { if (!input.trySkipNullValue()) { - input.readMessage(gachaItem); + input.readMessage(tokenItem); bitField0_ |= 0x00000004; } } else { @@ -555,10 +555,10 @@ public final class GachaItemOuterClass { static class FieldNames { static final FieldName isNew = FieldName.forField("isNew", "is_new"); - static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); - static final FieldName gachaItem = FieldName.forField("gachaItem", "gacha_item"); + static final FieldName tokenItem = FieldName.forField("tokenItem", "token_item"); + static final FieldName transferItemList = FieldName.forField("transferItemList", "transfer_item_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index 6926de5..a9be312 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -20,94 +20,94 @@ public final class GateserverOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 port = 11; + * optional uint32 port = 12; */ private int port; /** - * optional bool unk1 = 9; + * optional bool unk1 = 6; */ private boolean unk1; /** - * optional bool unk2 = 12; + * optional bool unk2 = 13; */ private boolean unk2; /** - * optional bool unk3 = 1020; + * optional bool unk3 = 82; */ private boolean unk3; /** - * optional bool unk4 = 1353; + * optional bool unk4 = 737; */ private boolean unk4; /** - * optional bool unk5 = 1433; + * optional bool unk5 = 1037; */ private boolean unk5; /** - * optional bool unk6 = 1739; + * optional bool unk6 = 1401; */ private boolean unk6; /** - * optional bool unk7 = 1826; + * optional bool unk7 = 1851; */ private boolean unk7; /** - * optional string ip = 2; + * optional string ip = 1; */ private final Utf8String ip = Utf8String.newEmptyInstance(); /** - * optional string lua_url = 3; + * optional string lua_url = 2; */ private final Utf8String luaUrl = Utf8String.newEmptyInstance(); - /** - * optional string ex_resource_url = 5; - */ - private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); - - /** - * optional string asset_bundle_url = 7; - */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); - /** * optional string region_name = 10; */ private final Utf8String regionName = Utf8String.newEmptyInstance(); /** - * optional string ifix_version = 570; + * optional string ex_resource_url = 14; + */ + private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); + + /** + * optional string asset_bundle_url = 15; + */ + private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); + + /** + * optional string msg = 383; + */ + private final Utf8String msg = Utf8String.newEmptyInstance(); + + /** + * optional string ifix_version = 1209; */ private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); /** - * optional string mdk_res_version = 707; - */ - private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); - - /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; */ private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); /** - * optional string ifix_url = 1680; + * optional string mdk_res_version = 1798; */ - private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); + private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); /** - * optional string msg = 2016; + * optional string ifix_url = 1895; */ - private final Utf8String msg = Utf8String.newEmptyInstance(); + private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); private Gateserver() { } @@ -120,7 +120,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 11; + * optional uint32 port = 12; * @return whether the port field is set */ public boolean hasPort() { @@ -128,7 +128,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 11; + * optional uint32 port = 12; * @return this */ public Gateserver clearPort() { @@ -138,7 +138,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 11; + * optional uint32 port = 12; * @return the port */ public int getPort() { @@ -146,7 +146,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 11; + * optional uint32 port = 12; * @param value the port to set * @return this */ @@ -157,7 +157,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 9; + * optional bool unk1 = 6; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -165,7 +165,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 9; + * optional bool unk1 = 6; * @return this */ public Gateserver clearUnk1() { @@ -175,7 +175,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 9; + * optional bool unk1 = 6; * @return the unk1 */ public boolean getUnk1() { @@ -183,7 +183,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 9; + * optional bool unk1 = 6; * @param value the unk1 to set * @return this */ @@ -194,7 +194,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 12; + * optional bool unk2 = 13; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -202,7 +202,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 12; + * optional bool unk2 = 13; * @return this */ public Gateserver clearUnk2() { @@ -212,7 +212,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 12; + * optional bool unk2 = 13; * @return the unk2 */ public boolean getUnk2() { @@ -220,7 +220,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 12; + * optional bool unk2 = 13; * @param value the unk2 to set * @return this */ @@ -231,7 +231,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 1020; + * optional bool unk3 = 82; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -239,7 +239,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 1020; + * optional bool unk3 = 82; * @return this */ public Gateserver clearUnk3() { @@ -249,7 +249,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 1020; + * optional bool unk3 = 82; * @return the unk3 */ public boolean getUnk3() { @@ -257,7 +257,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 1020; + * optional bool unk3 = 82; * @param value the unk3 to set * @return this */ @@ -268,7 +268,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 1353; + * optional bool unk4 = 737; * @return whether the unk4 field is set */ public boolean hasUnk4() { @@ -276,7 +276,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 1353; + * optional bool unk4 = 737; * @return this */ public Gateserver clearUnk4() { @@ -286,7 +286,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 1353; + * optional bool unk4 = 737; * @return the unk4 */ public boolean getUnk4() { @@ -294,7 +294,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 1353; + * optional bool unk4 = 737; * @param value the unk4 to set * @return this */ @@ -305,7 +305,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1433; + * optional bool unk5 = 1037; * @return whether the unk5 field is set */ public boolean hasUnk5() { @@ -313,7 +313,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1433; + * optional bool unk5 = 1037; * @return this */ public Gateserver clearUnk5() { @@ -323,7 +323,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1433; + * optional bool unk5 = 1037; * @return the unk5 */ public boolean getUnk5() { @@ -331,7 +331,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1433; + * optional bool unk5 = 1037; * @param value the unk5 to set * @return this */ @@ -342,7 +342,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1739; + * optional bool unk6 = 1401; * @return whether the unk6 field is set */ public boolean hasUnk6() { @@ -350,7 +350,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1739; + * optional bool unk6 = 1401; * @return this */ public Gateserver clearUnk6() { @@ -360,7 +360,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1739; + * optional bool unk6 = 1401; * @return the unk6 */ public boolean getUnk6() { @@ -368,7 +368,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1739; + * optional bool unk6 = 1401; * @param value the unk6 to set * @return this */ @@ -379,7 +379,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1826; + * optional bool unk7 = 1851; * @return whether the unk7 field is set */ public boolean hasUnk7() { @@ -387,7 +387,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1826; + * optional bool unk7 = 1851; * @return this */ public Gateserver clearUnk7() { @@ -397,7 +397,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1826; + * optional bool unk7 = 1851; * @return the unk7 */ public boolean getUnk7() { @@ -405,7 +405,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1826; + * optional bool unk7 = 1851; * @param value the unk7 to set * @return this */ @@ -416,7 +416,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @return whether the ip field is set */ public boolean hasIp() { @@ -424,7 +424,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @return this */ public Gateserver clearIp() { @@ -434,7 +434,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @return the ip */ public String getIp() { @@ -442,7 +442,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @return internal {@code Utf8String} representation of ip for reading */ public Utf8String getIpBytes() { @@ -450,7 +450,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @return internal {@code Utf8String} representation of ip for modifications */ public Utf8String getMutableIpBytes() { @@ -459,7 +459,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @param value the ip to set * @return this */ @@ -470,7 +470,7 @@ public final class GateserverOuterClass { } /** - * optional string ip = 2; + * optional string ip = 1; * @param value the ip to set * @return this */ @@ -481,7 +481,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @return whether the luaUrl field is set */ public boolean hasLuaUrl() { @@ -489,7 +489,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @return this */ public Gateserver clearLuaUrl() { @@ -499,7 +499,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @return the luaUrl */ public String getLuaUrl() { @@ -507,7 +507,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @return internal {@code Utf8String} representation of luaUrl for reading */ public Utf8String getLuaUrlBytes() { @@ -515,7 +515,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @return internal {@code Utf8String} representation of luaUrl for modifications */ public Utf8String getMutableLuaUrlBytes() { @@ -524,7 +524,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @param value the luaUrl to set * @return this */ @@ -535,7 +535,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 3; + * optional string lua_url = 2; * @param value the luaUrl to set * @return this */ @@ -545,142 +545,12 @@ public final class GateserverOuterClass { return this; } - /** - * optional string ex_resource_url = 5; - * @return whether the exResourceUrl field is set - */ - public boolean hasExResourceUrl() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * optional string ex_resource_url = 5; - * @return this - */ - public Gateserver clearExResourceUrl() { - bitField0_ &= ~0x00000400; - exResourceUrl.clear(); - return this; - } - - /** - * optional string ex_resource_url = 5; - * @return the exResourceUrl - */ - public String getExResourceUrl() { - return exResourceUrl.getString(); - } - - /** - * optional string ex_resource_url = 5; - * @return internal {@code Utf8String} representation of exResourceUrl for reading - */ - public Utf8String getExResourceUrlBytes() { - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 5; - * @return internal {@code Utf8String} representation of exResourceUrl for modifications - */ - public Utf8String getMutableExResourceUrlBytes() { - bitField0_ |= 0x00000400; - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 5; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final CharSequence value) { - bitField0_ |= 0x00000400; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string ex_resource_url = 5; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final Utf8String value) { - bitField0_ |= 0x00000400; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string asset_bundle_url = 7; - * @return whether the assetBundleUrl field is set - */ - public boolean hasAssetBundleUrl() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * optional string asset_bundle_url = 7; - * @return this - */ - public Gateserver clearAssetBundleUrl() { - bitField0_ &= ~0x00000800; - assetBundleUrl.clear(); - return this; - } - - /** - * optional string asset_bundle_url = 7; - * @return the assetBundleUrl - */ - public String getAssetBundleUrl() { - return assetBundleUrl.getString(); - } - - /** - * optional string asset_bundle_url = 7; - * @return internal {@code Utf8String} representation of assetBundleUrl for reading - */ - public Utf8String getAssetBundleUrlBytes() { - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 7; - * @return internal {@code Utf8String} representation of assetBundleUrl for modifications - */ - public Utf8String getMutableAssetBundleUrlBytes() { - bitField0_ |= 0x00000800; - return this.assetBundleUrl; - } - - /** - * optional string asset_bundle_url = 7; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final CharSequence value) { - bitField0_ |= 0x00000800; - assetBundleUrl.copyFrom(value); - return this; - } - - /** - * optional string asset_bundle_url = 7; - * @param value the assetBundleUrl to set - * @return this - */ - public Gateserver setAssetBundleUrl(final Utf8String value) { - bitField0_ |= 0x00000800; - assetBundleUrl.copyFrom(value); - return this; - } - /** * optional string region_name = 10; * @return whether the regionName field is set */ public boolean hasRegionName() { - return (bitField0_ & 0x00001000) != 0; + return (bitField0_ & 0x00000400) != 0; } /** @@ -688,7 +558,7 @@ public final class GateserverOuterClass { * @return this */ public Gateserver clearRegionName() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000400; regionName.clear(); return this; } @@ -714,7 +584,7 @@ public final class GateserverOuterClass { * @return internal {@code Utf8String} representation of regionName for modifications */ public Utf8String getMutableRegionNameBytes() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; return this.regionName; } @@ -724,7 +594,7 @@ public final class GateserverOuterClass { * @return this */ public Gateserver setRegionName(final CharSequence value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; regionName.copyFrom(value); return this; } @@ -735,31 +605,226 @@ public final class GateserverOuterClass { * @return this */ public Gateserver setRegionName(final Utf8String value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; regionName.copyFrom(value); return this; } /** - * optional string ifix_version = 570; - * @return whether the ifixVersion field is set + * optional string ex_resource_url = 14; + * @return whether the exResourceUrl field is set */ - public boolean hasIfixVersion() { + public boolean hasExResourceUrl() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * optional string ex_resource_url = 14; + * @return this + */ + public Gateserver clearExResourceUrl() { + bitField0_ &= ~0x00000800; + exResourceUrl.clear(); + return this; + } + + /** + * optional string ex_resource_url = 14; + * @return the exResourceUrl + */ + public String getExResourceUrl() { + return exResourceUrl.getString(); + } + + /** + * optional string ex_resource_url = 14; + * @return internal {@code Utf8String} representation of exResourceUrl for reading + */ + public Utf8String getExResourceUrlBytes() { + return this.exResourceUrl; + } + + /** + * optional string ex_resource_url = 14; + * @return internal {@code Utf8String} representation of exResourceUrl for modifications + */ + public Utf8String getMutableExResourceUrlBytes() { + bitField0_ |= 0x00000800; + return this.exResourceUrl; + } + + /** + * optional string ex_resource_url = 14; + * @param value the exResourceUrl to set + * @return this + */ + public Gateserver setExResourceUrl(final CharSequence value) { + bitField0_ |= 0x00000800; + exResourceUrl.copyFrom(value); + return this; + } + + /** + * optional string ex_resource_url = 14; + * @param value the exResourceUrl to set + * @return this + */ + public Gateserver setExResourceUrl(final Utf8String value) { + bitField0_ |= 0x00000800; + exResourceUrl.copyFrom(value); + return this; + } + + /** + * optional string asset_bundle_url = 15; + * @return whether the assetBundleUrl field is set + */ + public boolean hasAssetBundleUrl() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * optional string asset_bundle_url = 15; + * @return this + */ + public Gateserver clearAssetBundleUrl() { + bitField0_ &= ~0x00001000; + assetBundleUrl.clear(); + return this; + } + + /** + * optional string asset_bundle_url = 15; + * @return the assetBundleUrl + */ + public String getAssetBundleUrl() { + return assetBundleUrl.getString(); + } + + /** + * optional string asset_bundle_url = 15; + * @return internal {@code Utf8String} representation of assetBundleUrl for reading + */ + public Utf8String getAssetBundleUrlBytes() { + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 15; + * @return internal {@code Utf8String} representation of assetBundleUrl for modifications + */ + public Utf8String getMutableAssetBundleUrlBytes() { + bitField0_ |= 0x00001000; + return this.assetBundleUrl; + } + + /** + * optional string asset_bundle_url = 15; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final CharSequence value) { + bitField0_ |= 0x00001000; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string asset_bundle_url = 15; + * @param value the assetBundleUrl to set + * @return this + */ + public Gateserver setAssetBundleUrl(final Utf8String value) { + bitField0_ |= 0x00001000; + assetBundleUrl.copyFrom(value); + return this; + } + + /** + * optional string msg = 383; + * @return whether the msg field is set + */ + public boolean hasMsg() { return (bitField0_ & 0x00002000) != 0; } /** - * optional string ifix_version = 570; + * optional string msg = 383; + * @return this + */ + public Gateserver clearMsg() { + bitField0_ &= ~0x00002000; + msg.clear(); + return this; + } + + /** + * optional string msg = 383; + * @return the msg + */ + public String getMsg() { + return msg.getString(); + } + + /** + * optional string msg = 383; + * @return internal {@code Utf8String} representation of msg for reading + */ + public Utf8String getMsgBytes() { + return this.msg; + } + + /** + * optional string msg = 383; + * @return internal {@code Utf8String} representation of msg for modifications + */ + public Utf8String getMutableMsgBytes() { + bitField0_ |= 0x00002000; + return this.msg; + } + + /** + * optional string msg = 383; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final CharSequence value) { + bitField0_ |= 0x00002000; + msg.copyFrom(value); + return this; + } + + /** + * optional string msg = 383; + * @param value the msg to set + * @return this + */ + public Gateserver setMsg(final Utf8String value) { + bitField0_ |= 0x00002000; + msg.copyFrom(value); + return this; + } + + /** + * optional string ifix_version = 1209; + * @return whether the ifixVersion field is set + */ + public boolean hasIfixVersion() { + return (bitField0_ & 0x00004000) != 0; + } + + /** + * optional string ifix_version = 1209; * @return this */ public Gateserver clearIfixVersion() { - bitField0_ &= ~0x00002000; + bitField0_ &= ~0x00004000; ifixVersion.clear(); return this; } /** - * optional string ifix_version = 570; + * optional string ifix_version = 1209; * @return the ifixVersion */ public String getIfixVersion() { @@ -767,7 +832,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 570; + * optional string ifix_version = 1209; * @return internal {@code Utf8String} representation of ifixVersion for reading */ public Utf8String getIfixVersionBytes() { @@ -775,103 +840,38 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 570; + * optional string ifix_version = 1209; * @return internal {@code Utf8String} representation of ifixVersion for modifications */ public Utf8String getMutableIfixVersionBytes() { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; return this.ifixVersion; } /** - * optional string ifix_version = 570; + * optional string ifix_version = 1209; * @param value the ifixVersion to set * @return this */ public Gateserver setIfixVersion(final CharSequence value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; ifixVersion.copyFrom(value); return this; } /** - * optional string ifix_version = 570; + * optional string ifix_version = 1209; * @param value the ifixVersion to set * @return this */ public Gateserver setIfixVersion(final Utf8String value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; ifixVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 707; - * @return whether the mdkResVersion field is set - */ - public boolean hasMdkResVersion() { - return (bitField0_ & 0x00004000) != 0; - } - - /** - * optional string mdk_res_version = 707; - * @return this - */ - public Gateserver clearMdkResVersion() { - bitField0_ &= ~0x00004000; - mdkResVersion.clear(); - return this; - } - - /** - * optional string mdk_res_version = 707; - * @return the mdkResVersion - */ - public String getMdkResVersion() { - return mdkResVersion.getString(); - } - - /** - * optional string mdk_res_version = 707; - * @return internal {@code Utf8String} representation of mdkResVersion for reading - */ - public Utf8String getMdkResVersionBytes() { - return this.mdkResVersion; - } - - /** - * optional string mdk_res_version = 707; - * @return internal {@code Utf8String} representation of mdkResVersion for modifications - */ - public Utf8String getMutableMdkResVersionBytes() { - bitField0_ |= 0x00004000; - return this.mdkResVersion; - } - - /** - * optional string mdk_res_version = 707; - * @param value the mdkResVersion to set - * @return this - */ - public Gateserver setMdkResVersion(final CharSequence value) { - bitField0_ |= 0x00004000; - mdkResVersion.copyFrom(value); - return this; - } - - /** - * optional string mdk_res_version = 707; - * @param value the mdkResVersion to set - * @return this - */ - public Gateserver setMdkResVersion(final Utf8String value) { - bitField0_ |= 0x00004000; - mdkResVersion.copyFrom(value); - return this; - } - - /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @return whether the clientSecretKey field is set */ public boolean hasClientSecretKey() { @@ -879,7 +879,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @return this */ public Gateserver clearClientSecretKey() { @@ -889,7 +889,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @return the clientSecretKey */ public String getClientSecretKey() { @@ -897,7 +897,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @return internal {@code Utf8String} representation of clientSecretKey for reading */ public Utf8String getClientSecretKeyBytes() { @@ -905,7 +905,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @return internal {@code Utf8String} representation of clientSecretKey for modifications */ public Utf8String getMutableClientSecretKeyBytes() { @@ -914,7 +914,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @param value the clientSecretKey to set * @return this */ @@ -925,7 +925,7 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 870; + * optional string client_secret_key = 1597; * @param value the clientSecretKey to set * @return this */ @@ -936,25 +936,90 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 1680; - * @return whether the ifixUrl field is set + * optional string mdk_res_version = 1798; + * @return whether the mdkResVersion field is set */ - public boolean hasIfixUrl() { + public boolean hasMdkResVersion() { return (bitField0_ & 0x00010000) != 0; } /** - * optional string ifix_url = 1680; + * optional string mdk_res_version = 1798; + * @return this + */ + public Gateserver clearMdkResVersion() { + bitField0_ &= ~0x00010000; + mdkResVersion.clear(); + return this; + } + + /** + * optional string mdk_res_version = 1798; + * @return the mdkResVersion + */ + public String getMdkResVersion() { + return mdkResVersion.getString(); + } + + /** + * optional string mdk_res_version = 1798; + * @return internal {@code Utf8String} representation of mdkResVersion for reading + */ + public Utf8String getMdkResVersionBytes() { + return this.mdkResVersion; + } + + /** + * optional string mdk_res_version = 1798; + * @return internal {@code Utf8String} representation of mdkResVersion for modifications + */ + public Utf8String getMutableMdkResVersionBytes() { + bitField0_ |= 0x00010000; + return this.mdkResVersion; + } + + /** + * optional string mdk_res_version = 1798; + * @param value the mdkResVersion to set + * @return this + */ + public Gateserver setMdkResVersion(final CharSequence value) { + bitField0_ |= 0x00010000; + mdkResVersion.copyFrom(value); + return this; + } + + /** + * optional string mdk_res_version = 1798; + * @param value the mdkResVersion to set + * @return this + */ + public Gateserver setMdkResVersion(final Utf8String value) { + bitField0_ |= 0x00010000; + mdkResVersion.copyFrom(value); + return this; + } + + /** + * optional string ifix_url = 1895; + * @return whether the ifixUrl field is set + */ + public boolean hasIfixUrl() { + return (bitField0_ & 0x00020000) != 0; + } + + /** + * optional string ifix_url = 1895; * @return this */ public Gateserver clearIfixUrl() { - bitField0_ &= ~0x00010000; + bitField0_ &= ~0x00020000; ifixUrl.clear(); return this; } /** - * optional string ifix_url = 1680; + * optional string ifix_url = 1895; * @return the ifixUrl */ public String getIfixUrl() { @@ -962,7 +1027,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 1680; + * optional string ifix_url = 1895; * @return internal {@code Utf8String} representation of ifixUrl for reading */ public Utf8String getIfixUrlBytes() { @@ -970,101 +1035,36 @@ public final class GateserverOuterClass { } /** - * optional string ifix_url = 1680; + * optional string ifix_url = 1895; * @return internal {@code Utf8String} representation of ifixUrl for modifications */ public Utf8String getMutableIfixUrlBytes() { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; return this.ifixUrl; } /** - * optional string ifix_url = 1680; + * optional string ifix_url = 1895; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final CharSequence value) { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; ifixUrl.copyFrom(value); return this; } /** - * optional string ifix_url = 1680; + * optional string ifix_url = 1895; * @param value the ifixUrl to set * @return this */ public Gateserver setIfixUrl(final Utf8String value) { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; ifixUrl.copyFrom(value); return this; } - /** - * optional string msg = 2016; - * @return whether the msg field is set - */ - public boolean hasMsg() { - return (bitField0_ & 0x00020000) != 0; - } - - /** - * optional string msg = 2016; - * @return this - */ - public Gateserver clearMsg() { - bitField0_ &= ~0x00020000; - msg.clear(); - return this; - } - - /** - * optional string msg = 2016; - * @return the msg - */ - public String getMsg() { - return msg.getString(); - } - - /** - * optional string msg = 2016; - * @return internal {@code Utf8String} representation of msg for reading - */ - public Utf8String getMsgBytes() { - return this.msg; - } - - /** - * optional string msg = 2016; - * @return internal {@code Utf8String} representation of msg for modifications - */ - public Utf8String getMutableMsgBytes() { - bitField0_ |= 0x00020000; - return this.msg; - } - - /** - * optional string msg = 2016; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final CharSequence value) { - bitField0_ |= 0x00020000; - msg.copyFrom(value); - return this; - } - - /** - * optional string msg = 2016; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final Utf8String value) { - bitField0_ |= 0x00020000; - msg.copyFrom(value); - return this; - } - @Override public Gateserver copyFrom(final Gateserver other) { cachedSize = other.cachedSize; @@ -1080,14 +1080,14 @@ public final class GateserverOuterClass { unk7 = other.unk7; ip.copyFrom(other.ip); luaUrl.copyFrom(other.luaUrl); + regionName.copyFrom(other.regionName); exResourceUrl.copyFrom(other.exResourceUrl); assetBundleUrl.copyFrom(other.assetBundleUrl); - regionName.copyFrom(other.regionName); - ifixVersion.copyFrom(other.ifixVersion); - mdkResVersion.copyFrom(other.mdkResVersion); - clientSecretKey.copyFrom(other.clientSecretKey); - ifixUrl.copyFrom(other.ifixUrl); msg.copyFrom(other.msg); + ifixVersion.copyFrom(other.ifixVersion); + clientSecretKey.copyFrom(other.clientSecretKey); + mdkResVersion.copyFrom(other.mdkResVersion); + ifixUrl.copyFrom(other.ifixUrl); } return this; } @@ -1128,30 +1128,30 @@ public final class GateserverOuterClass { if (other.hasLuaUrl()) { getMutableLuaUrlBytes().copyFrom(other.luaUrl); } + if (other.hasRegionName()) { + getMutableRegionNameBytes().copyFrom(other.regionName); + } if (other.hasExResourceUrl()) { getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); } if (other.hasAssetBundleUrl()) { getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } - if (other.hasRegionName()) { - getMutableRegionNameBytes().copyFrom(other.regionName); + if (other.hasMsg()) { + getMutableMsgBytes().copyFrom(other.msg); } if (other.hasIfixVersion()) { getMutableIfixVersionBytes().copyFrom(other.ifixVersion); } - if (other.hasMdkResVersion()) { - getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); - } if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } + if (other.hasMdkResVersion()) { + getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); + } if (other.hasIfixUrl()) { getMutableIfixUrlBytes().copyFrom(other.ifixUrl); } - if (other.hasMsg()) { - getMutableMsgBytes().copyFrom(other.msg); - } return this; } @@ -1172,14 +1172,14 @@ public final class GateserverOuterClass { unk7 = false; ip.clear(); luaUrl.clear(); + regionName.clear(); exResourceUrl.clear(); assetBundleUrl.clear(); - regionName.clear(); - ifixVersion.clear(); - mdkResVersion.clear(); - clientSecretKey.clear(); - ifixUrl.clear(); msg.clear(); + ifixVersion.clear(); + clientSecretKey.clear(); + mdkResVersion.clear(); + ifixUrl.clear(); return this; } @@ -1192,14 +1192,14 @@ public final class GateserverOuterClass { bitField0_ = 0; ip.clear(); luaUrl.clear(); + regionName.clear(); exResourceUrl.clear(); assetBundleUrl.clear(); - regionName.clear(); - ifixVersion.clear(); - mdkResVersion.clear(); - clientSecretKey.clear(); - ifixUrl.clear(); msg.clear(); + ifixVersion.clear(); + clientSecretKey.clear(); + mdkResVersion.clear(); + ifixUrl.clear(); return this; } @@ -1223,89 +1223,89 @@ public final class GateserverOuterClass { && (!hasUnk7() || unk7 == other.unk7) && (!hasIp() || ip.equals(other.ip)) && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) + && (!hasRegionName() || regionName.equals(other.regionName)) && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) - && (!hasRegionName() || regionName.equals(other.regionName)) + && (!hasMsg() || msg.equals(other.msg)) && (!hasIfixVersion() || ifixVersion.equals(other.ifixVersion)) - && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) && (!hasClientSecretKey() || clientSecretKey.equals(other.clientSecretKey)) - && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)) - && (!hasMsg() || msg.equals(other.msg)); + && (!hasMdkResVersion() || mdkResVersion.equals(other.mdkResVersion)) + && (!hasIfixUrl() || ifixUrl.equals(other.ifixUrl)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeBoolNoTag(unk1); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeBoolNoTag(unk2); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 16352); + output.writeRawLittleEndian16((short) 1424); output.writeBoolNoTag(unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 21704); + output.writeRawLittleEndian16((short) 11912); output.writeBoolNoTag(unk4); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 22984); + output.writeRawLittleEndian16((short) 16616); output.writeBoolNoTag(unk5); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 27864); + output.writeRawLittleEndian16((short) 22472); output.writeBoolNoTag(unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawLittleEndian16((short) 29328); + output.writeRawLittleEndian16((short) 29656); output.writeBoolNoTag(unk7); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 18); output.writeStringNoTag(luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 42); - output.writeStringNoTag(exResourceUrl); - } - if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 58); - output.writeStringNoTag(assetBundleUrl); - } - if ((bitField0_ & 0x00001000) != 0) { output.writeRawByte((byte) 82); output.writeStringNoTag(regionName); } + if ((bitField0_ & 0x00000800) != 0) { + output.writeRawByte((byte) 114); + output.writeStringNoTag(exResourceUrl); + } + if ((bitField0_ & 0x00001000) != 0) { + output.writeRawByte((byte) 122); + output.writeStringNoTag(assetBundleUrl); + } if ((bitField0_ & 0x00002000) != 0) { - output.writeRawLittleEndian16((short) 9170); - output.writeStringNoTag(ifixVersion); + output.writeRawLittleEndian16((short) 6138); + output.writeStringNoTag(msg); } if ((bitField0_ & 0x00004000) != 0) { - output.writeRawLittleEndian16((short) 11418); - output.writeStringNoTag(mdkResVersion); + output.writeRawLittleEndian16((short) 19402); + output.writeStringNoTag(ifixVersion); } if ((bitField0_ & 0x00008000) != 0) { - output.writeRawLittleEndian16((short) 14002); + output.writeRawLittleEndian16((short) 25578); output.writeStringNoTag(clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - output.writeRawLittleEndian16((short) 27010); - output.writeStringNoTag(ifixUrl); + output.writeRawLittleEndian16((short) 28850); + output.writeStringNoTag(mdkResVersion); } if ((bitField0_ & 0x00020000) != 0) { - output.writeRawLittleEndian16((short) 32386); - output.writeStringNoTag(msg); + output.writeRawLittleEndian16((short) 30394); + output.writeStringNoTag(ifixUrl); } } @@ -1343,28 +1343,28 @@ public final class GateserverOuterClass { size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); - } - if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); - } - if ((bitField0_ & 0x00001000) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } + if ((bitField0_ & 0x00000800) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + } + if ((bitField0_ & 0x00001000) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); + } if ((bitField0_ & 0x00002000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); + size += 2 + ProtoSink.computeStringSizeNoTag(msg); } if ((bitField0_ & 0x00004000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); + size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); } if ((bitField0_ & 0x00008000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); + size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); } if ((bitField0_ & 0x00020000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(msg); + size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); } return size; } @@ -1376,110 +1376,92 @@ public final class GateserverOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 96: { // port port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 48) { break; } } - case 72: { + case 48: { // unk1 unk1 = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { + case 104: { // unk2 unk2 = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 8160) { + if (tag != 656) { break; } } - case 8160: { + case 656: { // unk3 unk3 = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 10824) { + if (tag != 5896) { break; } } - case 10824: { + case 5896: { // unk4 unk4 = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 11464) { + if (tag != 8296) { break; } } - case 11464: { + case 8296: { // unk5 unk5 = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 13912) { + if (tag != 11208) { break; } } - case 13912: { + case 11208: { // unk6 unk6 = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 14608) { + if (tag != 14808) { break; } } - case 14608: { + case 14808: { // unk7 unk7 = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // ip + input.readString(ip); + bitField0_ |= 0x00000100; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // ip - input.readString(ip); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { // luaUrl input.readString(luaUrl); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // exResourceUrl - input.readString(exResourceUrl); - bitField0_ |= 0x00000400; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // assetBundleUrl - input.readString(assetBundleUrl); - bitField0_ |= 0x00000800; - tag = input.readTag(); if (tag != 82) { break; } @@ -1487,51 +1469,69 @@ public final class GateserverOuterClass { case 82: { // regionName input.readString(regionName); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // exResourceUrl + input.readString(exResourceUrl); + bitField0_ |= 0x00000800; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // assetBundleUrl + input.readString(assetBundleUrl); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 4562) { + if (tag != 3066) { break; } } - case 4562: { - // ifixVersion - input.readString(ifixVersion); + case 3066: { + // msg + input.readString(msg); bitField0_ |= 0x00002000; tag = input.readTag(); - if (tag != 5658) { + if (tag != 9674) { break; } } - case 5658: { - // mdkResVersion - input.readString(mdkResVersion); + case 9674: { + // ifixVersion + input.readString(ifixVersion); bitField0_ |= 0x00004000; tag = input.readTag(); - if (tag != 6962) { + if (tag != 12778) { break; } } - case 6962: { + case 12778: { // clientSecretKey input.readString(clientSecretKey); bitField0_ |= 0x00008000; tag = input.readTag(); - if (tag != 13442) { + if (tag != 14386) { break; } } - case 13442: { - // ifixUrl - input.readString(ifixUrl); + case 14386: { + // mdkResVersion + input.readString(mdkResVersion); bitField0_ |= 0x00010000; tag = input.readTag(); - if (tag != 16130) { + if (tag != 15162) { break; } } - case 16130: { - // msg - input.readString(msg); + case 15162: { + // ifixUrl + input.readString(ifixUrl); bitField0_ |= 0x00020000; tag = input.readTag(); if (tag != 0) { @@ -1586,28 +1586,28 @@ public final class GateserverOuterClass { output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); - } - if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); - } - if ((bitField0_ & 0x00001000) != 0) { output.writeString(FieldNames.regionName, regionName); } + if ((bitField0_ & 0x00000800) != 0) { + output.writeString(FieldNames.exResourceUrl, exResourceUrl); + } + if ((bitField0_ & 0x00001000) != 0) { + output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); + } if ((bitField0_ & 0x00002000) != 0) { - output.writeString(FieldNames.ifixVersion, ifixVersion); + output.writeString(FieldNames.msg, msg); } if ((bitField0_ & 0x00004000) != 0) { - output.writeString(FieldNames.mdkResVersion, mdkResVersion); + output.writeString(FieldNames.ifixVersion, ifixVersion); } if ((bitField0_ & 0x00008000) != 0) { output.writeString(FieldNames.clientSecretKey, clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - output.writeString(FieldNames.ifixUrl, ifixUrl); + output.writeString(FieldNames.mdkResVersion, mdkResVersion); } if ((bitField0_ & 0x00020000) != 0) { - output.writeString(FieldNames.msg, msg); + output.writeString(FieldNames.ifixUrl, ifixUrl); } output.endObject(); } @@ -1730,12 +1730,24 @@ public final class GateserverOuterClass { } break; } + case -1990689889: + case -1565768458: { + if (input.isAtField(FieldNames.regionName)) { + if (!input.trySkipNullValue()) { + input.readString(regionName); + bitField0_ |= 0x00000400; + } + } else { + input.skipUnknownField(); + } + break; + } case 1643520974: case -1086137910: { if (input.isAtField(FieldNames.exResourceUrl)) { if (!input.trySkipNullValue()) { input.readString(exResourceUrl); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1747,19 +1759,18 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.assetBundleUrl)) { if (!input.trySkipNullValue()) { input.readString(assetBundleUrl); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); } break; } - case -1990689889: - case -1565768458: { - if (input.isAtField(FieldNames.regionName)) { + case 108417: { + if (input.isAtField(FieldNames.msg)) { if (!input.trySkipNullValue()) { - input.readString(regionName); - bitField0_ |= 0x00001000; + input.readString(msg); + bitField0_ |= 0x00002000; } } else { input.skipUnknownField(); @@ -1771,18 +1782,6 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.ifixVersion)) { if (!input.trySkipNullValue()) { input.readString(ifixVersion); - bitField0_ |= 0x00002000; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1415579412: - case -204279250: { - if (input.isAtField(FieldNames.mdkResVersion)) { - if (!input.trySkipNullValue()) { - input.readString(mdkResVersion); bitField0_ |= 0x00004000; } } else { @@ -1802,11 +1801,11 @@ public final class GateserverOuterClass { } break; } - case 1719409347: - case 1762383292: { - if (input.isAtField(FieldNames.ifixUrl)) { + case -1415579412: + case -204279250: { + if (input.isAtField(FieldNames.mdkResVersion)) { if (!input.trySkipNullValue()) { - input.readString(ifixUrl); + input.readString(mdkResVersion); bitField0_ |= 0x00010000; } } else { @@ -1814,10 +1813,11 @@ public final class GateserverOuterClass { } break; } - case 108417: { - if (input.isAtField(FieldNames.msg)) { + case 1719409347: + case 1762383292: { + if (input.isAtField(FieldNames.ifixUrl)) { if (!input.trySkipNullValue()) { - input.readString(msg); + input.readString(ifixUrl); bitField0_ |= 0x00020000; } } else { @@ -1897,21 +1897,21 @@ public final class GateserverOuterClass { static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); + static final FieldName regionName = FieldName.forField("regionName", "region_name"); + static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); - static final FieldName regionName = FieldName.forField("regionName", "region_name"); + static final FieldName msg = FieldName.forField("msg"); static final FieldName ifixVersion = FieldName.forField("ifixVersion", "ifix_version"); - static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); - static final FieldName clientSecretKey = FieldName.forField("clientSecretKey", "client_secret_key"); - static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); + static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); - static final FieldName msg = FieldName.forField("msg"); + static final FieldName ifixUrl = FieldName.forField("ifixUrl", "ifix_url"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index 59d4fc0..9a6fe07 100644 --- a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetActivityScheduleConfigScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_list = 15; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_list = 15; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_list = 15; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_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. @@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_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 @@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_list = 15; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 2; + * repeated .ActivityScheduleInfo activity_schedule_list = 15; * @param values the activityScheduleList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetActivityScheduleConfigScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetActivityScheduleConfigScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // activityScheduleList tag = input.readRepeatedMessage(activityScheduleList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java index fa4ee72..0de7aae 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAllLineupDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetAllLineupDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_index = 3; + * optional uint32 cur_index = 4; */ private int curIndex; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 3; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,7 +45,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 3; + * optional uint32 cur_index = 4; * @return whether the curIndex field is set */ public boolean hasCurIndex() { @@ -53,7 +53,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 3; + * optional uint32 cur_index = 4; * @return this */ public GetAllLineupDataScRsp clearCurIndex() { @@ -63,7 +63,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 3; + * optional uint32 cur_index = 4; * @return the curIndex */ public int getCurIndex() { @@ -71,7 +71,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 3; + * optional uint32 cur_index = 4; * @param value the curIndex to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return this */ public GetAllLineupDataScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 3; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -127,7 +127,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 3; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 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. @@ -151,7 +151,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 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 @@ -165,7 +165,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 3; * @param value the lineupList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 3; * @param values the lineupList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetAllLineupDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineupList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // curIndex curIndex = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java index 406f55c..e68e447 100644 --- a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetArchiveDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 1; */ private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance(); @@ -39,7 +39,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return this */ public GetArchiveDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 1; * @return whether the archiveData field is set */ public boolean hasArchiveData() { @@ -84,7 +84,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 1; * @return this */ public GetArchiveDataScRsp clearArchiveData() { @@ -94,7 +94,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 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. @@ -108,7 +108,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 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 @@ -122,7 +122,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 9; + * optional .ArchiveData archive_data = 1; * @param value the archiveData to set * @return this */ @@ -198,11 +198,11 @@ public final class GetArchiveDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 10); output.writeMessageNoTag(archiveData); } } @@ -226,16 +226,16 @@ public final class GetArchiveDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 10) { break; } } - case 74: { + case 10: { // archiveData input.readMessage(archiveData); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java index a995335..7677843 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class GetAvatarDataCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_get_all = 1; + * optional bool is_get_all = 12; */ private boolean isGetAll; /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 10; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 1; + * optional bool is_get_all = 12; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 1; + * optional bool is_get_all = 12; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 1; + * optional bool is_get_all = 12; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 1; + * optional bool is_get_all = 12; * @param value the isGetAll to set * @return this */ @@ -77,7 +77,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 10; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -85,7 +85,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 10; * @return this */ public GetAvatarDataCsReq clearBaseAvatarIdList() { @@ -95,7 +95,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 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. @@ -109,7 +109,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 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 @@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 10; * @param value the baseAvatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 12; + * repeated uint32 base_avatar_id_list = 10; * @param values the baseAvatarIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetAvatarDataCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 96); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 96: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 82) { break; } } - case 98: { + case 82: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass { tag = input.readTag(); break; } - case 96: { + case 80: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java index 8de6c37..92d2912 100644 --- a/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetAvatarDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetAvatarDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional bool is_get_all = 3; + * optional bool is_get_all = 14; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 15; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 3; + * optional bool is_get_all = 14; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 3; + * optional bool is_get_all = 14; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 3; + * optional bool is_get_all = 14; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 3; + * optional bool is_get_all = 14; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 15; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 15; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_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. @@ -151,7 +151,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_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 @@ -165,7 +165,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 15; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 9; + * repeated .Avatar avatar_list = 15; * @param values the avatarList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetAvatarDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java index 70047a9..8af9b37 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -20,24 +20,24 @@ public final class GetBagScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; */ private int retcode; /** - * repeated .Equipment equipment_list = 1; + * repeated .Relic relic_list = 9; */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .Material material_list = 2; + * repeated .Material material_list = 10; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); /** - * repeated .Relic relic_list = 15; + * repeated .Equipment equipment_list = 14; */ - private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); private GetBagScRsp() { } @@ -50,7 +50,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return this */ public GetBagScRsp clearRetcode() { @@ -68,7 +68,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -87,161 +87,25 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 1; - * @return whether the equipmentList field is set + * repeated .Relic relic_list = 9; + * @return whether the relicList field is set */ - public boolean hasEquipmentList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Equipment equipment_list = 1; - * @return this - */ - public GetBagScRsp clearEquipmentList() { - bitField0_ &= ~0x00000002; - equipmentList.clear(); - return this; - } - - /** - * repeated .Equipment equipment_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 #getMutableEquipmentList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipmentList() { - return equipmentList; - } - - /** - * repeated .Equipment equipment_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 RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000002; - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 1; - * @param value the equipmentList to add - * @return this - */ - public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000002; - equipmentList.add(value); - return this; - } - - /** - * repeated .Equipment equipment_list = 1; - * @param values the equipmentList to add - * @return this - */ - public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000002; - equipmentList.addAll(values); - return this; - } - - /** - * repeated .Material material_list = 2; - * @return whether the materialList field is set - */ - public boolean hasMaterialList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .Material material_list = 2; - * @return this - */ - public GetBagScRsp clearMaterialList() { - bitField0_ &= ~0x00000004; - materialList.clear(); - return this; - } - - /** - * repeated .Material material_list = 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 #getMutableMaterialList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMaterialList() { - return materialList; - } - - /** - * repeated .Material material_list = 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 RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000004; - return materialList; - } - - /** - * repeated .Material material_list = 2; - * @param value the materialList to add - * @return this - */ - public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000004; - materialList.add(value); - return this; - } - - /** - * repeated .Material material_list = 2; - * @param values the materialList to add - * @return this - */ - public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000004; - materialList.addAll(values); - return this; - } - - /** - * repeated .Relic relic_list = 15; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .Relic relic_list = 15; + * repeated .Relic relic_list = 9; * @return this */ public GetBagScRsp clearRelicList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; relicList.clear(); return this; } /** - * repeated .Relic relic_list = 15; + * repeated .Relic relic_list = 9; * * 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. @@ -255,7 +119,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Relic relic_list = 15; + * repeated .Relic relic_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -264,41 +128,177 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return relicList; } /** - * repeated .Relic relic_list = 15; + * repeated .Relic relic_list = 9; * @param value the relicList to add * @return this */ public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; relicList.add(value); return this; } /** - * repeated .Relic relic_list = 15; + * repeated .Relic relic_list = 9; * @param values the relicList to add * @return this */ public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; relicList.addAll(values); return this; } + /** + * repeated .Material material_list = 10; + * @return whether the materialList field is set + */ + public boolean hasMaterialList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .Material material_list = 10; + * @return this + */ + public GetBagScRsp clearMaterialList() { + bitField0_ &= ~0x00000004; + materialList.clear(); + return this; + } + + /** + * repeated .Material material_list = 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 #getMutableMaterialList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMaterialList() { + return materialList; + } + + /** + * repeated .Material material_list = 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 RepeatedMessage getMutableMaterialList() { + bitField0_ |= 0x00000004; + return materialList; + } + + /** + * repeated .Material material_list = 10; + * @param value the materialList to add + * @return this + */ + public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { + bitField0_ |= 0x00000004; + materialList.add(value); + return this; + } + + /** + * repeated .Material material_list = 10; + * @param values the materialList to add + * @return this + */ + public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { + bitField0_ |= 0x00000004; + materialList.addAll(values); + return this; + } + + /** + * repeated .Equipment equipment_list = 14; + * @return whether the equipmentList field is set + */ + public boolean hasEquipmentList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .Equipment equipment_list = 14; + * @return this + */ + public GetBagScRsp clearEquipmentList() { + bitField0_ &= ~0x00000008; + equipmentList.clear(); + return this; + } + + /** + * repeated .Equipment equipment_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. + * + * Use {@link #getMutableEquipmentList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getEquipmentList() { + return equipmentList; + } + + /** + * repeated .Equipment equipment_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableEquipmentList() { + bitField0_ |= 0x00000008; + return equipmentList; + } + + /** + * repeated .Equipment equipment_list = 14; + * @param value the equipmentList to add + * @return this + */ + public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { + bitField0_ |= 0x00000008; + equipmentList.add(value); + return this; + } + + /** + * repeated .Equipment equipment_list = 14; + * @param values the equipmentList to add + * @return this + */ + public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { + bitField0_ |= 0x00000008; + equipmentList.addAll(values); + return this; + } + @Override public GetBagScRsp copyFrom(final GetBagScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - equipmentList.copyFrom(other.equipmentList); - materialList.copyFrom(other.materialList); relicList.copyFrom(other.relicList); + materialList.copyFrom(other.materialList); + equipmentList.copyFrom(other.equipmentList); } return this; } @@ -312,14 +312,14 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEquipmentList()) { - getMutableEquipmentList().addAll(other.equipmentList); + if (other.hasRelicList()) { + getMutableRelicList().addAll(other.relicList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } - if (other.hasRelicList()) { - getMutableRelicList().addAll(other.relicList); + if (other.hasEquipmentList()) { + getMutableEquipmentList().addAll(other.equipmentList); } return this; } @@ -332,9 +332,9 @@ public final class GetBagScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - equipmentList.clear(); - materialList.clear(); relicList.clear(); + materialList.clear(); + equipmentList.clear(); return this; } @@ -345,9 +345,9 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - equipmentList.clearQuick(); - materialList.clearQuick(); relicList.clearQuick(); + materialList.clearQuick(); + equipmentList.clearQuick(); return this; } @@ -362,33 +362,33 @@ public final class GetBagScRspOuterClass { GetBagScRsp other = (GetBagScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) + && (!hasRelicList() || relicList.equals(other.relicList)) && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(equipmentList.get(i)); + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(materialList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(equipmentList.get(i)); } } } @@ -400,13 +400,13 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } return size; } @@ -418,34 +418,34 @@ public final class GetBagScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); + case 74: { + // relicList + tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000002; - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // materialList tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000004; - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); + case 114: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -472,13 +472,13 @@ public final class GetBagScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } output.endObject(); } @@ -501,11 +501,11 @@ public final class GetBagScRspOuterClass { } break; } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000002; } } else { @@ -525,11 +525,11 @@ public final class GetBagScRspOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedMessage(equipmentList); bitField0_ |= 0x00000008; } } else { @@ -591,11 +591,11 @@ public final class GetBagScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); + static final FieldName relicList = FieldName.forField("relicList", "relic_list"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java index 1332f9d..87f8b3e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBasicInfoScRspOuterClass.java @@ -19,42 +19,42 @@ public final class GetBasicInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 6; */ private long nextRecoverTime; /** - * optional int64 last_set_nickname_time = 14; + * optional int64 last_set_nickname_time = 15; */ private long lastSetNicknameTime; /** - * optional uint32 week_cocoon_finished_count = 1; - */ - private int weekCocoonFinishedCount; - - /** - * optional uint32 exchange_times = 2; - */ - private int exchangeTimes; - - /** - * optional uint32 retcode = 6; - */ - private int retcode; - - /** - * optional uint32 gameplay_birthday = 13; - */ - private int gameplayBirthday; - - /** - * optional uint32 cur_day = 15; + * optional uint32 cur_day = 2; */ private int curDay; /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional uint32 gameplay_birthday = 8; + */ + private int gameplayBirthday; + + /** + * optional uint32 week_cocoon_finished_count = 10; + */ + private int weekCocoonFinishedCount; + + /** + * optional uint32 exchange_times = 11; + */ + private int exchangeTimes; + + /** + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional .PlayerSettingInfo player_setting_info = 4; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -69,7 +69,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 6; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -77,7 +77,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 6; * @return this */ public GetBasicInfoScRsp clearNextRecoverTime() { @@ -87,7 +87,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 6; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -95,7 +95,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 6; * @param value the nextRecoverTime to set * @return this */ @@ -106,7 +106,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 14; + * optional int64 last_set_nickname_time = 15; * @return whether the lastSetNicknameTime field is set */ public boolean hasLastSetNicknameTime() { @@ -114,7 +114,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 14; + * optional int64 last_set_nickname_time = 15; * @return this */ public GetBasicInfoScRsp clearLastSetNicknameTime() { @@ -124,7 +124,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 14; + * optional int64 last_set_nickname_time = 15; * @return the lastSetNicknameTime */ public long getLastSetNicknameTime() { @@ -132,7 +132,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 14; + * optional int64 last_set_nickname_time = 15; * @param value the lastSetNicknameTime to set * @return this */ @@ -143,173 +143,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 week_cocoon_finished_count = 1; - * @return whether the weekCocoonFinishedCount field is set + * optional uint32 cur_day = 2; + * @return whether the curDay field is set */ - public boolean hasWeekCocoonFinishedCount() { + public boolean hasCurDay() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 week_cocoon_finished_count = 1; - * @return this - */ - public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { - bitField0_ &= ~0x00000004; - weekCocoonFinishedCount = 0; - return this; - } - - /** - * optional uint32 week_cocoon_finished_count = 1; - * @return the weekCocoonFinishedCount - */ - public int getWeekCocoonFinishedCount() { - return weekCocoonFinishedCount; - } - - /** - * optional uint32 week_cocoon_finished_count = 1; - * @param value the weekCocoonFinishedCount to set - * @return this - */ - public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { - bitField0_ |= 0x00000004; - weekCocoonFinishedCount = value; - return this; - } - - /** - * optional uint32 exchange_times = 2; - * @return whether the exchangeTimes field is set - */ - public boolean hasExchangeTimes() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 exchange_times = 2; - * @return this - */ - public GetBasicInfoScRsp clearExchangeTimes() { - bitField0_ &= ~0x00000008; - exchangeTimes = 0; - return this; - } - - /** - * optional uint32 exchange_times = 2; - * @return the exchangeTimes - */ - public int getExchangeTimes() { - return exchangeTimes; - } - - /** - * optional uint32 exchange_times = 2; - * @param value the exchangeTimes to set - * @return this - */ - public GetBasicInfoScRsp setExchangeTimes(final int value) { - bitField0_ |= 0x00000008; - exchangeTimes = value; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 retcode = 6; - * @return this - */ - public GetBasicInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000010; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 6; - * @param value the retcode to set - * @return this - */ - public GetBasicInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000010; - retcode = value; - return this; - } - - /** - * optional uint32 gameplay_birthday = 13; - * @return whether the gameplayBirthday field is set - */ - public boolean hasGameplayBirthday() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 gameplay_birthday = 13; - * @return this - */ - public GetBasicInfoScRsp clearGameplayBirthday() { - bitField0_ &= ~0x00000020; - gameplayBirthday = 0; - return this; - } - - /** - * optional uint32 gameplay_birthday = 13; - * @return the gameplayBirthday - */ - public int getGameplayBirthday() { - return gameplayBirthday; - } - - /** - * optional uint32 gameplay_birthday = 13; - * @param value the gameplayBirthday to set - * @return this - */ - public GetBasicInfoScRsp setGameplayBirthday(final int value) { - bitField0_ |= 0x00000020; - gameplayBirthday = value; - return this; - } - - /** - * optional uint32 cur_day = 15; - * @return whether the curDay field is set - */ - public boolean hasCurDay() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 cur_day = 15; + * optional uint32 cur_day = 2; * @return this */ public GetBasicInfoScRsp clearCurDay() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000004; curDay = 0; return this; } /** - * optional uint32 cur_day = 15; + * optional uint32 cur_day = 2; * @return the curDay */ public int getCurDay() { @@ -317,18 +169,166 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 cur_day = 15; + * optional uint32 cur_day = 2; * @param value the curDay to set * @return this */ public GetBasicInfoScRsp setCurDay(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; curDay = value; return this; } /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional uint32 gameplay_birthday = 8; + * @return whether the gameplayBirthday field is set + */ + public boolean hasGameplayBirthday() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @return this + */ + public GetBasicInfoScRsp clearGameplayBirthday() { + bitField0_ &= ~0x00000008; + gameplayBirthday = 0; + return this; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @return the gameplayBirthday + */ + public int getGameplayBirthday() { + return gameplayBirthday; + } + + /** + * optional uint32 gameplay_birthday = 8; + * @param value the gameplayBirthday to set + * @return this + */ + public GetBasicInfoScRsp setGameplayBirthday(final int value) { + bitField0_ |= 0x00000008; + gameplayBirthday = value; + return this; + } + + /** + * optional uint32 week_cocoon_finished_count = 10; + * @return whether the weekCocoonFinishedCount field is set + */ + public boolean hasWeekCocoonFinishedCount() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 week_cocoon_finished_count = 10; + * @return this + */ + public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { + bitField0_ &= ~0x00000010; + weekCocoonFinishedCount = 0; + return this; + } + + /** + * optional uint32 week_cocoon_finished_count = 10; + * @return the weekCocoonFinishedCount + */ + public int getWeekCocoonFinishedCount() { + return weekCocoonFinishedCount; + } + + /** + * optional uint32 week_cocoon_finished_count = 10; + * @param value the weekCocoonFinishedCount to set + * @return this + */ + public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { + bitField0_ |= 0x00000010; + weekCocoonFinishedCount = value; + return this; + } + + /** + * optional uint32 exchange_times = 11; + * @return whether the exchangeTimes field is set + */ + public boolean hasExchangeTimes() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 exchange_times = 11; + * @return this + */ + public GetBasicInfoScRsp clearExchangeTimes() { + bitField0_ &= ~0x00000020; + exchangeTimes = 0; + return this; + } + + /** + * optional uint32 exchange_times = 11; + * @return the exchangeTimes + */ + public int getExchangeTimes() { + return exchangeTimes; + } + + /** + * optional uint32 exchange_times = 11; + * @param value the exchangeTimes to set + * @return this + */ + public GetBasicInfoScRsp setExchangeTimes(final int value) { + bitField0_ |= 0x00000020; + exchangeTimes = value; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public GetBasicInfoScRsp clearRetcode() { + bitField0_ &= ~0x00000040; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 12; + * @param value the retcode to set + * @return this + */ + public GetBasicInfoScRsp setRetcode(final int value) { + bitField0_ |= 0x00000040; + retcode = value; + return this; + } + + /** + * optional .PlayerSettingInfo player_setting_info = 4; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -336,7 +336,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional .PlayerSettingInfo player_setting_info = 4; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -346,7 +346,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional .PlayerSettingInfo player_setting_info = 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. @@ -360,7 +360,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional .PlayerSettingInfo player_setting_info = 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 @@ -374,7 +374,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 11; + * optional .PlayerSettingInfo player_setting_info = 4; * @param value the playerSettingInfo to set * @return this */ @@ -392,11 +392,11 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; lastSetNicknameTime = other.lastSetNicknameTime; + curDay = other.curDay; + gameplayBirthday = other.gameplayBirthday; weekCocoonFinishedCount = other.weekCocoonFinishedCount; exchangeTimes = other.exchangeTimes; retcode = other.retcode; - gameplayBirthday = other.gameplayBirthday; - curDay = other.curDay; playerSettingInfo.copyFrom(other.playerSettingInfo); } return this; @@ -414,6 +414,12 @@ public final class GetBasicInfoScRspOuterClass { if (other.hasLastSetNicknameTime()) { setLastSetNicknameTime(other.lastSetNicknameTime); } + if (other.hasCurDay()) { + setCurDay(other.curDay); + } + if (other.hasGameplayBirthday()) { + setGameplayBirthday(other.gameplayBirthday); + } if (other.hasWeekCocoonFinishedCount()) { setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); } @@ -423,12 +429,6 @@ public final class GetBasicInfoScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGameplayBirthday()) { - setGameplayBirthday(other.gameplayBirthday); - } - if (other.hasCurDay()) { - setCurDay(other.curDay); - } if (other.hasPlayerSettingInfo()) { getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo); } @@ -444,11 +444,11 @@ public final class GetBasicInfoScRspOuterClass { bitField0_ = 0; nextRecoverTime = 0L; lastSetNicknameTime = 0L; + curDay = 0; + gameplayBirthday = 0; weekCocoonFinishedCount = 0; exchangeTimes = 0; retcode = 0; - gameplayBirthday = 0; - curDay = 0; playerSettingInfo.clear(); return this; } @@ -476,46 +476,46 @@ public final class GetBasicInfoScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) + && (!hasCurDay() || curDay == other.curDay) + && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) && (!hasRetcode() || retcode == other.retcode) - && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) - && (!hasCurDay() || curDay == other.curDay) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeInt64NoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(weekCocoonFinishedCount); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(exchangeTimes); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(gameplayBirthday); - } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(curDay); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(gameplayBirthday); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(weekCocoonFinishedCount); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(exchangeTimes); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(playerSettingInfo); } } @@ -530,19 +530,19 @@ public final class GetBasicInfoScRspOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); + } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(playerSettingInfo); @@ -557,70 +557,70 @@ public final class GetBasicInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 48: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // lastSetNicknameTime - lastSetNicknameTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // exchangeTimes - exchangeTimes = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // curDay - curDay = input.readUInt32(); - bitField0_ |= 0x00000040; + // lastSetNicknameTime + lastSetNicknameTime = input.readInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 16) { break; } } - case 90: { + case 16: { + // curDay + curDay = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // gameplayBirthday + gameplayBirthday = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // weekCocoonFinishedCount + weekCocoonFinishedCount = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // exchangeTimes + exchangeTimes = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000080; @@ -653,19 +653,19 @@ public final class GetBasicInfoScRspOuterClass { output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.curDay, curDay); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo); @@ -704,11 +704,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1387396786: - case 668486783: { - if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { + case -1349164740: + case 1126372637: { + if (input.isAtField(FieldNames.curDay)) { if (!input.trySkipNullValue()) { - weekCocoonFinishedCount = input.readUInt32(); + curDay = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -716,34 +716,35 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1371137763: - case -119434710: { - if (input.isAtField(FieldNames.exchangeTimes)) { - if (!input.trySkipNullValue()) { - exchangeTimes = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case 686542531: case 172986486: { if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { gameplayBirthday = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1387396786: + case 668486783: { + if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { + if (!input.trySkipNullValue()) { + weekCocoonFinishedCount = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1371137763: + case -119434710: { + if (input.isAtField(FieldNames.exchangeTimes)) { + if (!input.trySkipNullValue()) { + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -751,11 +752,10 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1349164740: - case 1126372637: { - if (input.isAtField(FieldNames.curDay)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curDay = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -832,16 +832,16 @@ public final class GetBasicInfoScRspOuterClass { static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); + static final FieldName curDay = FieldName.forField("curDay", "cur_day"); + + static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); + static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gameplayBirthday = FieldName.forField("gameplayBirthday", "gameplay_birthday"); - - static final FieldName curDay = FieldName.forField("curDay", "cur_day"); - static final FieldName playerSettingInfo = FieldName.forField("playerSettingInfo", "player_setting_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java index 3c86ce2..10d0822 100644 --- a/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetChallengeScRspOuterClass.java @@ -20,20 +20,20 @@ public final class GetChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; */ private int retcode; /** - * repeated .Challenge challenge_list = 2; - */ - private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); - - /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_list = 4; */ private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); + /** + * repeated .Challenge challenge_list = 9; + */ + private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); + private GetChallengeScRsp() { } @@ -45,7 +45,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -82,93 +82,25 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .Challenge challenge_list = 2; - * @return whether the challengeList field is set + * repeated .ChallengeReward challenge_reward_list = 4; + * @return whether the challengeRewardList field is set */ - public boolean hasChallengeList() { + public boolean hasChallengeRewardList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Challenge challenge_list = 2; - * @return this - */ - public GetChallengeScRsp clearChallengeList() { - bitField0_ &= ~0x00000002; - challengeList.clear(); - return this; - } - - /** - * repeated .Challenge challenge_list = 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 #getMutableChallengeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getChallengeList() { - return challengeList; - } - - /** - * repeated .Challenge challenge_list = 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 RepeatedMessage getMutableChallengeList() { - bitField0_ |= 0x00000002; - return challengeList; - } - - /** - * repeated .Challenge challenge_list = 2; - * @param value the challengeList to add - * @return this - */ - public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge value) { - bitField0_ |= 0x00000002; - challengeList.add(value); - return this; - } - - /** - * repeated .Challenge challenge_list = 2; - * @param values the challengeList to add - * @return this - */ - public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge... values) { - bitField0_ |= 0x00000002; - challengeList.addAll(values); - return this; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 7; - * @return whether the challengeRewardList field is set - */ - public boolean hasChallengeRewardList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_list = 4; * @return this */ public GetChallengeScRsp clearChallengeRewardList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; challengeRewardList.clear(); return this; } /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_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. @@ -182,7 +114,7 @@ public final class GetChallengeScRspOuterClass { } /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_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 @@ -192,42 +124,110 @@ public final class GetChallengeScRspOuterClass { */ public RepeatedMessage getMutableChallengeRewardList( ) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return challengeRewardList; } /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_list = 4; * @param value the challengeRewardList to add * @return this */ public GetChallengeScRsp addChallengeRewardList( final ChallengeRewardOuterClass.ChallengeReward value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeRewardList.add(value); return this; } /** - * repeated .ChallengeReward challenge_reward_list = 7; + * repeated .ChallengeReward challenge_reward_list = 4; * @param values the challengeRewardList to add * @return this */ public GetChallengeScRsp addAllChallengeRewardList( final ChallengeRewardOuterClass.ChallengeReward... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; challengeRewardList.addAll(values); return this; } + /** + * repeated .Challenge challenge_list = 9; + * @return whether the challengeList field is set + */ + public boolean hasChallengeList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .Challenge challenge_list = 9; + * @return this + */ + public GetChallengeScRsp clearChallengeList() { + bitField0_ &= ~0x00000004; + challengeList.clear(); + return this; + } + + /** + * repeated .Challenge challenge_list = 9; + * + * 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 #getMutableChallengeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getChallengeList() { + return challengeList; + } + + /** + * repeated .Challenge challenge_list = 9; + * + * 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 getMutableChallengeList() { + bitField0_ |= 0x00000004; + return challengeList; + } + + /** + * repeated .Challenge challenge_list = 9; + * @param value the challengeList to add + * @return this + */ + public GetChallengeScRsp addChallengeList(final ChallengeOuterClass.Challenge value) { + bitField0_ |= 0x00000004; + challengeList.add(value); + return this; + } + + /** + * repeated .Challenge challenge_list = 9; + * @param values the challengeList to add + * @return this + */ + public GetChallengeScRsp addAllChallengeList(final ChallengeOuterClass.Challenge... values) { + bitField0_ |= 0x00000004; + challengeList.addAll(values); + return this; + } + @Override public GetChallengeScRsp copyFrom(final GetChallengeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - challengeList.copyFrom(other.challengeList); challengeRewardList.copyFrom(other.challengeRewardList); + challengeList.copyFrom(other.challengeList); } return this; } @@ -241,12 +241,12 @@ public final class GetChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasChallengeList()) { - getMutableChallengeList().addAll(other.challengeList); - } if (other.hasChallengeRewardList()) { getMutableChallengeRewardList().addAll(other.challengeRewardList); } + if (other.hasChallengeList()) { + getMutableChallengeList().addAll(other.challengeList); + } return this; } @@ -258,8 +258,8 @@ public final class GetChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - challengeList.clear(); challengeRewardList.clear(); + challengeList.clear(); return this; } @@ -270,8 +270,8 @@ public final class GetChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeList.clearQuick(); challengeRewardList.clearQuick(); + challengeList.clearQuick(); return this; } @@ -286,26 +286,26 @@ public final class GetChallengeScRspOuterClass { GetChallengeScRsp other = (GetChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasChallengeList() || challengeList.equals(other.challengeList)) - && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)); + && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)) + && (!hasChallengeList() || challengeList.equals(other.challengeList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < challengeList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(challengeList.get(i)); + for (int i = 0; i < challengeRewardList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(challengeRewardList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < challengeRewardList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(challengeRewardList.get(i)); + for (int i = 0; i < challengeList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(challengeList.get(i)); } } } @@ -317,10 +317,10 @@ public final class GetChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); + size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); + size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); } return size; } @@ -332,26 +332,26 @@ public final class GetChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 34) { break; } } - case 18: { - // challengeList - tag = input.readRepeatedMessage(challengeList, tag); - bitField0_ |= 0x00000002; - if (tag != 58) { - break; - } - } - case 58: { + case 34: { // challengeRewardList tag = input.readRepeatedMessage(challengeRewardList, tag); + bitField0_ |= 0x00000002; + if (tag != 74) { + break; + } + } + case 74: { + // challengeList + tag = input.readRepeatedMessage(challengeList, tag); bitField0_ |= 0x00000004; if (tag != 0) { break; @@ -378,10 +378,10 @@ public final class GetChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.challengeList, challengeList); + output.writeRepeatedMessage(FieldNames.challengeRewardList, challengeRewardList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.challengeRewardList, challengeRewardList); + output.writeRepeatedMessage(FieldNames.challengeList, challengeList); } output.endObject(); } @@ -404,11 +404,11 @@ public final class GetChallengeScRspOuterClass { } break; } - case -812402783: - case 602944250: { - if (input.isAtField(FieldNames.challengeList)) { + case 1371323696: + case -2132566574: { + if (input.isAtField(FieldNames.challengeRewardList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(challengeList); + input.readRepeatedMessage(challengeRewardList); bitField0_ |= 0x00000002; } } else { @@ -416,11 +416,11 @@ public final class GetChallengeScRspOuterClass { } break; } - case 1371323696: - case -2132566574: { - if (input.isAtField(FieldNames.challengeRewardList)) { + case -812402783: + case 602944250: { + if (input.isAtField(FieldNames.challengeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(challengeRewardList); + input.readRepeatedMessage(challengeList); bitField0_ |= 0x00000004; } } else { @@ -483,9 +483,9 @@ public final class GetChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName challengeList = FieldName.forField("challengeList", "challenge_list"); - static final FieldName challengeRewardList = FieldName.forField("challengeRewardList", "challenge_reward_list"); + + static final FieldName challengeList = FieldName.forField("challengeList", "challenge_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java index 70d1005..cb4c000 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetCurChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_info = 5; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return this */ public GetCurChallengeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_info = 5; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -84,7 +84,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_info = 5; * @return this */ public GetCurChallengeScRsp clearChallengeInfo() { @@ -94,7 +94,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_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. @@ -108,7 +108,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_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,7 +122,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 15; + * optional .ChallengeInfo challenge_info = 5; * @param value the challengeInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetCurChallengeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 42); output.writeMessageNoTag(challengeInfo); } } @@ -227,16 +227,16 @@ public final class GetCurChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // challengeInfo input.readMessage(challengeInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java index ac47b9f..40df2ac 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurLineupDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetCurLineupDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 3; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 3; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -84,7 +84,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 3; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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. @@ -108,7 +108,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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 @@ -122,7 +122,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 3; * @param value the lineup to set * @return this */ @@ -198,11 +198,11 @@ public final class GetCurLineupDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public final class GetCurLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 26) { break; } } - case 122: { + case 26: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java index 51e3fda..8e3465e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetCurSceneInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetCurSceneInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .SceneInfo scene = 12; + * optional .SceneInfo scene = 3; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 12; + * optional .SceneInfo scene = 3; * @return whether the scene field is set */ public boolean hasScene() { @@ -84,7 +84,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 12; + * optional .SceneInfo scene = 3; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 12; + * 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. @@ -108,7 +108,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 12; + * 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 @@ -122,7 +122,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 12; + * optional .SceneInfo scene = 3; * @param value the scene to set * @return this */ @@ -198,11 +198,11 @@ public final class GetCurSceneInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 26); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 26) { break; } } - case 98: { + case 26: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java index a9052c2..6871f2f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -21,17 +21,17 @@ public final class GetDailyActiveInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 3; + * optional uint32 daily_active_point = 4; */ private int dailyActivePoint; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; */ private int retcode; /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 10; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); @@ -51,7 +51,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 3; + * optional uint32 daily_active_point = 4; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -59,7 +59,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 3; + * optional uint32 daily_active_point = 4; * @return this */ public GetDailyActiveInfoScRsp clearDailyActivePoint() { @@ -69,7 +69,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 3; + * optional uint32 daily_active_point = 4; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -77,7 +77,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 3; + * optional uint32 daily_active_point = 4; * @param value the dailyActivePoint to set * @return this */ @@ -88,7 +88,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -96,7 +96,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return this */ public GetDailyActiveInfoScRsp clearRetcode() { @@ -106,7 +106,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -114,7 +114,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -125,7 +125,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 10; * @return whether the dailyActiveQuestIdList field is set */ public boolean hasDailyActiveQuestIdList() { @@ -133,7 +133,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 10; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() { @@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 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. @@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 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 @@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 10; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 14; + * repeated uint32 daily_active_quest_id_list = 10; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -343,16 +343,16 @@ public final class GetDailyActiveInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } @@ -389,25 +389,25 @@ public final class GetDailyActiveInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 82) { break; } } - case 114: { + case 82: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; @@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass { tag = input.readTag(); break; } - case 112: { + case 80: { // dailyActiveQuestIdList [packed=false] tag = input.readRepeatedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java index 58d4dfb..24f1499 100644 --- a/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetEnteredSceneScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetEnteredSceneScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; */ private final RepeatedMessage enteredSceneInfo = RepeatedMessage.newEmptyInstance(EnteredSceneInfoOuterClass.EnteredSceneInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return this */ public GetEnteredSceneScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * @return whether the enteredSceneInfo field is set */ public boolean hasEnteredSceneInfo() { @@ -85,7 +85,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * @return this */ public GetEnteredSceneScRsp clearEnteredSceneInfo() { @@ -95,7 +95,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * * 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. @@ -109,7 +109,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -124,7 +124,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * @param value the enteredSceneInfo to add * @return this */ @@ -136,7 +136,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 15; + * repeated .EnteredSceneInfo entered_scene_info = 9; * @param values the enteredSceneInfo to add * @return this */ @@ -213,12 +213,12 @@ public final class GetEnteredSceneScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < enteredSceneInfo.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 74); output.writeMessageNoTag(enteredSceneInfo.get(i)); } } @@ -243,16 +243,16 @@ public final class GetEnteredSceneScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 74) { break; } } - case 122: { + case 74: { // enteredSceneInfo tag = input.readRepeatedMessage(enteredSceneInfo, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java index 2760a8b..84eea45 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; */ private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @return whether the farmStageGachaIdList field is set */ public boolean hasFarmStageGachaIdList() { @@ -43,7 +43,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @return this */ public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() { @@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 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. @@ -67,7 +67,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 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 @@ -81,7 +81,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @param value the farmStageGachaIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 12; + * repeated uint32 farm_stage_gacha_id_list = 5; * @param values the farmStageGachaIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < farmStageGachaIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(farmStageGachaIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 42: { // farmStageGachaIdList [packed=true] input.readPackedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { tag = input.readTag(); break; } - case 96: { + case 40: { // farmStageGachaIdList [packed=false] tag = input.readRepeatedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java index 2532212..5e9a62e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFarmStageGachaInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; */ private final RepeatedMessage farmStageGachaInfoList = RepeatedMessage.newEmptyInstance(FarmStageGachaInfoOuterClass.FarmStageGachaInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return this */ public GetFarmStageGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; * @return whether the farmStageGachaInfoList field is set */ public boolean hasFarmStageGachaInfoList() { @@ -85,7 +85,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; * @return this */ public GetFarmStageGachaInfoScRsp clearFarmStageGachaInfoList() { @@ -95,7 +95,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 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. @@ -110,7 +110,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 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 @@ -125,7 +125,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; * @param value the farmStageGachaInfoList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 5; * @param values the farmStageGachaInfoList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetFarmStageGachaInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < farmStageGachaInfoList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(farmStageGachaInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFarmStageGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // farmStageGachaInfoList tag = input.readRepeatedMessage(farmStageGachaInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java index 12cc4d8..5340f10 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 2; */ private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 2; * @return whether the npcTalkList field is set */ public boolean hasNpcTalkList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 2; * @return this */ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 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. @@ -67,7 +67,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 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 @@ -81,7 +81,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 2; * @param value the npcTalkList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 14; + * repeated uint32 npc_talk_list = 2; * @param values the npcTalkList to add * @return this */ @@ -165,7 +165,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < npcTalkList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(npcTalkList.array()[i]); } } @@ -187,7 +187,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 18: { // npcTalkList [packed=true] input.readPackedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { tag = input.readTag(); break; } - case 112: { + case 16: { // npcTalkList [packed=false] tag = input.readRepeatedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java index f79ad86..16380ac 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkByPerformanceNpcScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(NpcTalkInfoOuterClass.NpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * * 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. @@ -109,7 +109,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * @param value the npcTalkInfoList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 10; + * repeated .NpcTalkInfo npc_talk_info_list = 9; * @param values the npcTalkInfoList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 74) { break; } } - case 82: { + case 74: { // npcTalkInfoList tag = input.readRepeatedMessage(npcTalkInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java index b252175..d0ad2f9 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_list = 13; */ private final RepeatedInt npcIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_list = 13; * @return whether the npcIdList field is set */ public boolean hasNpcIdList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_list = 13; * @return this */ public GetFirstTalkNpcCsReq clearNpcIdList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_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. @@ -67,7 +67,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_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 @@ -81,7 +81,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_list = 13; * @param value the npcIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 1; + * repeated uint32 npc_id_list = 13; * @param values the npcIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < npcIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(npcIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 106: { // npcIdList [packed=true] input.readPackedUInt32(npcIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 104: { // npcIdList [packed=false] tag = input.readRepeatedUInt32(npcIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java index 92f0292..586dc13 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFirstTalkNpcScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFirstTalkNpcScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(FirstNpcTalkInfoOuterClass.FirstNpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return this */ public GetFirstTalkNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @return this */ public GetFirstTalkNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_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. @@ -109,7 +109,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_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 @@ -124,7 +124,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @param value the npcTalkInfoList to add * @return this */ @@ -136,7 +136,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 14; * @param values the npcTalkInfoList to add * @return this */ @@ -213,12 +213,12 @@ public final class GetFirstTalkNpcScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 114); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -243,16 +243,16 @@ public final class GetFirstTalkNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { + case 114: { // npcTalkInfoList tag = input.readRepeatedMessage(npcTalkInfoList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java index 6d3ff1b..f6eda8d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFriendApplyListInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 11; */ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return this */ public GetFriendApplyListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 11; * @return whether the friendApplyList field is set */ public boolean hasFriendApplyList() { @@ -85,7 +85,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 11; * @return this */ public GetFriendApplyListInfoScRsp clearFriendApplyList() { @@ -95,7 +95,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 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. @@ -109,7 +109,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 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 @@ -123,7 +123,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 11; * @param value the friendApplyList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 15; + * repeated .FriendApplyInfo friend_apply_list = 11; * @param values the friendApplyList to add * @return this */ @@ -212,12 +212,12 @@ public final class GetFriendApplyListInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendApplyList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(friendApplyList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendApplyListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // friendApplyList tag = input.readRepeatedMessage(friendApplyList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java index 1086b1b..3cece96 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFriendListInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_list = 6; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @return this */ public GetFriendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_list = 6; * @return whether the friendList field is set */ public boolean hasFriendList() { @@ -85,7 +85,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_list = 6; * @return this */ public GetFriendListInfoScRsp clearFriendList() { @@ -95,7 +95,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_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. @@ -109,7 +109,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_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 @@ -123,7 +123,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_list = 6; * @param value the friendList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 4; + * repeated .FriendListInfo friend_list = 6; * @param values the friendList to add * @return this */ @@ -212,12 +212,12 @@ public final class GetFriendListInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 50); output.writeMessageNoTag(friendList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 50) { break; } } - case 34: { + case 50: { // friendList tag = input.readRepeatedMessage(friendList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java index e68bdf8..83a7387 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFriendLoginInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 11; */ private final RepeatedInt friendUidList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return this */ public GetFriendLoginInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 11; * @return whether the friendUidList field is set */ public boolean hasFriendUidList() { @@ -85,7 +85,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 11; * @return this */ public GetFriendLoginInfoScRsp clearFriendUidList() { @@ -95,7 +95,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 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. @@ -109,7 +109,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 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 @@ -123,7 +123,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 11; * @param value the friendUidList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * repeated uint32 friend_uid_list = 7; + * repeated uint32 friend_uid_list = 11; * @param values the friendUidList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetFriendLoginInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendUidList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(friendUidList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetFriendLoginInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 90) { break; } } - case 58: { + case 90: { // friendUidList [packed=true] input.readPackedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetFriendLoginInfoScRspOuterClass { tag = input.readTag(); break; } - case 56: { + case 88: { // friendUidList [packed=false] tag = input.readRepeatedUInt32(friendUidList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java index 7d5853f..d56e7a1 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetFriendRecommendListInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_list = 13; */ private final RepeatedMessage friendRecommendList = RepeatedMessage.newEmptyInstance(FriendRecommendInfoOuterClass.FriendRecommendInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 5; * @return this */ public GetFriendRecommendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_list = 13; * @return whether the friendRecommendList field is set */ public boolean hasFriendRecommendList() { @@ -85,7 +85,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_list = 13; * @return this */ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { @@ -95,7 +95,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_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. @@ -110,7 +110,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_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 @@ -125,7 +125,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_list = 13; * @param value the friendRecommendList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 15; + * repeated .FriendRecommendInfo friend_recommend_list = 13; * @param values the friendRecommendList to add * @return this */ @@ -214,12 +214,12 @@ public final class GetFriendRecommendListInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendRecommendList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 106); output.writeMessageNoTag(friendRecommendList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFriendRecommendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { + case 106: { // friendRecommendList tag = input.readRepeatedMessage(friendRecommendList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java index d076f21..de05ce3 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GetGachaCeilingCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_type = 7; + * optional uint32 gacha_type = 15; */ private int gachaType; @@ -34,7 +34,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 7; + * optional uint32 gacha_type = 15; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -42,7 +42,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 7; + * optional uint32 gacha_type = 15; * @return this */ public GetGachaCeilingCsReq clearGachaType() { @@ -52,7 +52,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 7; + * optional uint32 gacha_type = 15; * @return the gachaType */ public int getGachaType() { @@ -60,7 +60,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 7; + * optional uint32 gacha_type = 15; * @param value the gachaType to set * @return this */ @@ -129,7 +129,7 @@ public final class GetGachaCeilingCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(gachaType); } } @@ -150,7 +150,7 @@ public final class GetGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 120: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java index e39438a..e19995d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaCeilingScRspOuterClass.java @@ -19,17 +19,17 @@ public final class GetGachaCeilingScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 gacha_type = 9; + * optional uint32 gacha_type = 14; */ private int gachaType; /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional uint32 retcode = 15; + */ + private int retcode; + + /** + * optional .GachaCeiling gacha_ceiling = 11; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -44,62 +44,25 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 gacha_type = 14; + * @return whether the gachaType field is set */ - public boolean hasRetcode() { + public boolean hasGachaType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public GetGachaCeilingScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 3; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 3; - * @param value the retcode to set - * @return this - */ - public GetGachaCeilingScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 gacha_type = 9; - * @return whether the gachaType field is set - */ - public boolean hasGachaType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_type = 9; + * optional uint32 gacha_type = 14; * @return this */ public GetGachaCeilingScRsp clearGachaType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaType = 0; return this; } /** - * optional uint32 gacha_type = 9; + * optional uint32 gacha_type = 14; * @return the gachaType */ public int getGachaType() { @@ -107,18 +70,55 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 9; + * optional uint32 gacha_type = 14; * @param value the gachaType to set * @return this */ public GetGachaCeilingScRsp setGachaType(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; gachaType = value; return this; } /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional uint32 retcode = 15; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 15; + * @return this + */ + public GetGachaCeilingScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 15; + * @param value the retcode to set + * @return this + */ + public GetGachaCeilingScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .GachaCeiling gacha_ceiling = 11; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -126,7 +126,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional .GachaCeiling gacha_ceiling = 11; * @return this */ public GetGachaCeilingScRsp clearGachaCeiling() { @@ -136,7 +136,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional .GachaCeiling gacha_ceiling = 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. @@ -150,7 +150,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional .GachaCeiling gacha_ceiling = 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 @@ -164,7 +164,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 13; + * optional .GachaCeiling gacha_ceiling = 11; * @param value the gachaCeiling to set * @return this */ @@ -179,8 +179,8 @@ public final class GetGachaCeilingScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; gachaType = other.gachaType; + retcode = other.retcode; gachaCeiling.copyFrom(other.gachaCeiling); } return this; @@ -192,12 +192,12 @@ public final class GetGachaCeilingScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasGachaType()) { setGachaType(other.gachaType); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } @@ -211,8 +211,8 @@ public final class GetGachaCeilingScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; gachaType = 0; + retcode = 0; gachaCeiling.clear(); return this; } @@ -238,23 +238,23 @@ public final class GetGachaCeilingScRspOuterClass { } GetGachaCeilingScRsp other = (GetGachaCeilingScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasGachaType() || gachaType == other.gachaType) + && (!hasRetcode() || retcode == other.retcode) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(gachaType); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(gachaCeiling); } } @@ -263,10 +263,10 @@ public final class GetGachaCeilingScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); @@ -281,25 +281,25 @@ public final class GetGachaCeilingScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 112: { // gachaType gachaType = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 120) { break; } } - case 106: { + case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class GetGachaCeilingScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.gachaType, gachaType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gachaType, gachaType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); @@ -344,10 +344,11 @@ public final class GetGachaCeilingScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 802848732: + case -871474217: { + if (input.isAtField(FieldNames.gachaType)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + gachaType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class GetGachaCeilingScRspOuterClass { } break; } - case 802848732: - case -871474217: { - if (input.isAtField(FieldNames.gachaType)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - gachaType = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class GetGachaCeilingScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName gachaType = FieldName.forField("gachaType", "gacha_type"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java index f43680f..035a6b4 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetGachaInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional uint32 gacha_random = 7; + * optional uint32 gacha_random = 15; */ private int gachaRandom; /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_list = 12; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -45,7 +45,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return this */ public GetGachaInfoScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 7; + * optional uint32 gacha_random = 15; * @return whether the gachaRandom field is set */ public boolean hasGachaRandom() { @@ -90,7 +90,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 7; + * optional uint32 gacha_random = 15; * @return this */ public GetGachaInfoScRsp clearGachaRandom() { @@ -100,7 +100,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 7; + * optional uint32 gacha_random = 15; * @return the gachaRandom */ public int getGachaRandom() { @@ -108,7 +108,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 7; + * optional uint32 gacha_random = 15; * @param value the gachaRandom to set * @return this */ @@ -119,7 +119,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_list = 12; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -127,7 +127,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_list = 12; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -137,7 +137,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_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. @@ -151,7 +151,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_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 @@ -165,7 +165,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_list = 12; * @param value the gachaInfoList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 2; + * repeated .GachaInfo gacha_info_list = 12; * @param values the gachaInfoList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetGachaInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { + case 120: { // gachaRandom gachaRandom = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 98) { break; } } - case 18: { + case 98: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java index 645401a..f548d5e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetJukeboxDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 playing_id = 12; + * optional uint32 playing_id = 10; */ private int playingId; /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 7; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -45,7 +45,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return this */ public GetJukeboxDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 12; + * optional uint32 playing_id = 10; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -90,7 +90,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 12; + * optional uint32 playing_id = 10; * @return this */ public GetJukeboxDataScRsp clearPlayingId() { @@ -100,7 +100,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 12; + * optional uint32 playing_id = 10; * @return the playingId */ public int getPlayingId() { @@ -108,7 +108,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 12; + * optional uint32 playing_id = 10; * @param value the playingId to set * @return this */ @@ -119,7 +119,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 7; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -127,7 +127,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 7; * @return this */ public GetJukeboxDataScRsp clearMusicList() { @@ -137,7 +137,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_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. @@ -151,7 +151,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_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 @@ -165,7 +165,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 7; * @param value the musicList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 2; + * repeated .UnlockedMusic music_list = 7; * @param values the musicList to add * @return this */ @@ -259,16 +259,16 @@ public final class GetJukeboxDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeMessageNoTag(musicList.get(i)); } } @@ -296,25 +296,25 @@ public final class GetJukeboxDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 58) { break; } } - case 18: { + case 58: { // musicList tag = input.readRepeatedMessage(musicList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java index d54693a..cddb838 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMailScRspOuterClass.java @@ -20,35 +20,35 @@ public final class GetMailScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 start = 13; - */ - private int start; - - /** - * optional uint32 total_num = 14; + * optional uint32 total_num = 7; */ private int totalNum; /** - * optional bool is_end = 1; + * optional uint32 start = 11; + */ + private int start; + + /** + * optional bool is_end = 13; */ private boolean isEnd; /** - * repeated .ClientMail mail_list = 2; - */ - private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); - - /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; */ private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + /** + * repeated .ClientMail mail_list = 12; + */ + private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + private GetMailScRsp() { } @@ -60,7 +60,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -68,7 +68,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return this */ public GetMailScRsp clearRetcode() { @@ -78,7 +78,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -86,7 +86,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -97,62 +97,25 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 13; - * @return whether the start field is set + * optional uint32 total_num = 7; + * @return whether the totalNum field is set */ - public boolean hasStart() { + public boolean hasTotalNum() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 start = 13; - * @return this - */ - public GetMailScRsp clearStart() { - bitField0_ &= ~0x00000002; - start = 0; - return this; - } - - /** - * optional uint32 start = 13; - * @return the start - */ - public int getStart() { - return start; - } - - /** - * optional uint32 start = 13; - * @param value the start to set - * @return this - */ - public GetMailScRsp setStart(final int value) { - bitField0_ |= 0x00000002; - start = value; - return this; - } - - /** - * optional uint32 total_num = 14; - * @return whether the totalNum field is set - */ - public boolean hasTotalNum() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 total_num = 14; + * optional uint32 total_num = 7; * @return this */ public GetMailScRsp clearTotalNum() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; totalNum = 0; return this; } /** - * optional uint32 total_num = 14; + * optional uint32 total_num = 7; * @return the totalNum */ public int getTotalNum() { @@ -160,18 +123,55 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 14; + * optional uint32 total_num = 7; * @param value the totalNum to set * @return this */ public GetMailScRsp setTotalNum(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; totalNum = value; return this; } /** - * optional bool is_end = 1; + * optional uint32 start = 11; + * @return whether the start field is set + */ + public boolean hasStart() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 start = 11; + * @return this + */ + public GetMailScRsp clearStart() { + bitField0_ &= ~0x00000004; + start = 0; + return this; + } + + /** + * optional uint32 start = 11; + * @return the start + */ + public int getStart() { + return start; + } + + /** + * optional uint32 start = 11; + * @param value the start to set + * @return this + */ + public GetMailScRsp setStart(final int value) { + bitField0_ |= 0x00000004; + start = value; + return this; + } + + /** + * optional bool is_end = 13; * @return whether the isEnd field is set */ public boolean hasIsEnd() { @@ -179,7 +179,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 1; + * optional bool is_end = 13; * @return this */ public GetMailScRsp clearIsEnd() { @@ -189,7 +189,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 1; + * optional bool is_end = 13; * @return the isEnd */ public boolean getIsEnd() { @@ -197,7 +197,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 1; + * optional bool is_end = 13; * @param value the isEnd to set * @return this */ @@ -208,93 +208,25 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 2; - * @return whether the mailList field is set + * repeated .ClientMail notice_mail_list = 9; + * @return whether the noticeMailList field is set */ - public boolean hasMailList() { + public boolean hasNoticeMailList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .ClientMail mail_list = 2; - * @return this - */ - public GetMailScRsp clearMailList() { - bitField0_ &= ~0x00000010; - mailList.clear(); - return this; - } - - /** - * repeated .ClientMail mail_list = 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 #getMutableMailList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMailList() { - return mailList; - } - - /** - * repeated .ClientMail mail_list = 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 RepeatedMessage getMutableMailList() { - bitField0_ |= 0x00000010; - return mailList; - } - - /** - * repeated .ClientMail mail_list = 2; - * @param value the mailList to add - * @return this - */ - public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) { - bitField0_ |= 0x00000010; - mailList.add(value); - return this; - } - - /** - * repeated .ClientMail mail_list = 2; - * @param values the mailList to add - * @return this - */ - public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) { - bitField0_ |= 0x00000010; - mailList.addAll(values); - return this; - } - - /** - * repeated .ClientMail notice_mail_list = 5; - * @return whether the noticeMailList field is set - */ - public boolean hasNoticeMailList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; * @return this */ public GetMailScRsp clearNoticeMailList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; noticeMailList.clear(); return this; } /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; * * 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. @@ -308,7 +240,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -317,43 +249,111 @@ public final class GetMailScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableNoticeMailList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return noticeMailList; } /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; * @param value the noticeMailList to add * @return this */ public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; noticeMailList.add(value); return this; } /** - * repeated .ClientMail notice_mail_list = 5; + * repeated .ClientMail notice_mail_list = 9; * @param values the noticeMailList to add * @return this */ public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; noticeMailList.addAll(values); return this; } + /** + * repeated .ClientMail mail_list = 12; + * @return whether the mailList field is set + */ + public boolean hasMailList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .ClientMail mail_list = 12; + * @return this + */ + public GetMailScRsp clearMailList() { + bitField0_ &= ~0x00000020; + mailList.clear(); + return this; + } + + /** + * repeated .ClientMail mail_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. + * + * Use {@link #getMutableMailList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMailList() { + return mailList; + } + + /** + * repeated .ClientMail mail_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMailList() { + bitField0_ |= 0x00000020; + return mailList; + } + + /** + * repeated .ClientMail mail_list = 12; + * @param value the mailList to add + * @return this + */ + public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) { + bitField0_ |= 0x00000020; + mailList.add(value); + return this; + } + + /** + * repeated .ClientMail mail_list = 12; + * @param values the mailList to add + * @return this + */ + public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) { + bitField0_ |= 0x00000020; + mailList.addAll(values); + return this; + } + @Override public GetMailScRsp copyFrom(final GetMailScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - start = other.start; totalNum = other.totalNum; + start = other.start; isEnd = other.isEnd; - mailList.copyFrom(other.mailList); noticeMailList.copyFrom(other.noticeMailList); + mailList.copyFrom(other.mailList); } return this; } @@ -367,21 +367,21 @@ public final class GetMailScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasStart()) { - setStart(other.start); - } if (other.hasTotalNum()) { setTotalNum(other.totalNum); } + if (other.hasStart()) { + setStart(other.start); + } if (other.hasIsEnd()) { setIsEnd(other.isEnd); } - if (other.hasMailList()) { - getMutableMailList().addAll(other.mailList); - } if (other.hasNoticeMailList()) { getMutableNoticeMailList().addAll(other.noticeMailList); } + if (other.hasMailList()) { + getMutableMailList().addAll(other.mailList); + } return this; } @@ -393,11 +393,11 @@ public final class GetMailScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - start = 0; totalNum = 0; + start = 0; isEnd = false; - mailList.clear(); noticeMailList.clear(); + mailList.clear(); return this; } @@ -408,8 +408,8 @@ public final class GetMailScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - mailList.clearQuick(); noticeMailList.clearQuick(); + mailList.clearQuick(); return this; } @@ -424,41 +424,41 @@ public final class GetMailScRspOuterClass { GetMailScRsp other = (GetMailScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasStart() || start == other.start) && (!hasTotalNum() || totalNum == other.totalNum) + && (!hasStart() || start == other.start) && (!hasIsEnd() || isEnd == other.isEnd) - && (!hasMailList() || mailList.equals(other.mailList)) - && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)); + && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)) + && (!hasMailList() || mailList.equals(other.mailList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(start); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(totalNum); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(start); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeBoolNoTag(isEnd); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < mailList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(mailList.get(i)); + for (int i = 0; i < noticeMailList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(noticeMailList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < noticeMailList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(noticeMailList.get(i)); + for (int i = 0; i < mailList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(mailList.get(i)); } } } @@ -470,19 +470,19 @@ public final class GetMailScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(start); + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalNum); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(totalNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(start); } if ((bitField0_ & 0x00000008) != 0) { size += 2; } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); + size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); + size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); } return size; } @@ -494,53 +494,53 @@ public final class GetMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // totalNum + totalNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // start + start = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // start - start = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // totalNum - totalNum = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { // isEnd isEnd = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 74) { break; } } - case 18: { - // mailList - tag = input.readRepeatedMessage(mailList, tag); - bitField0_ |= 0x00000010; - if (tag != 42) { - break; - } - } - case 42: { + case 74: { // noticeMailList tag = input.readRepeatedMessage(noticeMailList, tag); + bitField0_ |= 0x00000010; + if (tag != 98) { + break; + } + } + case 98: { + // mailList + tag = input.readRepeatedMessage(mailList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -567,19 +567,19 @@ public final class GetMailScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.start, start); + output.writeUInt32(FieldNames.totalNum, totalNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.totalNum, totalNum); + output.writeUInt32(FieldNames.start, start); } if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.isEnd, isEnd); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.mailList, mailList); + output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); + output.writeRepeatedMessage(FieldNames.mailList, mailList); } output.endObject(); } @@ -602,10 +602,11 @@ public final class GetMailScRspOuterClass { } break; } - case 109757538: { - if (input.isAtField(FieldNames.start)) { + case -849911390: + case -576949237: { + if (input.isAtField(FieldNames.totalNum)) { if (!input.trySkipNullValue()) { - start = input.readUInt32(); + totalNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -613,11 +614,10 @@ public final class GetMailScRspOuterClass { } break; } - case -849911390: - case -576949237: { - if (input.isAtField(FieldNames.totalNum)) { + case 109757538: { + if (input.isAtField(FieldNames.start)) { if (!input.trySkipNullValue()) { - totalNum = input.readUInt32(); + start = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -637,11 +637,11 @@ public final class GetMailScRspOuterClass { } break; } - case -10520843: - case -308519386: { - if (input.isAtField(FieldNames.mailList)) { + case 17373677: + case 1540899199: { + if (input.isAtField(FieldNames.noticeMailList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mailList); + input.readRepeatedMessage(noticeMailList); bitField0_ |= 0x00000010; } } else { @@ -649,11 +649,11 @@ public final class GetMailScRspOuterClass { } break; } - case 17373677: - case 1540899199: { - if (input.isAtField(FieldNames.noticeMailList)) { + case -10520843: + case -308519386: { + if (input.isAtField(FieldNames.mailList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(noticeMailList); + input.readRepeatedMessage(mailList); bitField0_ |= 0x00000020; } } else { @@ -715,15 +715,15 @@ public final class GetMailScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName start = FieldName.forField("start"); - static final FieldName totalNum = FieldName.forField("totalNum", "total_num"); + static final FieldName start = FieldName.forField("start"); + static final FieldName isEnd = FieldName.forField("isEnd", "is_end"); - static final FieldName mailList = FieldName.forField("mailList", "mail_list"); - static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list"); + + static final FieldName mailList = FieldName.forField("mailList", "mail_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java index 759a079..d842138 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java @@ -20,20 +20,20 @@ public final class GetMissionStatusCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 mission_event_id_list = 3; - */ - private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_list = 6; */ private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 8; */ private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 mission_event_id_list = 11; + */ + private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); + private GetMissionStatusCsReq() { } @@ -45,93 +45,25 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 mission_event_id_list = 3; - * @return whether the missionEventIdList field is set + * repeated uint32 main_mission_id_list = 6; + * @return whether the mainMissionIdList field is set */ - public boolean hasMissionEventIdList() { + public boolean hasMainMissionIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 mission_event_id_list = 3; - * @return this - */ - public GetMissionStatusCsReq clearMissionEventIdList() { - bitField0_ &= ~0x00000001; - missionEventIdList.clear(); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 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 #getMutableMissionEventIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMissionEventIdList() { - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 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 RepeatedInt getMutableMissionEventIdList() { - bitField0_ |= 0x00000001; - return missionEventIdList; - } - - /** - * repeated uint32 mission_event_id_list = 3; - * @param value the missionEventIdList to add - * @return this - */ - public GetMissionStatusCsReq addMissionEventIdList(final int value) { - bitField0_ |= 0x00000001; - missionEventIdList.add(value); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 3; - * @param values the missionEventIdList to add - * @return this - */ - public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { - bitField0_ |= 0x00000001; - missionEventIdList.addAll(values); - return this; - } - - /** - * repeated uint32 main_mission_id_list = 4; - * @return whether the mainMissionIdList field is set - */ - public boolean hasMainMissionIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_list = 6; * @return this */ public GetMissionStatusCsReq clearMainMissionIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; mainMissionIdList.clear(); return this; } /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_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. @@ -145,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_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 @@ -154,52 +86,52 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMainMissionIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return mainMissionIdList; } /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_list = 6; * @param value the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addMainMissionIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; mainMissionIdList.add(value); return this; } /** - * repeated uint32 main_mission_id_list = 4; + * repeated uint32 main_mission_id_list = 6; * @param values the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addAllMainMissionIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; mainMissionIdList.addAll(values); return this; } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 8; * @return whether the subMissionIdList field is set */ public boolean hasSubMissionIdList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 8; * @return this */ public GetMissionStatusCsReq clearSubMissionIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; subMissionIdList.clear(); return this; } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_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. @@ -213,7 +145,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_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 @@ -222,40 +154,108 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableSubMissionIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return subMissionIdList; } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 8; * @param value the subMissionIdList to add * @return this */ public GetMissionStatusCsReq addSubMissionIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; subMissionIdList.add(value); return this; } /** - * repeated uint32 sub_mission_id_list = 15; + * repeated uint32 sub_mission_id_list = 8; * @param values the subMissionIdList to add * @return this */ public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; subMissionIdList.addAll(values); return this; } + /** + * repeated uint32 mission_event_id_list = 11; + * @return whether the missionEventIdList field is set + */ + public boolean hasMissionEventIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 mission_event_id_list = 11; + * @return this + */ + public GetMissionStatusCsReq clearMissionEventIdList() { + bitField0_ &= ~0x00000004; + missionEventIdList.clear(); + return this; + } + + /** + * repeated uint32 mission_event_id_list = 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 #getMutableMissionEventIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getMissionEventIdList() { + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableMissionEventIdList() { + bitField0_ |= 0x00000004; + return missionEventIdList; + } + + /** + * repeated uint32 mission_event_id_list = 11; + * @param value the missionEventIdList to add + * @return this + */ + public GetMissionStatusCsReq addMissionEventIdList(final int value) { + bitField0_ |= 0x00000004; + missionEventIdList.add(value); + return this; + } + + /** + * repeated uint32 mission_event_id_list = 11; + * @param values the missionEventIdList to add + * @return this + */ + public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { + bitField0_ |= 0x00000004; + missionEventIdList.addAll(values); + return this; + } + @Override public GetMissionStatusCsReq copyFrom(final GetMissionStatusCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - missionEventIdList.copyFrom(other.missionEventIdList); mainMissionIdList.copyFrom(other.mainMissionIdList); subMissionIdList.copyFrom(other.subMissionIdList); + missionEventIdList.copyFrom(other.missionEventIdList); } return this; } @@ -266,15 +266,15 @@ public final class GetMissionStatusCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasMissionEventIdList()) { - getMutableMissionEventIdList().addAll(other.missionEventIdList); - } if (other.hasMainMissionIdList()) { getMutableMainMissionIdList().addAll(other.mainMissionIdList); } if (other.hasSubMissionIdList()) { getMutableSubMissionIdList().addAll(other.subMissionIdList); } + if (other.hasMissionEventIdList()) { + getMutableMissionEventIdList().addAll(other.missionEventIdList); + } return this; } @@ -285,9 +285,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - missionEventIdList.clear(); mainMissionIdList.clear(); subMissionIdList.clear(); + missionEventIdList.clear(); return this; } @@ -298,9 +298,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - missionEventIdList.clear(); mainMissionIdList.clear(); subMissionIdList.clear(); + missionEventIdList.clear(); return this; } @@ -314,45 +314,45 @@ public final class GetMissionStatusCsReqOuterClass { } GetMissionStatusCsReq other = (GetMissionStatusCsReq) o; return bitField0_ == other.bitField0_ - && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)) && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)) - && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)); + && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)) + && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < missionEventIdList.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(missionEventIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mainMissionIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(mainMissionIdList.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < subMissionIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(subMissionIdList.array()[i]); } } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < missionEventIdList.length(); i++) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(missionEventIdList.array()[i]); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * mainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionIdList); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); + } return size; } @@ -363,27 +363,27 @@ public final class GetMissionStatusCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { - // missionEventIdList [packed=true] - input.readPackedUInt32(missionEventIdList, tag); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { + case 50: { // mainMissionIdList [packed=true] input.readPackedUInt32(mainMissionIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 66) { break; } } - case 122: { + case 66: { // subMissionIdList [packed=true] input.readPackedUInt32(subMissionIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // missionEventIdList [packed=true] + input.readPackedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -400,21 +400,21 @@ public final class GetMissionStatusCsReqOuterClass { tag = input.readTag(); break; } - case 24: { - // missionEventIdList [packed=false] - tag = input.readRepeatedUInt32(missionEventIdList, tag); + case 48: { + // mainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000001; break; } - case 32: { - // mainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(mainMissionIdList, tag); + case 64: { + // subMissionIdList [packed=false] + tag = input.readRepeatedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 120: { - // subMissionIdList [packed=false] - tag = input.readRepeatedUInt32(subMissionIdList, tag); + case 88: { + // missionEventIdList [packed=false] + tag = input.readRepeatedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000004; break; } @@ -426,14 +426,14 @@ public final class GetMissionStatusCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.mainMissionIdList, mainMissionIdList); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); + } output.endObject(); } @@ -444,24 +444,12 @@ public final class GetMissionStatusCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 784770663: - case -628890838: { - if (input.isAtField(FieldNames.missionEventIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(missionEventIdList); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1438400460: case -1382679799: { if (input.isAtField(FieldNames.mainMissionIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(mainMissionIdList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -473,6 +461,18 @@ public final class GetMissionStatusCsReqOuterClass { if (input.isAtField(FieldNames.subMissionIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(subMissionIdList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 784770663: + case -628890838: { + if (input.isAtField(FieldNames.missionEventIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(missionEventIdList); bitField0_ |= 0x00000004; } } else { @@ -533,11 +533,11 @@ public final class GetMissionStatusCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName missionEventIdList = FieldName.forField("missionEventIdList", "mission_event_id_list"); - static final FieldName mainMissionIdList = FieldName.forField("mainMissionIdList", "main_mission_id_list"); static final FieldName subMissionIdList = FieldName.forField("subMissionIdList", "sub_mission_id_list"); + + static final FieldName missionEventIdList = FieldName.forField("missionEventIdList", "mission_event_id_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index c367835..5720176 100644 --- a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java @@ -21,35 +21,35 @@ public final class GetMissionStatusScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; */ private int retcode; /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_list = 6; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 unfinished_main_mission_id_list = 10; - */ - private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_id_list = 8; */ private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission sub_mission_status_list = 4; + * repeated uint32 unfinished_main_mission_id_list = 12; */ - private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_list = 4; */ private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + /** + * repeated .Mission sub_mission_status_list = 14; + */ + private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private GetMissionStatusScRsp() { } @@ -61,7 +61,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -69,7 +69,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -79,7 +79,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -87,7 +87,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -98,7 +98,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_list = 6; * @return whether the finishedMainMissionIdList field is set */ public boolean hasFinishedMainMissionIdList() { @@ -106,7 +106,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_list = 6; * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { @@ -116,7 +116,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_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. @@ -130,7 +130,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_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 @@ -144,7 +144,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_list = 6; * @param value the finishedMainMissionIdList to add * @return this */ @@ -155,7 +155,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 7; + * repeated uint32 finished_main_mission_id_list = 6; * @param values the finishedMainMissionIdList to add * @return this */ @@ -166,93 +166,25 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 10; - * @return whether the unfinishedMainMissionIdList field is set + * repeated uint32 disabled_main_mission_id_list = 8; + * @return whether the disabledMainMissionIdList field is set */ - public boolean hasUnfinishedMainMissionIdList() { + public boolean hasDisabledMainMissionIdList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 unfinished_main_mission_id_list = 10; - * @return this - */ - public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { - bitField0_ &= ~0x00000004; - unfinishedMainMissionIdList.clear(); - return this; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 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 #getMutableUnfinishedMainMissionIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnfinishedMainMissionIdList() { - return unfinishedMainMissionIdList; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 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 RepeatedInt getMutableUnfinishedMainMissionIdList() { - bitField0_ |= 0x00000004; - return unfinishedMainMissionIdList; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 10; - * @param value the unfinishedMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { - bitField0_ |= 0x00000004; - unfinishedMainMissionIdList.add(value); - return this; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 10; - * @param values the unfinishedMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) { - bitField0_ |= 0x00000004; - unfinishedMainMissionIdList.addAll(values); - return this; - } - - /** - * repeated uint32 disabled_main_mission_id_list = 15; - * @return whether the disabledMainMissionIdList field is set - */ - public boolean hasDisabledMainMissionIdList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_id_list = 8; * @return this */ public GetMissionStatusScRsp clearDisabledMainMissionIdList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; disabledMainMissionIdList.clear(); return this; } /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_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. @@ -266,7 +198,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_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 @@ -275,66 +207,66 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableDisabledMainMissionIdList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return disabledMainMissionIdList; } /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_id_list = 8; * @param value the disabledMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; disabledMainMissionIdList.add(value); return this; } /** - * repeated uint32 disabled_main_mission_id_list = 15; + * repeated uint32 disabled_main_mission_id_list = 8; * @param values the disabledMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; disabledMainMissionIdList.addAll(values); return this; } /** - * repeated .Mission sub_mission_status_list = 4; - * @return whether the subMissionStatusList field is set + * repeated uint32 unfinished_main_mission_id_list = 12; + * @return whether the unfinishedMainMissionIdList field is set */ - public boolean hasSubMissionStatusList() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasUnfinishedMainMissionIdList() { + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .Mission sub_mission_status_list = 4; + * repeated uint32 unfinished_main_mission_id_list = 12; * @return this */ - public GetMissionStatusScRsp clearSubMissionStatusList() { - bitField0_ &= ~0x00000010; - subMissionStatusList.clear(); + public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { + bitField0_ &= ~0x00000008; + unfinishedMainMissionIdList.clear(); return this; } /** - * repeated .Mission sub_mission_status_list = 4; + * repeated uint32 unfinished_main_mission_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. * - * Use {@link #getMutableSubMissionStatusList()} if you want to modify it. + * Use {@link #getMutableUnfinishedMainMissionIdList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getSubMissionStatusList() { - return subMissionStatusList; + public RepeatedInt getUnfinishedMainMissionIdList() { + return unfinishedMainMissionIdList; } /** - * repeated .Mission sub_mission_status_list = 4; + * repeated uint32 unfinished_main_mission_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 @@ -342,54 +274,53 @@ public final class GetMissionStatusScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableSubMissionStatusList() { - bitField0_ |= 0x00000010; - return subMissionStatusList; + public RepeatedInt getMutableUnfinishedMainMissionIdList() { + bitField0_ |= 0x00000008; + return unfinishedMainMissionIdList; } /** - * repeated .Mission sub_mission_status_list = 4; - * @param value the subMissionStatusList to add + * repeated uint32 unfinished_main_mission_id_list = 12; + * @param value the unfinishedMainMissionIdList to add * @return this */ - public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000010; - subMissionStatusList.add(value); + public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { + bitField0_ |= 0x00000008; + unfinishedMainMissionIdList.add(value); return this; } /** - * repeated .Mission sub_mission_status_list = 4; - * @param values the subMissionStatusList to add + * repeated uint32 unfinished_main_mission_id_list = 12; + * @param values the unfinishedMainMissionIdList to add * @return this */ - public GetMissionStatusScRsp addAllSubMissionStatusList( - final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000010; - subMissionStatusList.addAll(values); + public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) { + bitField0_ |= 0x00000008; + unfinishedMainMissionIdList.addAll(values); return this; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_list = 4; * @return whether the missionEventStatusList field is set */ public boolean hasMissionEventStatusList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_list = 4; * @return this */ public GetMissionStatusScRsp clearMissionEventStatusList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; missionEventStatusList.clear(); return this; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_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. @@ -403,7 +334,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_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 @@ -412,33 +343,102 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMissionEventStatusList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return missionEventStatusList; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_list = 4; * @param value the missionEventStatusList to add * @return this */ public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; missionEventStatusList.add(value); return this; } /** - * repeated .Mission mission_event_status_list = 12; + * repeated .Mission mission_event_status_list = 4; * @param values the missionEventStatusList to add * @return this */ public GetMissionStatusScRsp addAllMissionEventStatusList( final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; missionEventStatusList.addAll(values); return this; } + /** + * repeated .Mission sub_mission_status_list = 14; + * @return whether the subMissionStatusList field is set + */ + public boolean hasSubMissionStatusList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Mission sub_mission_status_list = 14; + * @return this + */ + public GetMissionStatusScRsp clearSubMissionStatusList() { + bitField0_ &= ~0x00000020; + subMissionStatusList.clear(); + return this; + } + + /** + * repeated .Mission sub_mission_status_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. + * + * Use {@link #getMutableSubMissionStatusList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getSubMissionStatusList() { + return subMissionStatusList; + } + + /** + * repeated .Mission sub_mission_status_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableSubMissionStatusList() { + bitField0_ |= 0x00000020; + return subMissionStatusList; + } + + /** + * repeated .Mission sub_mission_status_list = 14; + * @param value the subMissionStatusList to add + * @return this + */ + public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { + bitField0_ |= 0x00000020; + subMissionStatusList.add(value); + return this; + } + + /** + * repeated .Mission sub_mission_status_list = 14; + * @param values the subMissionStatusList to add + * @return this + */ + public GetMissionStatusScRsp addAllSubMissionStatusList( + final MissionOuterClass.Mission... values) { + bitField0_ |= 0x00000020; + subMissionStatusList.addAll(values); + return this; + } + @Override public GetMissionStatusScRsp copyFrom(final GetMissionStatusScRsp other) { cachedSize = other.cachedSize; @@ -446,10 +446,10 @@ public final class GetMissionStatusScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; finishedMainMissionIdList.copyFrom(other.finishedMainMissionIdList); - unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); - subMissionStatusList.copyFrom(other.subMissionStatusList); + unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); missionEventStatusList.copyFrom(other.missionEventStatusList); + subMissionStatusList.copyFrom(other.subMissionStatusList); } return this; } @@ -466,18 +466,18 @@ public final class GetMissionStatusScRspOuterClass { if (other.hasFinishedMainMissionIdList()) { getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList); } - if (other.hasUnfinishedMainMissionIdList()) { - getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); - } if (other.hasDisabledMainMissionIdList()) { getMutableDisabledMainMissionIdList().addAll(other.disabledMainMissionIdList); } - if (other.hasSubMissionStatusList()) { - getMutableSubMissionStatusList().addAll(other.subMissionStatusList); + if (other.hasUnfinishedMainMissionIdList()) { + getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); } if (other.hasMissionEventStatusList()) { getMutableMissionEventStatusList().addAll(other.missionEventStatusList); } + if (other.hasSubMissionStatusList()) { + getMutableSubMissionStatusList().addAll(other.subMissionStatusList); + } return this; } @@ -490,10 +490,10 @@ public final class GetMissionStatusScRspOuterClass { bitField0_ = 0; retcode = 0; finishedMainMissionIdList.clear(); - unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); - subMissionStatusList.clear(); + unfinishedMainMissionIdList.clear(); missionEventStatusList.clear(); + subMissionStatusList.clear(); return this; } @@ -505,10 +505,10 @@ public final class GetMissionStatusScRspOuterClass { cachedSize = -1; bitField0_ = 0; finishedMainMissionIdList.clear(); - unfinishedMainMissionIdList.clear(); disabledMainMissionIdList.clear(); - subMissionStatusList.clearQuick(); + unfinishedMainMissionIdList.clear(); missionEventStatusList.clearQuick(); + subMissionStatusList.clearQuick(); return this; } @@ -524,46 +524,46 @@ public final class GetMissionStatusScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList)) - && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) - && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)) - && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)); + && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) + && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)) + && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); } } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(unfinishedMainMissionIdList.array()[i]); + } + } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < subMissionStatusList.length(); i++) { + for (int i = 0; i < missionEventStatusList.length(); i++) { output.writeRawByte((byte) 34); - output.writeMessageNoTag(subMissionStatusList.get(i)); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(subMissionStatusList.get(i)); } } } @@ -578,16 +578,16 @@ public final class GetMissionStatusScRspOuterClass { size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList); - } - if ((bitField0_ & 0x00000008) != 0) { size += (1 * disabledMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(disabledMainMissionIdList); } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList); + } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); + size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); + size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); } return size; } @@ -599,36 +599,36 @@ public final class GetMissionStatusScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 50) { break; } } - case 58: { + case 50: { // finishedMainMissionIdList [packed=true] input.readPackedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { - // unfinishedMainMissionIdList [packed=true] - input.readPackedUInt32(unfinishedMainMissionIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 66: { // disabledMainMissionIdList [packed=true] input.readPackedUInt32(disabledMainMissionIdList, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // unfinishedMainMissionIdList [packed=true] + input.readPackedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 34) { @@ -636,16 +636,16 @@ public final class GetMissionStatusScRspOuterClass { } } case 34: { - // subMissionStatusList - tag = input.readRepeatedMessage(subMissionStatusList, tag); + // missionEventStatusList + tag = input.readRepeatedMessage(missionEventStatusList, tag); bitField0_ |= 0x00000010; - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { - // missionEventStatusList - tag = input.readRepeatedMessage(missionEventStatusList, tag); + case 114: { + // subMissionStatusList + tag = input.readRepeatedMessage(subMissionStatusList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -661,21 +661,21 @@ public final class GetMissionStatusScRspOuterClass { tag = input.readTag(); break; } - case 56: { + case 48: { // finishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 80: { - // unfinishedMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); + case 64: { + // disabledMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 120: { - // disabledMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); + case 96: { + // unfinishedMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000008; break; } @@ -693,16 +693,16 @@ public final class GetMissionStatusScRspOuterClass { output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.disabledMainMissionIdList, disabledMainMissionIdList); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); + output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); + output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); } output.endObject(); } @@ -737,11 +737,11 @@ public final class GetMissionStatusScRspOuterClass { } break; } - case 61133057: - case 1704637629: { - if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) { + case 83823792: + case 1929478380: { + if (input.isAtField(FieldNames.disabledMainMissionIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unfinishedMainMissionIdList); + input.readRepeatedUInt32(disabledMainMissionIdList); bitField0_ |= 0x00000004; } } else { @@ -749,11 +749,11 @@ public final class GetMissionStatusScRspOuterClass { } break; } - case 83823792: - case 1929478380: { - if (input.isAtField(FieldNames.disabledMainMissionIdList)) { + case 61133057: + case 1704637629: { + if (input.isAtField(FieldNames.unfinishedMainMissionIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(disabledMainMissionIdList); + input.readRepeatedUInt32(unfinishedMainMissionIdList); bitField0_ |= 0x00000008; } } else { @@ -761,23 +761,23 @@ public final class GetMissionStatusScRspOuterClass { } break; } - case -1842850820: - case 1165580825: { - if (input.isAtField(FieldNames.subMissionStatusList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(subMissionStatusList); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case 582053566: case 1494751923: { if (input.isAtField(FieldNames.missionEventStatusList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(missionEventStatusList); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1842850820: + case 1165580825: { + if (input.isAtField(FieldNames.subMissionStatusList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(subMissionStatusList); bitField0_ |= 0x00000020; } } else { @@ -842,13 +842,13 @@ public final class GetMissionStatusScRspOuterClass { static final FieldName finishedMainMissionIdList = FieldName.forField("finishedMainMissionIdList", "finished_main_mission_id_list"); - static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list"); - static final FieldName disabledMainMissionIdList = FieldName.forField("disabledMainMissionIdList", "disabled_main_mission_id_list"); - static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); + static final FieldName unfinishedMainMissionIdList = FieldName.forField("unfinishedMainMissionIdList", "unfinished_main_mission_id_list"); static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); + + static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java new file mode 100644 index 0000000..f634bd6 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/GetMultiPathAvatarInfoScRspOuterClass.java @@ -0,0 +1,974 @@ +// 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 GetMultiPathAvatarInfoScRspOuterClass { + /** + * Protobuf type {@code GetMultiPathAvatarInfoScRsp} + */ + public static final class GetMultiPathAvatarInfoScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * repeated uint32 basic_type_id_list = 15; + */ + private final RepeatedInt basicTypeIdList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; + */ + private final RepeatedMessage curAvatarPath = RepeatedMessage.newEmptyInstance(CurAvatarPathEntry.getFactory()); + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + */ + private final RepeatedMessage multiPathAvatarInfoList = RepeatedMessage.newEmptyInstance(MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo.getFactory()); + + private GetMultiPathAvatarInfoScRsp() { + } + + /** + * @return a new empty instance of {@code GetMultiPathAvatarInfoScRsp} + */ + public static GetMultiPathAvatarInfoScRsp newInstance() { + return new GetMultiPathAvatarInfoScRsp(); + } + + /** + * optional uint32 retcode = 7; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public GetMultiPathAvatarInfoScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 7; + * @param value the retcode to set + * @return this + */ + public GetMultiPathAvatarInfoScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * repeated uint32 basic_type_id_list = 15; + * @return whether the basicTypeIdList field is set + */ + public boolean hasBasicTypeIdList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated uint32 basic_type_id_list = 15; + * @return this + */ + public GetMultiPathAvatarInfoScRsp clearBasicTypeIdList() { + bitField0_ &= ~0x00000002; + basicTypeIdList.clear(); + return this; + } + + /** + * repeated uint32 basic_type_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 #getMutableBasicTypeIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getBasicTypeIdList() { + return basicTypeIdList; + } + + /** + * repeated uint32 basic_type_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 getMutableBasicTypeIdList() { + bitField0_ |= 0x00000002; + return basicTypeIdList; + } + + /** + * repeated uint32 basic_type_id_list = 15; + * @param value the basicTypeIdList to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addBasicTypeIdList(final int value) { + bitField0_ |= 0x00000002; + basicTypeIdList.add(value); + return this; + } + + /** + * repeated uint32 basic_type_id_list = 15; + * @param values the basicTypeIdList to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addAllBasicTypeIdList(final int... values) { + bitField0_ |= 0x00000002; + basicTypeIdList.addAll(values); + return this; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; + * @return whether the curAvatarPath field is set + */ + public boolean hasCurAvatarPath() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; + * @return this + */ + public GetMultiPathAvatarInfoScRsp clearCurAvatarPath() { + bitField0_ &= ~0x00000004; + curAvatarPath.clear(); + return this; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 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 #getMutableCurAvatarPath()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getCurAvatarPath() { + return curAvatarPath; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 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 RepeatedMessage getMutableCurAvatarPath() { + bitField0_ |= 0x00000004; + return curAvatarPath; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; + * @param value the curAvatarPath to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addCurAvatarPath(final CurAvatarPathEntry value) { + bitField0_ |= 0x00000004; + curAvatarPath.add(value); + return this; + } + + /** + * repeated .GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry cur_avatar_path = 4; + * @param values the curAvatarPath to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addAllCurAvatarPath(final CurAvatarPathEntry... values) { + bitField0_ |= 0x00000004; + curAvatarPath.addAll(values); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * @return whether the multiPathAvatarInfoList field is set + */ + public boolean hasMultiPathAvatarInfoList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * @return this + */ + public GetMultiPathAvatarInfoScRsp clearMultiPathAvatarInfoList() { + bitField0_ &= ~0x00000008; + multiPathAvatarInfoList.clear(); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_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. + * + * Use {@link #getMutableMultiPathAvatarInfoList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMultiPathAvatarInfoList( + ) { + return multiPathAvatarInfoList; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMultiPathAvatarInfoList( + ) { + bitField0_ |= 0x00000008; + return multiPathAvatarInfoList; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * @param value the multiPathAvatarInfoList to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addMultiPathAvatarInfoList( + final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo value) { + bitField0_ |= 0x00000008; + multiPathAvatarInfoList.add(value); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 13; + * @param values the multiPathAvatarInfoList to add + * @return this + */ + public GetMultiPathAvatarInfoScRsp addAllMultiPathAvatarInfoList( + final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo... values) { + bitField0_ |= 0x00000008; + multiPathAvatarInfoList.addAll(values); + return this; + } + + @Override + public GetMultiPathAvatarInfoScRsp copyFrom(final GetMultiPathAvatarInfoScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + basicTypeIdList.copyFrom(other.basicTypeIdList); + curAvatarPath.copyFrom(other.curAvatarPath); + multiPathAvatarInfoList.copyFrom(other.multiPathAvatarInfoList); + } + return this; + } + + @Override + public GetMultiPathAvatarInfoScRsp mergeFrom(final GetMultiPathAvatarInfoScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasBasicTypeIdList()) { + getMutableBasicTypeIdList().addAll(other.basicTypeIdList); + } + if (other.hasCurAvatarPath()) { + getMutableCurAvatarPath().addAll(other.curAvatarPath); + } + if (other.hasMultiPathAvatarInfoList()) { + getMutableMultiPathAvatarInfoList().addAll(other.multiPathAvatarInfoList); + } + return this; + } + + @Override + public GetMultiPathAvatarInfoScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + basicTypeIdList.clear(); + curAvatarPath.clear(); + multiPathAvatarInfoList.clear(); + return this; + } + + @Override + public GetMultiPathAvatarInfoScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + basicTypeIdList.clear(); + curAvatarPath.clearQuick(); + multiPathAvatarInfoList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof GetMultiPathAvatarInfoScRsp)) { + return false; + } + GetMultiPathAvatarInfoScRsp other = (GetMultiPathAvatarInfoScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasBasicTypeIdList() || basicTypeIdList.equals(other.basicTypeIdList)) + && (!hasCurAvatarPath() || curAvatarPath.equals(other.curAvatarPath)) + && (!hasMultiPathAvatarInfoList() || multiPathAvatarInfoList.equals(other.multiPathAvatarInfoList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + for (int i = 0; i < basicTypeIdList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(basicTypeIdList.array()[i]); + } + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < curAvatarPath.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(curAvatarPath.get(i)); + } + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < multiPathAvatarInfoList.length(); i++) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(multiPathAvatarInfoList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += (1 * basicTypeIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(basicTypeIdList); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * curAvatarPath.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(curAvatarPath); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * multiPathAvatarInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathAvatarInfoList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public GetMultiPathAvatarInfoScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // basicTypeIdList [packed=true] + input.readPackedUInt32(basicTypeIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // curAvatarPath + tag = input.readRepeatedMessage(curAvatarPath, tag); + bitField0_ |= 0x00000004; + if (tag != 106) { + break; + } + } + case 106: { + // multiPathAvatarInfoList + tag = input.readRepeatedMessage(multiPathAvatarInfoList, tag); + bitField0_ |= 0x00000008; + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 120: { + // basicTypeIdList [packed=false] + tag = input.readRepeatedUInt32(basicTypeIdList, tag); + bitField0_ |= 0x00000002; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRepeatedUInt32(FieldNames.basicTypeIdList, basicTypeIdList); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedMessage(FieldNames.curAvatarPath, curAvatarPath); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedMessage(FieldNames.multiPathAvatarInfoList, multiPathAvatarInfoList); + } + output.endObject(); + } + + @Override + public GetMultiPathAvatarInfoScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -332160255: + case 99090862: { + if (input.isAtField(FieldNames.basicTypeIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(basicTypeIdList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1836831614: + case 589876172: { + if (input.isAtField(FieldNames.curAvatarPath)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(curAvatarPath); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1198530685: + case -2042493827: { + if (input.isAtField(FieldNames.multiPathAvatarInfoList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(multiPathAvatarInfoList); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public GetMultiPathAvatarInfoScRsp clone() { + return new GetMultiPathAvatarInfoScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static GetMultiPathAvatarInfoScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new GetMultiPathAvatarInfoScRsp(), data).checkInitialized(); + } + + public static GetMultiPathAvatarInfoScRsp parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new GetMultiPathAvatarInfoScRsp(), input).checkInitialized(); + } + + public static GetMultiPathAvatarInfoScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new GetMultiPathAvatarInfoScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating GetMultiPathAvatarInfoScRsp messages + */ + public static MessageFactory getFactory() { + return GetMultiPathAvatarInfoScRspFactory.INSTANCE; + } + + /** + * Protobuf type {@code CurAvatarPathEntry} + */ + public static final class CurAvatarPathEntry extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 key = 1; + */ + private int key; + + /** + * optional .MultiPathAvatarType value = 2; + */ + private int value_; + + private CurAvatarPathEntry() { + } + + /** + * @return a new empty instance of {@code CurAvatarPathEntry} + */ + public static CurAvatarPathEntry newInstance() { + return new CurAvatarPathEntry(); + } + + /** + * optional uint32 key = 1; + * @return whether the key field is set + */ + public boolean hasKey() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 key = 1; + * @return this + */ + public CurAvatarPathEntry clearKey() { + bitField0_ &= ~0x00000001; + key = 0; + return this; + } + + /** + * optional uint32 key = 1; + * @return the key + */ + public int getKey() { + return key; + } + + /** + * optional uint32 key = 1; + * @param value the key to set + * @return this + */ + public CurAvatarPathEntry setKey(final int value) { + bitField0_ |= 0x00000001; + key = value; + return this; + } + + /** + * optional .MultiPathAvatarType value = 2; + * @return whether the value_ field is set + */ + public boolean hasValue() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .MultiPathAvatarType value = 2; + * @return this + */ + public CurAvatarPathEntry clearValue() { + bitField0_ &= ~0x00000002; + value_ = 0; + return this; + } + + /** + * optional .MultiPathAvatarType value = 2; + * @return the value_ + */ + public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getValue() { + return MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value_); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link CurAvatarPathEntry#getValue()}.getNumber(). + * + * @return numeric wire representation + */ + public int getValueValue() { + return value_; + } + + /** + * 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 MultiPathAvatarTypeOuterClass.MultiPathAvatarType}. Setting an invalid value + * can cause {@link CurAvatarPathEntry#getValue()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public CurAvatarPathEntry setValueValue(final int value) { + bitField0_ |= 0x00000002; + value_ = value; + return this; + } + + /** + * optional .MultiPathAvatarType value = 2; + * @param value the value_ to set + * @return this + */ + public CurAvatarPathEntry setValue( + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value) { + bitField0_ |= 0x00000002; + value_ = value.getNumber(); + return this; + } + + @Override + public CurAvatarPathEntry copyFrom(final CurAvatarPathEntry other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + key = other.key; + value_ = other.value_; + } + return this; + } + + @Override + public CurAvatarPathEntry mergeFrom(final CurAvatarPathEntry other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasKey()) { + setKey(other.key); + } + if (other.hasValue()) { + setValueValue(other.value_); + } + return this; + } + + @Override + public CurAvatarPathEntry clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + key = 0; + value_ = 0; + return this; + } + + @Override + public CurAvatarPathEntry 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 CurAvatarPathEntry)) { + return false; + } + CurAvatarPathEntry other = (CurAvatarPathEntry) o; + return bitField0_ == other.bitField0_ + && (!hasKey() || key == other.key) + && (!hasValue() || value_ == other.value_); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(key); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeEnumNoTag(value_); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(key); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(value_); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public CurAvatarPathEntry mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // key + key = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // value_ + final int value = input.readInt32(); + if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { + value_ = value; + bitField0_ |= 0x00000002; + } + 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.key, key); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeEnum(FieldNames.value_, value_, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + } + output.endObject(); + } + + @Override + public CurAvatarPathEntry mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 106079: { + if (input.isAtField(FieldNames.key)) { + if (!input.trySkipNullValue()) { + key = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 111972721: { + if (input.isAtField(FieldNames.value_)) { + if (!input.trySkipNullValue()) { + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value = input.readEnum(MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + if (value != null) { + value_ = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public CurAvatarPathEntry clone() { + return new CurAvatarPathEntry().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static CurAvatarPathEntry parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new CurAvatarPathEntry(), data).checkInitialized(); + } + + public static CurAvatarPathEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new CurAvatarPathEntry(), input).checkInitialized(); + } + + public static CurAvatarPathEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new CurAvatarPathEntry(), input).checkInitialized(); + } + + /** + * @return factory for creating CurAvatarPathEntry messages + */ + public static MessageFactory getFactory() { + return CurAvatarPathEntryFactory.INSTANCE; + } + + private enum CurAvatarPathEntryFactory implements MessageFactory { + INSTANCE; + + @Override + public CurAvatarPathEntry create() { + return CurAvatarPathEntry.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName key = FieldName.forField("key"); + + static final FieldName value_ = FieldName.forField("value"); + } + } + + private enum GetMultiPathAvatarInfoScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public GetMultiPathAvatarInfoScRsp create() { + return GetMultiPathAvatarInfoScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName basicTypeIdList = FieldName.forField("basicTypeIdList", "basic_type_id_list"); + + static final FieldName curAvatarPath = FieldName.forField("curAvatarPath", "cur_avatar_path"); + + static final FieldName multiPathAvatarInfoList = FieldName.forField("multiPathAvatarInfoList", "multi_path_avatar_info_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java index 5261f33..a76d216 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 14; + * optional uint32 npc_id = 15; */ private int npcId; @@ -34,7 +34,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 14; + * optional uint32 npc_id = 15; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 14; + * optional uint32 npc_id = 15; * @return this */ public GetNpcTakenRewardCsReq clearNpcId() { @@ -52,7 +52,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 14; + * optional uint32 npc_id = 15; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 14; + * optional uint32 npc_id = 15; * @param value the npcId to set * @return this */ @@ -129,7 +129,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java index 922ef77..f05442e 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetNpcTakenRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 2; */ private int npcId; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; */ private int retcode; @@ -39,7 +39,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 2; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 2; * @return this */ public GetNpcTakenRewardScRsp clearNpcId() { @@ -57,7 +57,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 2; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 2; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return this */ public GetNpcTakenRewardScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class GetNpcTakenRewardScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class GetNpcTakenRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 32) { break; } } - case 96: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java index 64fae07..be32df6 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java @@ -20,30 +20,30 @@ public final class GetPhoneDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_phone_theme = 1; - */ - private int curPhoneTheme; - - /** - * optional uint32 cur_chat_bubble = 7; - */ - private int curChatBubble; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated uint32 owned_phone_themes = 5; + * optional uint32 cur_phone_theme = 14; */ - private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); + private int curPhoneTheme; /** - * repeated uint32 owned_chat_bubbles = 14; + * optional uint32 cur_chat_bubble = 15; + */ + private int curChatBubble; + + /** + * repeated uint32 owned_chat_bubbles = 5; */ private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 owned_phone_themes = 13; + */ + private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); + private GetPhoneDataScRsp() { } @@ -55,99 +55,25 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 1; - * @return whether the curPhoneTheme field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasCurPhoneTheme() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_phone_theme = 1; - * @return this - */ - public GetPhoneDataScRsp clearCurPhoneTheme() { - bitField0_ &= ~0x00000001; - curPhoneTheme = 0; - return this; - } - - /** - * optional uint32 cur_phone_theme = 1; - * @return the curPhoneTheme - */ - public int getCurPhoneTheme() { - return curPhoneTheme; - } - - /** - * optional uint32 cur_phone_theme = 1; - * @param value the curPhoneTheme to set - * @return this - */ - public GetPhoneDataScRsp setCurPhoneTheme(final int value) { - bitField0_ |= 0x00000001; - curPhoneTheme = value; - return this; - } - - /** - * optional uint32 cur_chat_bubble = 7; - * @return whether the curChatBubble field is set - */ - public boolean hasCurChatBubble() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_chat_bubble = 7; - * @return this - */ - public GetPhoneDataScRsp clearCurChatBubble() { - bitField0_ &= ~0x00000002; - curChatBubble = 0; - return this; - } - - /** - * optional uint32 cur_chat_bubble = 7; - * @return the curChatBubble - */ - public int getCurChatBubble() { - return curChatBubble; - } - - /** - * optional uint32 cur_chat_bubble = 7; - * @param value the curChatBubble to set - * @return this - */ - public GetPhoneDataScRsp setCurChatBubble(final int value) { - bitField0_ |= 0x00000002; - curChatBubble = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 1; * @return this */ public GetPhoneDataScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -155,104 +81,110 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public GetPhoneDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated uint32 owned_phone_themes = 5; - * @return whether the ownedPhoneThemes field is set + * optional uint32 cur_phone_theme = 14; + * @return whether the curPhoneTheme field is set */ - public boolean hasOwnedPhoneThemes() { + public boolean hasCurPhoneTheme() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cur_phone_theme = 14; + * @return this + */ + public GetPhoneDataScRsp clearCurPhoneTheme() { + bitField0_ &= ~0x00000002; + curPhoneTheme = 0; + return this; + } + + /** + * optional uint32 cur_phone_theme = 14; + * @return the curPhoneTheme + */ + public int getCurPhoneTheme() { + return curPhoneTheme; + } + + /** + * optional uint32 cur_phone_theme = 14; + * @param value the curPhoneTheme to set + * @return this + */ + public GetPhoneDataScRsp setCurPhoneTheme(final int value) { + bitField0_ |= 0x00000002; + curPhoneTheme = value; + return this; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return whether the curChatBubble field is set + */ + public boolean hasCurChatBubble() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return this + */ + public GetPhoneDataScRsp clearCurChatBubble() { + bitField0_ &= ~0x00000004; + curChatBubble = 0; + return this; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return the curChatBubble + */ + public int getCurChatBubble() { + return curChatBubble; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @param value the curChatBubble to set + * @return this + */ + public GetPhoneDataScRsp setCurChatBubble(final int value) { + bitField0_ |= 0x00000004; + curChatBubble = value; + return this; + } + + /** + * repeated uint32 owned_chat_bubbles = 5; + * @return whether the ownedChatBubbles field is set + */ + public boolean hasOwnedChatBubbles() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 owned_phone_themes = 5; - * @return this - */ - public GetPhoneDataScRsp clearOwnedPhoneThemes() { - bitField0_ &= ~0x00000008; - ownedPhoneThemes.clear(); - return this; - } - - /** - * repeated uint32 owned_phone_themes = 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 #getMutableOwnedPhoneThemes()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getOwnedPhoneThemes() { - return ownedPhoneThemes; - } - - /** - * repeated uint32 owned_phone_themes = 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableOwnedPhoneThemes() { - bitField0_ |= 0x00000008; - return ownedPhoneThemes; - } - - /** - * repeated uint32 owned_phone_themes = 5; - * @param value the ownedPhoneThemes to add - * @return this - */ - public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) { - bitField0_ |= 0x00000008; - ownedPhoneThemes.add(value); - return this; - } - - /** - * repeated uint32 owned_phone_themes = 5; - * @param values the ownedPhoneThemes to add - * @return this - */ - public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) { - bitField0_ |= 0x00000008; - ownedPhoneThemes.addAll(values); - return this; - } - - /** - * repeated uint32 owned_chat_bubbles = 14; - * @return whether the ownedChatBubbles field is set - */ - public boolean hasOwnedChatBubbles() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 owned_chat_bubbles = 14; + * repeated uint32 owned_chat_bubbles = 5; * @return this */ public GetPhoneDataScRsp clearOwnedChatBubbles() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; ownedChatBubbles.clear(); return this; } /** - * repeated uint32 owned_chat_bubbles = 14; + * repeated uint32 owned_chat_bubbles = 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. @@ -266,7 +198,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * repeated uint32 owned_chat_bubbles = 14; + * repeated uint32 owned_chat_bubbles = 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 @@ -275,42 +207,110 @@ public final class GetPhoneDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableOwnedChatBubbles() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return ownedChatBubbles; } /** - * repeated uint32 owned_chat_bubbles = 14; + * repeated uint32 owned_chat_bubbles = 5; * @param value the ownedChatBubbles to add * @return this */ public GetPhoneDataScRsp addOwnedChatBubbles(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; ownedChatBubbles.add(value); return this; } /** - * repeated uint32 owned_chat_bubbles = 14; + * repeated uint32 owned_chat_bubbles = 5; * @param values the ownedChatBubbles to add * @return this */ public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; ownedChatBubbles.addAll(values); return this; } + /** + * repeated uint32 owned_phone_themes = 13; + * @return whether the ownedPhoneThemes field is set + */ + public boolean hasOwnedPhoneThemes() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 owned_phone_themes = 13; + * @return this + */ + public GetPhoneDataScRsp clearOwnedPhoneThemes() { + bitField0_ &= ~0x00000010; + ownedPhoneThemes.clear(); + return this; + } + + /** + * repeated uint32 owned_phone_themes = 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 #getMutableOwnedPhoneThemes()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getOwnedPhoneThemes() { + return ownedPhoneThemes; + } + + /** + * repeated uint32 owned_phone_themes = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableOwnedPhoneThemes() { + bitField0_ |= 0x00000010; + return ownedPhoneThemes; + } + + /** + * repeated uint32 owned_phone_themes = 13; + * @param value the ownedPhoneThemes to add + * @return this + */ + public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) { + bitField0_ |= 0x00000010; + ownedPhoneThemes.add(value); + return this; + } + + /** + * repeated uint32 owned_phone_themes = 13; + * @param values the ownedPhoneThemes to add + * @return this + */ + public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) { + bitField0_ |= 0x00000010; + ownedPhoneThemes.addAll(values); + return this; + } + @Override public GetPhoneDataScRsp copyFrom(final GetPhoneDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + retcode = other.retcode; curPhoneTheme = other.curPhoneTheme; curChatBubble = other.curChatBubble; - retcode = other.retcode; - ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); ownedChatBubbles.copyFrom(other.ownedChatBubbles); + ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); } return this; } @@ -321,21 +321,21 @@ public final class GetPhoneDataScRspOuterClass { return this; } cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasCurPhoneTheme()) { setCurPhoneTheme(other.curPhoneTheme); } if (other.hasCurChatBubble()) { setCurChatBubble(other.curChatBubble); } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasOwnedChatBubbles()) { + getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); } if (other.hasOwnedPhoneThemes()) { getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes); } - if (other.hasOwnedChatBubbles()) { - getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); - } return this; } @@ -346,11 +346,11 @@ public final class GetPhoneDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + retcode = 0; curPhoneTheme = 0; curChatBubble = 0; - retcode = 0; - ownedPhoneThemes.clear(); ownedChatBubbles.clear(); + ownedPhoneThemes.clear(); return this; } @@ -361,8 +361,8 @@ public final class GetPhoneDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - ownedPhoneThemes.clear(); ownedChatBubbles.clear(); + ownedPhoneThemes.clear(); return this; } @@ -376,37 +376,37 @@ public final class GetPhoneDataScRspOuterClass { } GetPhoneDataScRsp other = (GetPhoneDataScRsp) o; return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) - && (!hasRetcode() || retcode == other.retcode) - && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)) - && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)); + && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)) + && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curPhoneTheme); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(curChatBubble); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(curPhoneTheme); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curChatBubble); + } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < ownedPhoneThemes.length(); i++) { + for (int i = 0; i < ownedChatBubbles.length(); i++) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); + output.writeUInt32NoTag(ownedChatBubbles.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < ownedChatBubbles.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(ownedChatBubbles.array()[i]); + for (int i = 0; i < ownedPhoneThemes.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); } } } @@ -415,19 +415,19 @@ public final class GetPhoneDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); + } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); + size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); + size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); } return size; } @@ -440,26 +440,26 @@ public final class GetPhoneDataScRspOuterClass { while (true) { switch (tag) { case 8: { - // curPhoneTheme - curPhoneTheme = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // curChatBubble - curChatBubble = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // curPhoneTheme + curPhoneTheme = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // curChatBubble + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 42) { @@ -467,17 +467,17 @@ public final class GetPhoneDataScRspOuterClass { } } case 42: { - // ownedPhoneThemes [packed=true] - input.readPackedUInt32(ownedPhoneThemes, tag); + // ownedChatBubbles [packed=true] + input.readPackedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { - // ownedChatBubbles [packed=true] - input.readPackedUInt32(ownedChatBubbles, tag); + case 106: { + // ownedPhoneThemes [packed=true] + input.readPackedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -495,14 +495,14 @@ public final class GetPhoneDataScRspOuterClass { break; } case 40: { - // ownedPhoneThemes [packed=false] - tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); + // ownedChatBubbles [packed=false] + tag = input.readRepeatedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000008; break; } - case 112: { - // ownedChatBubbles [packed=false] - tag = input.readRepeatedUInt32(ownedChatBubbles, tag); + case 104: { + // ownedPhoneThemes [packed=false] + tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000010; break; } @@ -514,19 +514,19 @@ public final class GetPhoneDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.curChatBubble, curChatBubble); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); + output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); + output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); } output.endObject(); } @@ -538,12 +538,23 @@ public final class GetPhoneDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 405670747: case -514634695: { if (input.isAtField(FieldNames.curPhoneTheme)) { if (!input.trySkipNullValue()) { curPhoneTheme = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -555,17 +566,6 @@ public final class GetPhoneDataScRspOuterClass { if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { curChatBubble = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -573,23 +573,23 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case -512676109: - case -1128638699: { - if (input.isAtField(FieldNames.ownedPhoneThemes)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(ownedPhoneThemes); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -1579353334: case -1491735846: { if (input.isAtField(FieldNames.ownedChatBubbles)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(ownedChatBubbles); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -512676109: + case -1128638699: { + if (input.isAtField(FieldNames.ownedPhoneThemes)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(ownedPhoneThemes); bitField0_ |= 0x00000010; } } else { @@ -650,15 +650,15 @@ public final class GetPhoneDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); static final FieldName ownedPhoneThemes = FieldName.forField("ownedPhoneThemes", "owned_phone_themes"); - - static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java index d9e1c6d..2fd781c 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerBoardDataScRspOuterClass.java @@ -22,32 +22,32 @@ public final class GetPlayerBoardDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 current_head_icon_id = 5; + * optional uint32 current_head_icon_id = 8; */ private int currentHeadIconId; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 10; */ private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance(); /** - * optional string signature = 1; + * optional string signature = 12; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 4; */ private final RepeatedInt displaySupportAvatarVec = RepeatedInt.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_list = 1; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -62,7 +62,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 5; + * optional uint32 current_head_icon_id = 8; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -70,7 +70,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 5; + * optional uint32 current_head_icon_id = 8; * @return this */ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { @@ -80,7 +80,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 5; + * optional uint32 current_head_icon_id = 8; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -88,7 +88,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 5; + * optional uint32 current_head_icon_id = 8; * @param value the currentHeadIconId to set * @return this */ @@ -99,7 +99,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -107,7 +107,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 9; * @return this */ public GetPlayerBoardDataScRsp clearRetcode() { @@ -117,7 +117,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -125,7 +125,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -136,7 +136,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 10; * @return whether the displayAvatarVec field is set */ public boolean hasDisplayAvatarVec() { @@ -144,7 +144,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 10; * @return this */ public GetPlayerBoardDataScRsp clearDisplayAvatarVec() { @@ -154,7 +154,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 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. @@ -168,7 +168,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 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 @@ -182,7 +182,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional .DisplayAvatarVec display_avatar_vec = 15; + * optional .DisplayAvatarVec display_avatar_vec = 10; * @param value the displayAvatarVec to set * @return this */ @@ -194,7 +194,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @return whether the signature field is set */ public boolean hasSignature() { @@ -202,7 +202,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { @@ -212,7 +212,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @return the signature */ public String getSignature() { @@ -220,7 +220,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -228,7 +228,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -237,7 +237,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @param value the signature to set * @return this */ @@ -248,7 +248,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 1; + * optional string signature = 12; * @param value the signature to set * @return this */ @@ -259,7 +259,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 4; * @return whether the displaySupportAvatarVec field is set */ public boolean hasDisplaySupportAvatarVec() { @@ -267,7 +267,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 4; * @return this */ public GetPlayerBoardDataScRsp clearDisplaySupportAvatarVec() { @@ -277,7 +277,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 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. @@ -291,7 +291,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 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 @@ -305,7 +305,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 4; * @param value the displaySupportAvatarVec to add * @return this */ @@ -316,7 +316,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 13; + * repeated uint32 display_support_avatar_vec = 4; * @param values the displaySupportAvatarVec to add * @return this */ @@ -327,7 +327,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_list = 1; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -335,7 +335,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_list = 1; * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { @@ -345,7 +345,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_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. @@ -359,7 +359,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_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 @@ -373,7 +373,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_list = 1; * @param value the unlockedHeadIconList to add * @return this */ @@ -385,7 +385,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 11; + * repeated .HeadIcon unlocked_head_icon_list = 1; * @param values the unlockedHeadIconList to add * @return this */ @@ -489,30 +489,30 @@ public final class GetPlayerBoardDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 82); output.writeMessageNoTag(displayAvatarVec); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 98); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < displaySupportAvatarVec.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(displaySupportAvatarVec.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 10); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -549,52 +549,52 @@ public final class GetPlayerBoardDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 64: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // displayAvatarVec input.readMessage(displayAvatarVec); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // signature + input.readString(signature); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // displaySupportAvatarVec [packed=true] + input.readPackedUInt32(displaySupportAvatarVec, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 10) { break; } } case 10: { - // signature - input.readString(signature); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // displaySupportAvatarVec [packed=true] - input.readPackedUInt32(displaySupportAvatarVec, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000020; @@ -612,7 +612,7 @@ public final class GetPlayerBoardDataScRspOuterClass { tag = input.readTag(); break; } - case 104: { + case 32: { // displaySupportAvatarVec [packed=false] tag = input.readRepeatedUInt32(displaySupportAvatarVec, tag); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java index 13e425e..61bf1c3 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 15; + * optional uint32 uid = 13; */ private int uid; @@ -34,7 +34,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 13; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 13; * @return this */ public GetPlayerDetailInfoCsReq clearUid() { @@ -52,7 +52,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 13; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 13; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 104: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java index 4b03cc5..ddd8617 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetPlayerDetailInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 14; */ private final PlayerDetailInfoOuterClass.PlayerDetailInfo playerDetailInfo = PlayerDetailInfoOuterClass.PlayerDetailInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return this */ public GetPlayerDetailInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 14; * @return whether the playerDetailInfo field is set */ public boolean hasPlayerDetailInfo() { @@ -84,7 +84,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 14; * @return this */ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { @@ -94,7 +94,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 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. @@ -108,7 +108,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 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 @@ -122,7 +122,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 8; + * optional .PlayerDetailInfo player_detail_info = 14; * @param value the playerDetailInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetPlayerDetailInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 114); output.writeMessageNoTag(playerDetailInfo); } } @@ -227,16 +227,16 @@ public final class GetPlayerDetailInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 114) { break; } } - case 66: { + case 114: { // playerDetailInfo input.readMessage(playerDetailInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java index 9b5249c..c786c2d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class GetPrivateChatHistoryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 to_uid = 10; - */ - private int toUid; - - /** - * optional uint32 sender_uid = 13; + * optional uint32 sender_uid = 5; */ private int senderUid; + /** + * optional uint32 to_uid = 7; + */ + private int toUid; + private GetPrivateChatHistoryCsReq() { } @@ -39,62 +39,25 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 10; - * @return whether the toUid field is set + * optional uint32 sender_uid = 5; + * @return whether the senderUid field is set */ - public boolean hasToUid() { + public boolean hasSenderUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 to_uid = 10; - * @return this - */ - public GetPrivateChatHistoryCsReq clearToUid() { - bitField0_ &= ~0x00000001; - toUid = 0; - return this; - } - - /** - * optional uint32 to_uid = 10; - * @return the toUid - */ - public int getToUid() { - return toUid; - } - - /** - * optional uint32 to_uid = 10; - * @param value the toUid to set - * @return this - */ - public GetPrivateChatHistoryCsReq setToUid(final int value) { - bitField0_ |= 0x00000001; - toUid = value; - return this; - } - - /** - * optional uint32 sender_uid = 13; - * @return whether the senderUid field is set - */ - public boolean hasSenderUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 sender_uid = 13; + * optional uint32 sender_uid = 5; * @return this */ public GetPrivateChatHistoryCsReq clearSenderUid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; senderUid = 0; return this; } /** - * optional uint32 sender_uid = 13; + * optional uint32 sender_uid = 5; * @return the senderUid */ public int getSenderUid() { @@ -102,23 +65,60 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 13; + * optional uint32 sender_uid = 5; * @param value the senderUid to set * @return this */ public GetPrivateChatHistoryCsReq setSenderUid(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; senderUid = value; return this; } + /** + * optional uint32 to_uid = 7; + * @return whether the toUid field is set + */ + public boolean hasToUid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 to_uid = 7; + * @return this + */ + public GetPrivateChatHistoryCsReq clearToUid() { + bitField0_ &= ~0x00000002; + toUid = 0; + return this; + } + + /** + * optional uint32 to_uid = 7; + * @return the toUid + */ + public int getToUid() { + return toUid; + } + + /** + * optional uint32 to_uid = 7; + * @param value the toUid to set + * @return this + */ + public GetPrivateChatHistoryCsReq setToUid(final int value) { + bitField0_ |= 0x00000002; + toUid = value; + return this; + } + @Override public GetPrivateChatHistoryCsReq copyFrom(final GetPrivateChatHistoryCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - toUid = other.toUid; senderUid = other.senderUid; + toUid = other.toUid; } return this; } @@ -129,12 +129,12 @@ public final class GetPrivateChatHistoryCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasToUid()) { - setToUid(other.toUid); - } if (other.hasSenderUid()) { setSenderUid(other.senderUid); } + if (other.hasToUid()) { + setToUid(other.toUid); + } return this; } @@ -145,8 +145,8 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - toUid = 0; senderUid = 0; + toUid = 0; return this; } @@ -170,19 +170,19 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } GetPrivateChatHistoryCsReq other = (GetPrivateChatHistoryCsReq) o; return bitField0_ == other.bitField0_ - && (!hasToUid() || toUid == other.toUid) - && (!hasSenderUid() || senderUid == other.senderUid); + && (!hasSenderUid() || senderUid == other.senderUid) + && (!hasToUid() || toUid == other.toUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(toUid); } } @@ -190,10 +190,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } return size; } @@ -205,18 +205,18 @@ public final class GetPrivateChatHistoryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // toUid - toUid = input.readUInt32(); + case 40: { + // senderUid + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 56) { break; } } - case 104: { - // senderUid - senderUid = input.readUInt32(); + case 56: { + // toUid + toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class GetPrivateChatHistoryCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } output.endObject(); } @@ -256,11 +256,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { + case 32180699: + case 997911366: { + if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); + senderUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } break; } - case 32180699: - case 997911366: { - if (input.isAtField(FieldNames.senderUid)) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { if (!input.trySkipNullValue()) { - senderUid = input.readUInt32(); + toUid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class GetPrivateChatHistoryCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java index d24a6a3..28729bb 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java @@ -20,22 +20,22 @@ public final class GetPrivateChatHistoryScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; - */ - private int retcode; - - /** - * optional uint32 sender_uid = 7; - */ - private int senderUid; - - /** - * optional uint32 to_uid = 9; + * optional uint32 to_uid = 2; */ private int toUid; /** - * repeated .Chat chat_list = 10; + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional uint32 sender_uid = 11; + */ + private int senderUid; + + /** + * repeated .Chat chat_list = 8; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,99 +50,25 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 6; - * @return whether the retcode field is set + * optional uint32 to_uid = 2; + * @return whether the toUid field is set */ - public boolean hasRetcode() { + public boolean hasToUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 6; - * @return this - */ - public GetPrivateChatHistoryScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 6; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 6; - * @param value the retcode to set - * @return this - */ - public GetPrivateChatHistoryScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 sender_uid = 7; - * @return whether the senderUid field is set - */ - public boolean hasSenderUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 sender_uid = 7; - * @return this - */ - public GetPrivateChatHistoryScRsp clearSenderUid() { - bitField0_ &= ~0x00000002; - senderUid = 0; - return this; - } - - /** - * optional uint32 sender_uid = 7; - * @return the senderUid - */ - public int getSenderUid() { - return senderUid; - } - - /** - * optional uint32 sender_uid = 7; - * @param value the senderUid to set - * @return this - */ - public GetPrivateChatHistoryScRsp setSenderUid(final int value) { - bitField0_ |= 0x00000002; - senderUid = value; - return this; - } - - /** - * optional uint32 to_uid = 9; - * @return whether the toUid field is set - */ - public boolean hasToUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 to_uid = 9; + * optional uint32 to_uid = 2; * @return this */ public GetPrivateChatHistoryScRsp clearToUid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; toUid = 0; return this; } /** - * optional uint32 to_uid = 9; + * optional uint32 to_uid = 2; * @return the toUid */ public int getToUid() { @@ -150,18 +76,92 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 to_uid = 9; + * optional uint32 to_uid = 2; * @param value the toUid to set * @return this */ public GetPrivateChatHistoryScRsp setToUid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; toUid = value; return this; } /** - * repeated .Chat chat_list = 10; + * optional uint32 retcode = 5; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 5; + * @return this + */ + public GetPrivateChatHistoryScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 5; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 5; + * @param value the retcode to set + * @return this + */ + public GetPrivateChatHistoryScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 sender_uid = 11; + * @return whether the senderUid field is set + */ + public boolean hasSenderUid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 sender_uid = 11; + * @return this + */ + public GetPrivateChatHistoryScRsp clearSenderUid() { + bitField0_ &= ~0x00000004; + senderUid = 0; + return this; + } + + /** + * optional uint32 sender_uid = 11; + * @return the senderUid + */ + public int getSenderUid() { + return senderUid; + } + + /** + * optional uint32 sender_uid = 11; + * @param value the senderUid to set + * @return this + */ + public GetPrivateChatHistoryScRsp setSenderUid(final int value) { + bitField0_ |= 0x00000004; + senderUid = value; + return this; + } + + /** + * repeated .Chat chat_list = 8; * @return whether the chatList field is set */ public boolean hasChatList() { @@ -169,7 +169,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 10; + * repeated .Chat chat_list = 8; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 10; + * repeated .Chat chat_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. @@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 10; + * repeated .Chat chat_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 @@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 10; + * repeated .Chat chat_list = 8; * @param value the chatList to add * @return this */ @@ -218,7 +218,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 10; + * repeated .Chat chat_list = 8; * @param values the chatList to add * @return this */ @@ -233,9 +233,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + toUid = other.toUid; retcode = other.retcode; senderUid = other.senderUid; - toUid = other.toUid; chatList.copyFrom(other.chatList); } return this; @@ -247,15 +247,15 @@ public final class GetPrivateChatHistoryScRspOuterClass { return this; } cachedSize = -1; + if (other.hasToUid()) { + setToUid(other.toUid); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasSenderUid()) { setSenderUid(other.senderUid); } - if (other.hasToUid()) { - setToUid(other.toUid); - } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); } @@ -269,9 +269,9 @@ public final class GetPrivateChatHistoryScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + toUid = 0; retcode = 0; senderUid = 0; - toUid = 0; chatList.clear(); return this; } @@ -297,29 +297,29 @@ public final class GetPrivateChatHistoryScRspOuterClass { } GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ + && (!hasToUid() || toUid == other.toUid) && (!hasRetcode() || retcode == other.retcode) && (!hasSenderUid() || senderUid == other.senderUid) - && (!hasToUid() || toUid == other.toUid) && (!hasChatList() || chatList.equals(other.chatList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(senderUid); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(toUid); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 66); output.writeMessageNoTag(chatList.get(i)); } } @@ -329,13 +329,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -350,34 +350,34 @@ public final class GetPrivateChatHistoryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // senderUid - senderUid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 16: { // toUid toUid = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 40) { break; } } - case 82: { + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // senderUid + senderUid = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // chatList tag = input.readRepeatedMessage(chatList, tag); bitField0_ |= 0x00000008; @@ -403,13 +403,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -424,11 +424,23 @@ public final class GetPrivateChatHistoryScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 110520277: + case -868529012: { + if (input.isAtField(FieldNames.toUid)) { + if (!input.trySkipNullValue()) { + toUid = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -440,18 +452,6 @@ public final class GetPrivateChatHistoryScRspOuterClass { if (input.isAtField(FieldNames.senderUid)) { if (!input.trySkipNullValue()) { senderUid = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 110520277: - case -868529012: { - if (input.isAtField(FieldNames.toUid)) { - if (!input.trySkipNullValue()) { - toUid = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -524,12 +524,12 @@ public final class GetPrivateChatHistoryScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName toUid = FieldName.forField("toUid", "to_uid"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); - static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName chatList = FieldName.forField("chatList", "chat_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java index b7795c8..55a647f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetQuestDataScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetQuestDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional uint32 total_achievement_exp = 10; + * optional uint32 total_achievement_exp = 15; */ private int totalAchievementExp; /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 10; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,7 +45,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return this */ public GetQuestDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 10; + * optional uint32 total_achievement_exp = 15; * @return whether the totalAchievementExp field is set */ public boolean hasTotalAchievementExp() { @@ -90,7 +90,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 10; + * optional uint32 total_achievement_exp = 15; * @return this */ public GetQuestDataScRsp clearTotalAchievementExp() { @@ -100,7 +100,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 10; + * optional uint32 total_achievement_exp = 15; * @return the totalAchievementExp */ public int getTotalAchievementExp() { @@ -108,7 +108,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 10; + * optional uint32 total_achievement_exp = 15; * @param value the totalAchievementExp to set * @return this */ @@ -119,7 +119,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 10; * @return whether the questList field is set */ public boolean hasQuestList() { @@ -127,7 +127,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 10; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 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. @@ -151,7 +151,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 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 @@ -165,7 +165,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 10; * @param value the questList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 2; + * repeated .Quest quest_list = 10; * @param values the questList to add * @return this */ @@ -258,16 +258,16 @@ public final class GetQuestDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(questList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetQuestDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // totalAchievementExp totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java index 07372f5..39de9e7 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_info = 13; */ private final RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo shopInfo = RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_info = 13; * @return whether the shopInfo field is set */ public boolean hasShopInfo() { @@ -84,7 +84,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_info = 13; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearShopInfo() { @@ -94,7 +94,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_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. @@ -108,7 +108,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_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 @@ -122,7 +122,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 1; + * optional .RogueBuffEnhanceShopInfo shop_info = 13; * @param value the shopInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 106); output.writeMessageNoTag(shopInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 106) { break; } } - case 10: { + case 106: { // shopInfo input.readMessage(shopInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java index cb2242f..604439a 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueHandbookDataScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueHandbookDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_info = 10; */ private final RogueHandbookDataOuterClass.RogueHandbookData handbookInfo = RogueHandbookDataOuterClass.RogueHandbookData.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return this */ public GetRogueHandbookDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_info = 10; * @return whether the handbookInfo field is set */ public boolean hasHandbookInfo() { @@ -84,7 +84,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_info = 10; * @return this */ public GetRogueHandbookDataScRsp clearHandbookInfo() { @@ -94,7 +94,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_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. @@ -108,7 +108,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_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 @@ -122,7 +122,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 15; + * optional .RogueHandbookData handbook_info = 10; * @param value the handbookInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueHandbookDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 82); output.writeMessageNoTag(handbookInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueHandbookDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // handbookInfo input.readMessage(handbookInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java index a86e773..90d2663 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_info = 15; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; * @return this */ public GetRogueInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_info = 15; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -84,7 +84,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_info = 15; * @return this */ public GetRogueInfoScRsp clearRogueInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_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. @@ -108,7 +108,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_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 @@ -122,7 +122,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 8; + * optional .RogueInfo rogue_info = 15; * @param value the rogueInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class GetRogueInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 122); output.writeMessageNoTag(rogueInfo); } } @@ -226,16 +226,16 @@ public final class GetRogueInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 122) { break; } } - case 66: { + case 122: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java index 0258a1e..f471b56 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueInitialScoreScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueInitialScoreScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return this */ public GetRogueInitialScoreScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * @return whether the rogueScoreInfo field is set */ public boolean hasRogueScoreInfo() { @@ -84,7 +84,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * @return this */ public GetRogueInitialScoreScRsp clearRogueScoreInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * * 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. @@ -108,7 +108,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * * 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,7 +122,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 4; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * @param value the rogueScoreInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueInitialScoreScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueScoreInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueInitialScoreScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { + case 74: { // rogueScoreInfo input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java index 24b0bea..ad5e631 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueScoreRewardInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 4; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return this */ public GetRogueScoreRewardInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 4; * @return whether the scoreRewardInfo field is set */ public boolean hasScoreRewardInfo() { @@ -84,7 +84,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 4; * @return this */ public GetRogueScoreRewardInfoScRsp clearScoreRewardInfo() { @@ -94,7 +94,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 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. @@ -108,7 +108,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 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 @@ -122,7 +122,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 1; + * optional .RogueScoreRewardInfo score_reward_info = 4; * @param value the scoreRewardInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 34); output.writeMessageNoTag(scoreRewardInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 34) { break; } } - case 10: { + case 34: { // scoreRewardInfo input.readMessage(scoreRewardInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java index f59c621..1e34909 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRogueTalentInfoScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GetRogueTalentInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 1; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return this */ public GetRogueTalentInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 1; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 1; * @return this */ public GetRogueTalentInfoScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 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. @@ -108,7 +108,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 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 @@ -122,7 +122,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 6; + * optional .RogueTalentInfo talent_info = 1; * @param value the talentInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class GetRogueTalentInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueTalentInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 10) { break; } } - case 50: { + case 10: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index 0937d27..b838f9f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,12 +20,7 @@ public final class GetSceneMapInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 9; - */ - private int entryId; - - /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_id_list = 15; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -40,62 +35,25 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 9; - * @return whether the entryId field is set + * repeated uint32 entry_id_list = 15; + * @return whether the entryIdList field is set */ - public boolean hasEntryId() { + public boolean hasEntryIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entry_id = 9; - * @return this - */ - public GetSceneMapInfoCsReq clearEntryId() { - bitField0_ &= ~0x00000001; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 9; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 9; - * @param value the entryId to set - * @return this - */ - public GetSceneMapInfoCsReq setEntryId(final int value) { - bitField0_ |= 0x00000001; - entryId = value; - return this; - } - - /** - * repeated uint32 entry_id_list = 2; - * @return whether the entryIdList field is set - */ - public boolean hasEntryIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_id_list = 15; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entryIdList.clear(); return this; } /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_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. @@ -109,7 +67,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_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 @@ -118,28 +76,28 @@ public final class GetSceneMapInfoCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableEntryIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return entryIdList; } /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_id_list = 15; * @param value the entryIdList to add * @return this */ public GetSceneMapInfoCsReq addEntryIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entryIdList.add(value); return this; } /** - * repeated uint32 entry_id_list = 2; + * repeated uint32 entry_id_list = 15; * @param values the entryIdList to add * @return this */ public GetSceneMapInfoCsReq addAllEntryIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entryIdList.addAll(values); return this; } @@ -149,7 +107,6 @@ public final class GetSceneMapInfoCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entryId = other.entryId; entryIdList.copyFrom(other.entryIdList); } return this; @@ -161,9 +118,6 @@ public final class GetSceneMapInfoCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasEntryIdList()) { getMutableEntryIdList().addAll(other.entryIdList); } @@ -177,7 +131,6 @@ public final class GetSceneMapInfoCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - entryId = 0; entryIdList.clear(); return this; } @@ -203,19 +156,14 @@ public final class GetSceneMapInfoCsReqOuterClass { } GetSceneMapInfoCsReq other = (GetSceneMapInfoCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEntryId() || entryId == other.entryId) && (!hasEntryIdList() || entryIdList.equals(other.entryIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -225,9 +173,6 @@ public final class GetSceneMapInfoCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * entryIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(entryIdList); } return size; @@ -240,19 +185,10 @@ public final class GetSceneMapInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { + case 122: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -268,10 +204,10 @@ public final class GetSceneMapInfoCsReqOuterClass { tag = input.readTag(); break; } - case 16: { + case 120: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; break; } } @@ -282,9 +218,6 @@ public final class GetSceneMapInfoCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.entryIdList, entryIdList); } output.endObject(); @@ -297,24 +230,12 @@ public final class GetSceneMapInfoCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { - if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1441102997: case -1413189003: { if (input.isAtField(FieldNames.entryIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(entryIdList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -374,8 +295,6 @@ public final class GetSceneMapInfoCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName entryIdList = FieldName.forField("entryIdList", "entry_id_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index cc6ed9f..3413290 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -10,7 +10,6 @@ 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 GetSceneMapInfoScRspOuterClass { @@ -21,50 +20,15 @@ public final class GetSceneMapInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_map_entry_id = 8; - */ - private int curMapEntryId; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 entry_id = 11; - */ - private int entryId; - - /** - * repeated uint32 lighten_section_list = 1; - */ - private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 unlocked_teleport_list = 15; - */ - private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); - - /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_list = 1; */ private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); - /** - * repeated .MazeChest unlocked_chest_list = 5; - */ - private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); - - /** - * repeated .MazeProp maze_prop_list = 7; - */ - private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); - - /** - * repeated .MazeGroup maze_group_list = 14; - */ - private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); - private GetSceneMapInfoScRsp() { } @@ -76,62 +40,25 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 cur_map_entry_id = 8; - * @return whether the curMapEntryId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasCurMapEntryId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_map_entry_id = 8; - * @return this - */ - public GetSceneMapInfoScRsp clearCurMapEntryId() { - bitField0_ &= ~0x00000001; - curMapEntryId = 0; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 8; - * @return the curMapEntryId - */ - public int getCurMapEntryId() { - return curMapEntryId; - } - - /** - * optional uint32 cur_map_entry_id = 8; - * @param value the curMapEntryId to set - * @return this - */ - public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { - bitField0_ |= 0x00000001; - curMapEntryId = value; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return this */ public GetSceneMapInfoScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -139,209 +66,36 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ public GetSceneMapInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 entry_id = 11; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 11; - * @return this - */ - public GetSceneMapInfoScRsp clearEntryId() { - bitField0_ &= ~0x00000004; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 11; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 11; - * @param value the entryId to set - * @return this - */ - public GetSceneMapInfoScRsp setEntryId(final int value) { - bitField0_ |= 0x00000004; - entryId = value; - return this; - } - - /** - * repeated uint32 lighten_section_list = 1; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 lighten_section_list = 1; - * @return this - */ - public GetSceneMapInfoScRsp clearLightenSectionList() { - bitField0_ &= ~0x00000008; - lightenSectionList.clear(); - return this; - } - - /** - * repeated uint32 lighten_section_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 #getMutableLightenSectionList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getLightenSectionList() { - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_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 RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000008; - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_list = 1; - * @param value the lightenSectionList to add - * @return this - */ - public GetSceneMapInfoScRsp addLightenSectionList(final int value) { - bitField0_ |= 0x00000008; - lightenSectionList.add(value); - return this; - } - - /** - * repeated uint32 lighten_section_list = 1; - * @param values the lightenSectionList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000008; - lightenSectionList.addAll(values); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 15; - * @return whether the unlockedTeleportList field is set - */ - public boolean hasUnlockedTeleportList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 unlocked_teleport_list = 15; - * @return this - */ - public GetSceneMapInfoScRsp clearUnlockedTeleportList() { - bitField0_ &= ~0x00000010; - unlockedTeleportList.clear(); - return this; - } - - /** - * repeated uint32 unlocked_teleport_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 #getMutableUnlockedTeleportList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnlockedTeleportList() { - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_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 getMutableUnlockedTeleportList() { - bitField0_ |= 0x00000010; - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 15; - * @param value the unlockedTeleportList to add - * @return this - */ - public GetSceneMapInfoScRsp addUnlockedTeleportList(final int value) { - bitField0_ |= 0x00000010; - unlockedTeleportList.add(value); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 15; - * @param values the unlockedTeleportList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllUnlockedTeleportList(final int... values) { - bitField0_ |= 0x00000010; - unlockedTeleportList.addAll(values); - return this; - } - - /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_list = 1; * @return whether the mapList field is set */ public boolean hasMapList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_list = 1; * @return this */ public GetSceneMapInfoScRsp clearMapList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000002; mapList.clear(); return this; } /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_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. @@ -355,7 +109,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_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 @@ -364,251 +118,39 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMapList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; return mapList; } /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_list = 1; * @param value the mapList to add * @return this */ public GetSceneMapInfoScRsp addMapList(final MazeMapDataOuterClass.MazeMapData value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; mapList.add(value); return this; } /** - * repeated .MazeMapData map_list = 4; + * repeated .MazeMapData map_list = 1; * @param values the mapList to add * @return this */ public GetSceneMapInfoScRsp addAllMapList(final MazeMapDataOuterClass.MazeMapData... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; mapList.addAll(values); return this; } - /** - * repeated .MazeChest unlocked_chest_list = 5; - * @return whether the unlockedChestList field is set - */ - public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeChest unlocked_chest_list = 5; - * @return this - */ - public GetSceneMapInfoScRsp clearUnlockedChestList() { - bitField0_ &= ~0x00000040; - unlockedChestList.clear(); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 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 #getMutableUnlockedChestList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000040; - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 5; - * @param value the unlockedChestList to add - * @return this - */ - public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000040; - unlockedChestList.add(value); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 5; - * @param values the unlockedChestList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllUnlockedChestList( - final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000040; - unlockedChestList.addAll(values); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @return whether the mazePropList field is set - */ - public boolean hasMazePropList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @return this - */ - public GetSceneMapInfoScRsp clearMazePropList() { - bitField0_ &= ~0x00000080; - mazePropList.clear(); - return this; - } - - /** - * repeated .MazeProp maze_prop_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 #getMutableMazePropList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazePropList() { - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_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 getMutableMazePropList() { - bitField0_ |= 0x00000080; - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @param value the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000080; - mazePropList.add(value); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 7; - * @param values the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000080; - mazePropList.addAll(values); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 14; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 14; - * @return this - */ - public GetSceneMapInfoScRsp clearMazeGroupList() { - bitField0_ &= ~0x00000100; - mazeGroupList.clear(); - return this; - } - - /** - * repeated .MazeGroup maze_group_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. - * - * Use {@link #getMutableMazeGroupList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableMazeGroupList() { - bitField0_ |= 0x00000100; - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 14; - * @param value the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000100; - mazeGroupList.add(value); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 14; - * @param values the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000100; - mazeGroupList.addAll(values); - return this; - } - @Override public GetSceneMapInfoScRsp copyFrom(final GetSceneMapInfoScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curMapEntryId = other.curMapEntryId; retcode = other.retcode; - entryId = other.entryId; - lightenSectionList.copyFrom(other.lightenSectionList); - unlockedTeleportList.copyFrom(other.unlockedTeleportList); mapList.copyFrom(other.mapList); - unlockedChestList.copyFrom(other.unlockedChestList); - mazePropList.copyFrom(other.mazePropList); - mazeGroupList.copyFrom(other.mazeGroupList); } return this; } @@ -619,33 +161,12 @@ public final class GetSceneMapInfoScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCurMapEntryId()) { - setCurMapEntryId(other.curMapEntryId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } - if (other.hasLightenSectionList()) { - getMutableLightenSectionList().addAll(other.lightenSectionList); - } - if (other.hasUnlockedTeleportList()) { - getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); - } if (other.hasMapList()) { getMutableMapList().addAll(other.mapList); } - if (other.hasUnlockedChestList()) { - getMutableUnlockedChestList().addAll(other.unlockedChestList); - } - if (other.hasMazePropList()) { - getMutableMazePropList().addAll(other.mazePropList); - } - if (other.hasMazeGroupList()) { - getMutableMazeGroupList().addAll(other.mazeGroupList); - } return this; } @@ -656,15 +177,8 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - curMapEntryId = 0; retcode = 0; - entryId = 0; - lightenSectionList.clear(); - unlockedTeleportList.clear(); mapList.clear(); - unlockedChestList.clear(); - mazePropList.clear(); - mazeGroupList.clear(); return this; } @@ -675,12 +189,7 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lightenSectionList.clear(); - unlockedTeleportList.clear(); mapList.clearQuick(); - unlockedChestList.clearQuick(); - mazePropList.clearQuick(); - mazeGroupList.clearQuick(); return this; } @@ -694,99 +203,33 @@ public final class GetSceneMapInfoScRspOuterClass { } GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasRetcode() || retcode == other.retcode) - && (!hasEntryId() || entryId == other.entryId) - && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) - && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) - && (!hasMapList() || mapList.equals(other.mapList)) - && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); + && (!hasMapList() || mapList.equals(other.mapList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(lightenSectionList.array()[i]); - } - } - if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(unlockedTeleportList.array()[i]); - } - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mapList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 10); output.writeMessageNoTag(mapList.get(i)); } } - if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(unlockedChestList.get(i)); - } - } - if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(mazePropList.get(i)); - } - } - if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(mazeGroupList.get(i)); - } - } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); - } - if ((bitField0_ & 0x00000010) != 0) { - size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); } - if ((bitField0_ & 0x00000040) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); - } - if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); - } - if ((bitField0_ & 0x00000100) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); - } return size; } @@ -797,79 +240,19 @@ public final class GetSceneMapInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // curMapEntryId - curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 56: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 10) { break; } } case 10: { - // lightenSectionList [packed=true] - input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { // mapList tag = input.readRepeatedMessage(mapList, tag); - bitField0_ |= 0x00000020; - if (tag != 42) { - break; - } - } - case 42: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000040; - if (tag != 58) { - break; - } - } - case 58: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); - bitField0_ |= 0x00000080; - if (tag != 114) { - break; - } - } - case 114: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -884,18 +267,6 @@ public final class GetSceneMapInfoScRspOuterClass { tag = input.readTag(); break; } - case 8: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000008; - break; - } - case 120: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000010; - break; - } } } } @@ -904,32 +275,11 @@ public final class GetSceneMapInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); - } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.mapList, mapList); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); - } output.endObject(); } @@ -940,59 +290,11 @@ public final class GetSceneMapInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { - if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { - if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1942343836: - case 1328850360: { - if (input.isAtField(FieldNames.lightenSectionList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lightenSectionList); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 856936684: - case -10753834: { - if (input.isAtField(FieldNames.unlockedTeleportList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unlockedTeleportList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1004,43 +306,7 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.mapList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mapList); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case -337762404: - case 231688696: { - if (input.isAtField(FieldNames.unlockedChestList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(unlockedChestList); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1676123008: - case 1875839866: { - if (input.isAtField(FieldNames.mazePropList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazePropList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case -317054274: - case 407435998: { - if (input.isAtField(FieldNames.mazeGroupList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazeGroupList); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1100,23 +366,9 @@ public final class GetSceneMapInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - - static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); - - static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); - static final FieldName mapList = FieldName.forField("mapList", "map_list"); - - static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); - - static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); - - static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java index 963630a..2fe81c7 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GetShopListCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 shop_type = 2; + * optional uint32 shop_type = 8; */ private int shopType; @@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 2; + * optional uint32 shop_type = 8; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 2; + * optional uint32 shop_type = 8; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 2; + * optional uint32 shop_type = 8; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 2; + * optional uint32 shop_type = 8; * @param value the shopType to set * @return this */ @@ -129,7 +129,7 @@ public final class GetShopListCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // shopType shopType = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java index 0aa2e39..75eddbf 100644 --- a/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetShopListScRspOuterClass.java @@ -20,17 +20,17 @@ public final class GetShopListScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 shop_type = 6; - */ - private int shopType; - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; */ private int retcode; /** - * repeated .Shop shop_list = 7; + * optional uint32 shop_type = 11; + */ + private int shopType; + + /** + * repeated .Shop shop_list = 9; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,62 +45,25 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 6; - * @return whether the shopType field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasShopType() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 shop_type = 6; - * @return this - */ - public GetShopListScRsp clearShopType() { - bitField0_ &= ~0x00000001; - shopType = 0; - return this; - } - - /** - * optional uint32 shop_type = 6; - * @return the shopType - */ - public int getShopType() { - return shopType; - } - - /** - * optional uint32 shop_type = 6; - * @param value the shopType to set - * @return this - */ - public GetShopListScRsp setShopType(final int value) { - bitField0_ |= 0x00000001; - shopType = value; - return this; - } - - /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return this */ public GetShopListScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ public GetShopListScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated .Shop shop_list = 7; + * optional uint32 shop_type = 11; + * @return whether the shopType field is set + */ + public boolean hasShopType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 shop_type = 11; + * @return this + */ + public GetShopListScRsp clearShopType() { + bitField0_ &= ~0x00000002; + shopType = 0; + return this; + } + + /** + * optional uint32 shop_type = 11; + * @return the shopType + */ + public int getShopType() { + return shopType; + } + + /** + * optional uint32 shop_type = 11; + * @param value the shopType to set + * @return this + */ + public GetShopListScRsp setShopType(final int value) { + bitField0_ |= 0x00000002; + shopType = value; + return this; + } + + /** + * repeated .Shop shop_list = 9; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 7; + * repeated .Shop shop_list = 9; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 7; + * repeated .Shop shop_list = 9; * * 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. @@ -151,7 +151,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 7; + * repeated .Shop shop_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -165,7 +165,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 7; + * repeated .Shop shop_list = 9; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 7; + * repeated .Shop shop_list = 9; * @param values the shopList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetShopListScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - shopType = other.shopType; retcode = other.retcode; + shopType = other.shopType; shopList.copyFrom(other.shopList); } return this; @@ -204,12 +204,12 @@ public final class GetShopListScRspOuterClass { return this; } cachedSize = -1; - if (other.hasShopType()) { - setShopType(other.shopType); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasShopType()) { + setShopType(other.shopType); + } if (other.hasShopList()) { getMutableShopList().addAll(other.shopList); } @@ -223,8 +223,8 @@ public final class GetShopListScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - shopType = 0; retcode = 0; + shopType = 0; shopList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetShopListScRspOuterClass { } GetShopListScRsp other = (GetShopListScRsp) o; return bitField0_ == other.bitField0_ - && (!hasShopType() || shopType == other.shopType) && (!hasRetcode() || retcode == other.retcode) + && (!hasShopType() || shopType == other.shopType) && (!hasShopList() || shopList.equals(other.shopList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(shopType); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 74); output.writeMessageNoTag(shopList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetShopListScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * shopList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(shopList); @@ -295,25 +295,25 @@ public final class GetShopListScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // shopType - shopType = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 32: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 88) { break; } } - case 58: { + case 88: { + // shopType + shopType = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // shopList tag = input.readRepeatedMessage(shopList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetShopListScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.shopType, shopType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.shopType, shopType); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.shopList, shopList); @@ -357,11 +357,10 @@ public final class GetShopListScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -345279664: - case -2103716125: { - if (input.isAtField(FieldNames.shopType)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - shopType = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -369,10 +368,11 @@ public final class GetShopListScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -345279664: + case -2103716125: { + if (input.isAtField(FieldNames.shopType)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + shopType = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetShopListScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName shopType = FieldName.forField("shopType", "shop_type"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName shopType = FieldName.forField("shopType", "shop_type"); + static final FieldName shopList = FieldName.forField("shopList", "shop_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java index 20ffeb9..8b7cf69 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class GetUnlockTeleportCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 5; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 5; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 5; * @return this */ public GetUnlockTeleportCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 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. @@ -67,7 +67,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 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 @@ -81,7 +81,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 5; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 4; + * repeated uint32 entry_id_list = 5; * @param values the entryIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class GetUnlockTeleportCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetUnlockTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 42: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetUnlockTeleportCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 40: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java index 45f5e9d..c211a6b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java @@ -25,7 +25,7 @@ public final class GetUnlockTeleportScRspOuterClass { private int retcode; /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -77,7 +77,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -85,7 +85,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * @return this */ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { @@ -95,7 +95,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * * 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. @@ -109,7 +109,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * @param value the unlockedTeleportList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 1; + * repeated uint32 unlocked_teleport_list = 9; * @param values the unlockedTeleportList to add * @return this */ @@ -215,7 +215,7 @@ public final class GetUnlockTeleportScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -245,11 +245,11 @@ public final class GetUnlockTeleportScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetUnlockTeleportScRspOuterClass { tag = input.readTag(); break; } - case 8: { + case 72: { // unlockedTeleportList [packed=false] tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java index 8a581ec..936dc38 100644 --- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java @@ -19,30 +19,30 @@ public final class GoodsOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 11; */ private long beginTime; /** - * optional int64 end_time = 15; + * optional int64 end_time = 14; */ private long endTime; /** - * optional uint32 goods_id = 10; + * optional uint32 buy_times = 6; + */ + private int buyTimes; + + /** + * optional uint32 goods_id = 8; */ private int goodsId; /** - * optional uint32 item_id = 11; + * optional uint32 item_id = 9; */ private int itemId; - /** - * optional uint32 buy_times = 13; - */ - private int buyTimes; - private Goods() { } @@ -54,7 +54,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 11; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -62,7 +62,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 11; * @return this */ public Goods clearBeginTime() { @@ -72,7 +72,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 11; * @return the beginTime */ public long getBeginTime() { @@ -80,7 +80,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 14; + * optional int64 begin_time = 11; * @param value the beginTime to set * @return this */ @@ -91,7 +91,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 14; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -99,7 +99,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 14; * @return this */ public Goods clearEndTime() { @@ -109,7 +109,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 14; * @return the endTime */ public long getEndTime() { @@ -117,7 +117,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 14; * @param value the endTime to set * @return this */ @@ -128,99 +128,25 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 10; - * @return whether the goodsId field is set + * optional uint32 buy_times = 6; + * @return whether the buyTimes field is set */ - public boolean hasGoodsId() { + public boolean hasBuyTimes() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 goods_id = 10; - * @return this - */ - public Goods clearGoodsId() { - bitField0_ &= ~0x00000004; - goodsId = 0; - return this; - } - - /** - * optional uint32 goods_id = 10; - * @return the goodsId - */ - public int getGoodsId() { - return goodsId; - } - - /** - * optional uint32 goods_id = 10; - * @param value the goodsId to set - * @return this - */ - public Goods setGoodsId(final int value) { - bitField0_ |= 0x00000004; - goodsId = value; - return this; - } - - /** - * optional uint32 item_id = 11; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 item_id = 11; - * @return this - */ - public Goods clearItemId() { - bitField0_ &= ~0x00000008; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 11; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 11; - * @param value the itemId to set - * @return this - */ - public Goods setItemId(final int value) { - bitField0_ |= 0x00000008; - itemId = value; - return this; - } - - /** - * optional uint32 buy_times = 13; - * @return whether the buyTimes field is set - */ - public boolean hasBuyTimes() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 buy_times = 13; + * optional uint32 buy_times = 6; * @return this */ public Goods clearBuyTimes() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; buyTimes = 0; return this; } /** - * optional uint32 buy_times = 13; + * optional uint32 buy_times = 6; * @return the buyTimes */ public int getBuyTimes() { @@ -228,16 +154,90 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 13; + * optional uint32 buy_times = 6; * @param value the buyTimes to set * @return this */ public Goods setBuyTimes(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; buyTimes = value; return this; } + /** + * optional uint32 goods_id = 8; + * @return whether the goodsId field is set + */ + public boolean hasGoodsId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 goods_id = 8; + * @return this + */ + public Goods clearGoodsId() { + bitField0_ &= ~0x00000008; + goodsId = 0; + return this; + } + + /** + * optional uint32 goods_id = 8; + * @return the goodsId + */ + public int getGoodsId() { + return goodsId; + } + + /** + * optional uint32 goods_id = 8; + * @param value the goodsId to set + * @return this + */ + public Goods setGoodsId(final int value) { + bitField0_ |= 0x00000008; + goodsId = value; + return this; + } + + /** + * optional uint32 item_id = 9; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 item_id = 9; + * @return this + */ + public Goods clearItemId() { + bitField0_ &= ~0x00000010; + itemId = 0; + return this; + } + + /** + * optional uint32 item_id = 9; + * @return the itemId + */ + public int getItemId() { + return itemId; + } + + /** + * optional uint32 item_id = 9; + * @param value the itemId to set + * @return this + */ + public Goods setItemId(final int value) { + bitField0_ |= 0x00000010; + itemId = value; + return this; + } + @Override public Goods copyFrom(final Goods other) { cachedSize = other.cachedSize; @@ -245,9 +245,9 @@ public final class GoodsOuterClass { bitField0_ = other.bitField0_; beginTime = other.beginTime; endTime = other.endTime; + buyTimes = other.buyTimes; goodsId = other.goodsId; itemId = other.itemId; - buyTimes = other.buyTimes; } return this; } @@ -264,15 +264,15 @@ public final class GoodsOuterClass { if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBuyTimes()) { + setBuyTimes(other.buyTimes); + } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } if (other.hasItemId()) { setItemId(other.itemId); } - if (other.hasBuyTimes()) { - setBuyTimes(other.buyTimes); - } return this; } @@ -285,9 +285,9 @@ public final class GoodsOuterClass { bitField0_ = 0; beginTime = 0L; endTime = 0L; + buyTimes = 0; goodsId = 0; itemId = 0; - buyTimes = 0; return this; } @@ -313,32 +313,32 @@ public final class GoodsOuterClass { return bitField0_ == other.bitField0_ && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBuyTimes() || buyTimes == other.buyTimes) && (!hasGoodsId() || goodsId == other.goodsId) - && (!hasItemId() || itemId == other.itemId) - && (!hasBuyTimes() || buyTimes == other.buyTimes); + && (!hasItemId() || itemId == other.itemId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(goodsId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(itemId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(buyTimes); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(itemId); } } @@ -352,13 +352,13 @@ public final class GoodsOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } return size; } @@ -370,45 +370,45 @@ public final class GoodsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 88: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { - // goodsId - goodsId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // itemId - itemId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 48: { // buyTimes buyTimes = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // goodsId + goodsId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -439,13 +439,13 @@ public final class GoodsOuterClass { output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.buyTimes, buyTimes); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.buyTimes, buyTimes); + output.writeUInt32(FieldNames.itemId, itemId); } output.endObject(); } @@ -481,12 +481,24 @@ public final class GoodsOuterClass { } break; } + case -994591648: + case -442602419: { + if (input.isAtField(FieldNames.buyTimes)) { + if (!input.trySkipNullValue()) { + buyTimes = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 207037201: case 2123207332: { if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { goodsId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -498,18 +510,6 @@ public final class GoodsOuterClass { if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { itemId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -994591648: - case -442602419: { - if (input.isAtField(FieldNames.buyTimes)) { - if (!input.trySkipNullValue()) { - buyTimes = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -573,11 +573,11 @@ public final class GoodsOuterClass { static final FieldName endTime = FieldName.forField("endTime", "end_time"); + static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); static final FieldName itemId = FieldName.forField("itemId", "item_id"); - - static final FieldName buyTimes = FieldName.forField("buyTimes", "buy_times"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java index da34353..5bee085 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class GroupStateChangeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_info = 7; */ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_info = 7; * @return whether the groupInfo field is set */ public boolean hasGroupInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_info = 7; * @return this */ public GroupStateChangeCsReq clearGroupInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_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. @@ -66,7 +66,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_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 @@ -80,7 +80,7 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_info = 13; + * optional .GroupStateInfo group_info = 7; * @param value the groupInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class GroupStateChangeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(groupInfo); } } @@ -171,7 +171,7 @@ public final class GroupStateChangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 58: { // groupInfo input.readMessage(groupInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java index be8a373..bdd29e7 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class GroupStateChangeScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 8; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 8; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 8; * @return this */ public GroupStateChangeScNotify clearGroupStateInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_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. @@ -66,7 +66,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_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 @@ -80,7 +80,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 3; + * optional .GroupStateInfo group_state_info = 8; * @param value the groupStateInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class GroupStateChangeScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public final class GroupStateChangeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 66: { // groupStateInfo input.readMessage(groupStateInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java index a82220d..0fb0a9d 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class GroupStateChangeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_info = 3; */ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return this */ public GroupStateChangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_info = 3; * @return whether the groupInfo field is set */ public boolean hasGroupInfo() { @@ -84,7 +84,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_info = 3; * @return this */ public GroupStateChangeScRsp clearGroupInfo() { @@ -94,7 +94,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_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. @@ -108,7 +108,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_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 @@ -122,7 +122,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 2; + * optional .GroupStateInfo group_info = 3; * @param value the groupInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class GroupStateChangeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 26); output.writeMessageNoTag(groupInfo); } } @@ -226,16 +226,16 @@ public final class GroupStateChangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { + case 26: { // groupInfo input.readMessage(groupInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java index 348b828..d58d24f 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java @@ -19,25 +19,25 @@ public final class GroupStateInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_state = 2; - */ - private int groupState; - - /** - * optional uint32 group_id = 5; - */ - private int groupId; - - /** - * optional uint32 entry_id = 7; + * optional uint32 entry_id = 5; */ private int entryId; /** - * optional uint32 player_uid = 14; + * optional uint32 player_uid = 7; */ private int playerUid; + /** + * optional uint32 group_id = 8; + */ + private int groupId; + + /** + * optional uint32 group_state = 13; + */ + private int groupState; + private GroupStateInfo() { } @@ -49,99 +49,25 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 group_state = 2; - * @return whether the groupState field is set + * optional uint32 entry_id = 5; + * @return whether the entryId field is set */ - public boolean hasGroupState() { + public boolean hasEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_state = 2; - * @return this - */ - public GroupStateInfo clearGroupState() { - bitField0_ &= ~0x00000001; - groupState = 0; - return this; - } - - /** - * optional uint32 group_state = 2; - * @return the groupState - */ - public int getGroupState() { - return groupState; - } - - /** - * optional uint32 group_state = 2; - * @param value the groupState to set - * @return this - */ - public GroupStateInfo setGroupState(final int value) { - bitField0_ |= 0x00000001; - groupState = value; - return this; - } - - /** - * optional uint32 group_id = 5; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 5; - * @return this - */ - public GroupStateInfo clearGroupId() { - bitField0_ &= ~0x00000002; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 5; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 5; - * @param value the groupId to set - * @return this - */ - public GroupStateInfo setGroupId(final int value) { - bitField0_ |= 0x00000002; - groupId = value; - return this; - } - - /** - * optional uint32 entry_id = 7; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 7; + * optional uint32 entry_id = 5; * @return this */ public GroupStateInfo clearEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; entryId = 0; return this; } /** - * optional uint32 entry_id = 7; + * optional uint32 entry_id = 5; * @return the entryId */ public int getEntryId() { @@ -149,36 +75,36 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 entry_id = 7; + * optional uint32 entry_id = 5; * @param value the entryId to set * @return this */ public GroupStateInfo setEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; entryId = value; return this; } /** - * optional uint32 player_uid = 14; + * optional uint32 player_uid = 7; * @return whether the playerUid field is set */ public boolean hasPlayerUid() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 player_uid = 14; + * optional uint32 player_uid = 7; * @return this */ public GroupStateInfo clearPlayerUid() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; playerUid = 0; return this; } /** - * optional uint32 player_uid = 14; + * optional uint32 player_uid = 7; * @return the playerUid */ public int getPlayerUid() { @@ -186,25 +112,99 @@ public final class GroupStateInfoOuterClass { } /** - * optional uint32 player_uid = 14; + * optional uint32 player_uid = 7; * @param value the playerUid to set * @return this */ public GroupStateInfo setPlayerUid(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; playerUid = value; return this; } + /** + * optional uint32 group_id = 8; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 group_id = 8; + * @return this + */ + public GroupStateInfo clearGroupId() { + bitField0_ &= ~0x00000004; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 8; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 8; + * @param value the groupId to set + * @return this + */ + public GroupStateInfo setGroupId(final int value) { + bitField0_ |= 0x00000004; + groupId = value; + return this; + } + + /** + * optional uint32 group_state = 13; + * @return whether the groupState field is set + */ + public boolean hasGroupState() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 group_state = 13; + * @return this + */ + public GroupStateInfo clearGroupState() { + bitField0_ &= ~0x00000008; + groupState = 0; + return this; + } + + /** + * optional uint32 group_state = 13; + * @return the groupState + */ + public int getGroupState() { + return groupState; + } + + /** + * optional uint32 group_state = 13; + * @param value the groupState to set + * @return this + */ + public GroupStateInfo setGroupState(final int value) { + bitField0_ |= 0x00000008; + groupState = value; + return this; + } + @Override public GroupStateInfo copyFrom(final GroupStateInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupState = other.groupState; - groupId = other.groupId; entryId = other.entryId; playerUid = other.playerUid; + groupId = other.groupId; + groupState = other.groupState; } return this; } @@ -215,18 +215,18 @@ public final class GroupStateInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGroupState()) { - setGroupState(other.groupState); - } - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasEntryId()) { setEntryId(other.entryId); } if (other.hasPlayerUid()) { setPlayerUid(other.playerUid); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + if (other.hasGroupState()) { + setGroupState(other.groupState); + } return this; } @@ -237,10 +237,10 @@ public final class GroupStateInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupState = 0; - groupId = 0; entryId = 0; playerUid = 0; + groupId = 0; + groupState = 0; return this; } @@ -264,47 +264,47 @@ public final class GroupStateInfoOuterClass { } GroupStateInfo other = (GroupStateInfo) o; return bitField0_ == other.bitField0_ - && (!hasGroupState() || groupState == other.groupState) - && (!hasGroupId() || groupId == other.groupId) && (!hasEntryId() || entryId == other.entryId) - && (!hasPlayerUid() || playerUid == other.playerUid); + && (!hasPlayerUid() || playerUid == other.playerUid) + && (!hasGroupId() || groupId == other.groupId) + && (!hasGroupState() || groupState == other.groupState); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(groupState); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(entryId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); output.writeUInt32NoTag(playerUid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(groupState); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); + } return size; } @@ -315,36 +315,36 @@ public final class GroupStateInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // groupState - groupState = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000002; + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + // playerUid + playerUid = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { - // playerUid - playerUid = input.readUInt32(); + case 64: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // groupState + groupState = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,17 +369,17 @@ public final class GroupStateInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupState, groupState); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.playerUid, playerUid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.groupState, groupState); + } output.endObject(); } @@ -390,36 +390,12 @@ public final class GroupStateInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1271403858: - case 1101988561: { - if (input.isAtField(FieldNames.groupState)) { - if (!input.trySkipNullValue()) { - groupState = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { - if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1591558867: case -2093663224: { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -431,6 +407,30 @@ public final class GroupStateInfoOuterClass { if (input.isAtField(FieldNames.playerUid)) { if (!input.trySkipNullValue()) { playerUid = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1271403858: + case 1101988561: { + if (input.isAtField(FieldNames.groupState)) { + if (!input.trySkipNullValue()) { + groupState = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -491,13 +491,13 @@ public final class GroupStateInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupState = FieldName.forField("groupState", "group_state"); - - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName playerUid = FieldName.forField("playerUid", "player_uid"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName groupState = FieldName.forField("groupState", "group_state"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java index c2b00a5..82e359e 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class HandleFriendCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 4; + * optional uint32 uid = 6; */ private int uid; /** - * optional bool handle_result = 12; + * optional bool handle_result = 15; */ private boolean handleResult; @@ -39,7 +39,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 6; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 6; * @return this */ public HandleFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 6; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 6; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 15; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -84,7 +84,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 15; * @return this */ public HandleFriendCsReq clearHandleResult() { @@ -94,7 +94,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 15; * @return the handleResult */ public boolean getHandleResult() { @@ -102,7 +102,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 12; + * optional bool handle_result = 15; * @param value the handleResult to set * @return this */ @@ -177,11 +177,11 @@ public final class HandleFriendCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeBoolNoTag(handleResult); } } @@ -205,16 +205,16 @@ public final class HandleFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 48: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java index e1900c1..afbdc09 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleFriendScRspOuterClass.java @@ -19,22 +19,22 @@ public final class HandleFriendScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; */ private int uid; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional bool handle_result = 2; + * optional bool handle_result = 9; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_info = 11; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -49,7 +49,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return whether the uid field is set */ public boolean hasUid() { @@ -57,7 +57,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return this */ public HandleFriendScRsp clearUid() { @@ -67,7 +67,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return the uid */ public int getUid() { @@ -75,7 +75,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @param value the uid to set * @return this */ @@ -86,7 +86,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -94,7 +94,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 10; * @return this */ public HandleFriendScRsp clearRetcode() { @@ -104,7 +104,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -112,7 +112,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -123,7 +123,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 2; + * optional bool handle_result = 9; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -131,7 +131,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 2; + * optional bool handle_result = 9; * @return this */ public HandleFriendScRsp clearHandleResult() { @@ -141,7 +141,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 2; + * optional bool handle_result = 9; * @return the handleResult */ public boolean getHandleResult() { @@ -149,7 +149,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 2; + * optional bool handle_result = 9; * @param value the handleResult to set * @return this */ @@ -160,7 +160,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_info = 11; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -168,7 +168,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_info = 11; * @return this */ public HandleFriendScRsp clearHandleFriendInfo() { @@ -178,7 +178,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_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. @@ -192,7 +192,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_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 @@ -206,7 +206,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 10; + * optional .FriendListInfo handle_friend_info = 11; * @param value the handleFriendInfo to set * @return this */ @@ -295,19 +295,19 @@ public final class HandleFriendScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(handleFriendInfo); } } @@ -337,34 +337,34 @@ public final class HandleFriendScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 72) { break; } } - case 16: { + case 72: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 82) { + if (tag != 90) { break; } } - case 82: { + case 90: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java index 22ed285..f329845 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionCsReqOuterClass.java @@ -19,25 +19,37 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; */ private final RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult buffSelectResult = RogueCommonBuffSelectResultOuterClass.RogueCommonBuffSelectResult.newInstance(); /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; + * 
+     *  could be 1134
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1008; + */ + private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); + + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; */ private final RogueBonusSelectResultOuterClass.RogueBonusSelectResult bonusSelectResult = RogueBonusSelectResultOuterClass.RogueBonusSelectResult.newInstance(); /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; */ private final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult miracleSelectResult = RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult.newInstance(); - /** - * optional .RogueBuffRollInfo roll_buff = 2038; - */ - private final RogueBuffRollInfoOuterClass.RogueBuffRollInfo rollBuff = RogueBuffRollInfoOuterClass.RogueBuffRollInfo.newInstance(); - private HandleRogueCommonPendingActionCsReq() { } @@ -55,47 +67,47 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { public HandleRogueCommonPendingActionCsReq clearPendingAction() { if (hasPendingAction()) { clearBuffSelectResult(); + clearRollBuff(); clearBonusSelectResult(); clearMiracleSelectResult(); - clearRollBuff(); } return this; } private void clearPendingActionOtherBuffSelectResult() { if ((((bitField0_ & 0x0000000e)) != 0)) { + clearRollBuff(); clearBonusSelectResult(); clearMiracleSelectResult(); - clearRollBuff(); - } - } - - private void clearPendingActionOtherBonusSelectResult() { - if ((((bitField0_ & 0x0000000d)) != 0)) { - clearBuffSelectResult(); - clearMiracleSelectResult(); - clearRollBuff(); - } - } - - private void clearPendingActionOtherMiracleSelectResult() { - if ((((bitField0_ & 0x0000000b)) != 0)) { - clearBuffSelectResult(); - clearBonusSelectResult(); - clearRollBuff(); } } private void clearPendingActionOtherRollBuff() { - if ((((bitField0_ & 0x00000007)) != 0)) { + if ((((bitField0_ & 0x0000000d)) != 0)) { clearBuffSelectResult(); clearBonusSelectResult(); clearMiracleSelectResult(); } } + private void clearPendingActionOtherBonusSelectResult() { + if ((((bitField0_ & 0x0000000b)) != 0)) { + clearBuffSelectResult(); + clearRollBuff(); + clearMiracleSelectResult(); + } + } + + private void clearPendingActionOtherMiracleSelectResult() { + if ((((bitField0_ & 0x00000007)) != 0)) { + clearBuffSelectResult(); + clearRollBuff(); + clearBonusSelectResult(); + } + } + /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; * @return whether the buffSelectResult field is set */ public boolean hasBuffSelectResult() { @@ -103,7 +115,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; * @return this */ public HandleRogueCommonPendingActionCsReq clearBuffSelectResult() { @@ -113,7 +125,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; * * 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. @@ -127,7 +139,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -143,7 +155,7 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueCommonBuffSelectResult buff_select_result = 744; + * optional .RogueCommonBuffSelectResult buff_select_result = 309; * @param value the buffSelectResult to set * @return this */ @@ -156,146 +168,37 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; - * @return whether the bonusSelectResult field is set + * 
+     *  could be 1134
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1008; + * @return whether the rollBuff field is set */ - public boolean hasBonusSelectResult() { + public boolean hasRollBuff() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; - * @return this - */ - public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() { - bitField0_ &= ~0x00000002; - bonusSelectResult.clear(); - return this; - } - - /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; + * 
+     *  could be 1134
+     *
* - * 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 #getMutableBonusSelectResult()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getBonusSelectResult() { - return bonusSelectResult; - } - - /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; - * - * 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 RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() { - clearPendingActionOtherBonusSelectResult(); - bitField0_ |= 0x00000002; - return bonusSelectResult; - } - - /** - * optional .RogueBonusSelectResult bonus_select_result = 1047; - * @param value the bonusSelectResult to set - * @return this - */ - public HandleRogueCommonPendingActionCsReq setBonusSelectResult( - final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) { - clearPendingActionOtherBonusSelectResult(); - bitField0_ |= 0x00000002; - bonusSelectResult.copyFrom(value); - return this; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; - * @return whether the miracleSelectResult field is set - */ - public boolean hasMiracleSelectResult() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; - * @return this - */ - public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { - bitField0_ &= ~0x00000004; - miracleSelectResult.clear(); - return this; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; - * - * 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 #getMutableMiracleSelectResult()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() { - return miracleSelectResult; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; - * - * 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 RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult( - ) { - clearPendingActionOtherMiracleSelectResult(); - bitField0_ |= 0x00000004; - return miracleSelectResult; - } - - /** - * optional .RogueMiracleSelectResult miracle_select_result = 1741; - * @param value the miracleSelectResult to set - * @return this - */ - public HandleRogueCommonPendingActionCsReq setMiracleSelectResult( - final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) { - clearPendingActionOtherMiracleSelectResult(); - bitField0_ |= 0x00000004; - miracleSelectResult.copyFrom(value); - return this; - } - - /** - * optional .RogueBuffRollInfo roll_buff = 2038; - * @return whether the rollBuff field is set - */ - public boolean hasRollBuff() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueBuffRollInfo roll_buff = 2038; + * optional .RogueBuffRollInfo roll_buff = 1008; * @return this */ public HandleRogueCommonPendingActionCsReq clearRollBuff() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; rollBuff.clear(); return this; } /** - * optional .RogueBuffRollInfo roll_buff = 2038; + * 
+     *  could be 1134
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1008; * * 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. @@ -309,7 +212,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } /** - * optional .RogueBuffRollInfo roll_buff = 2038; + * 
+     *  could be 1134
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1008; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -319,23 +226,188 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { */ public RogueBuffRollInfoOuterClass.RogueBuffRollInfo getMutableRollBuff() { clearPendingActionOtherRollBuff(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return rollBuff; } /** - * optional .RogueBuffRollInfo roll_buff = 2038; + * 
+     *  could be 1134
+     *
+ * + * optional .RogueBuffRollInfo roll_buff = 1008; * @param value the rollBuff to set * @return this */ public HandleRogueCommonPendingActionCsReq setRollBuff( final RogueBuffRollInfoOuterClass.RogueBuffRollInfo value) { clearPendingActionOtherRollBuff(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; rollBuff.copyFrom(value); return this; } + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; + * @return whether the bonusSelectResult field is set + */ + public boolean hasBonusSelectResult() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; + * @return this + */ + public HandleRogueCommonPendingActionCsReq clearBonusSelectResult() { + bitField0_ &= ~0x00000004; + bonusSelectResult.clear(); + return this; + } + + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; + * + * 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 #getMutableBonusSelectResult()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBonusSelectResultOuterClass.RogueBonusSelectResult getBonusSelectResult() { + return bonusSelectResult; + } + + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; + * + * 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 RogueBonusSelectResultOuterClass.RogueBonusSelectResult getMutableBonusSelectResult() { + clearPendingActionOtherBonusSelectResult(); + bitField0_ |= 0x00000004; + return bonusSelectResult; + } + + /** + * 
+     *  check as well
+     *
+ * + * optional .RogueBonusSelectResult bonus_select_result = 1156; + * @param value the bonusSelectResult to set + * @return this + */ + public HandleRogueCommonPendingActionCsReq setBonusSelectResult( + final RogueBonusSelectResultOuterClass.RogueBonusSelectResult value) { + clearPendingActionOtherBonusSelectResult(); + bitField0_ |= 0x00000004; + bonusSelectResult.copyFrom(value); + return this; + } + + /** + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * @return whether the miracleSelectResult field is set + */ + public boolean hasMiracleSelectResult() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * @return this + */ + public HandleRogueCommonPendingActionCsReq clearMiracleSelectResult() { + bitField0_ &= ~0x00000008; + miracleSelectResult.clear(); + return this; + } + + /** + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * + * 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 #getMutableMiracleSelectResult()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMiracleSelectResult() { + return miracleSelectResult; + } + + /** + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * + * 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 RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult getMutableMiracleSelectResult( + ) { + clearPendingActionOtherMiracleSelectResult(); + bitField0_ |= 0x00000008; + return miracleSelectResult; + } + + /** + * 
+     *  TODO: check
+     *
+ * + * optional .RogueMiracleSelectResult miracle_select_result = 1209; + * @param value the miracleSelectResult to set + * @return this + */ + public HandleRogueCommonPendingActionCsReq setMiracleSelectResult( + final RogueMiracleSelectResultOuterClass.RogueMiracleSelectResult value) { + clearPendingActionOtherMiracleSelectResult(); + bitField0_ |= 0x00000008; + miracleSelectResult.copyFrom(value); + return this; + } + @Override public HandleRogueCommonPendingActionCsReq copyFrom( final HandleRogueCommonPendingActionCsReq other) { @@ -343,9 +415,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; buffSelectResult.copyFrom(other.buffSelectResult); + rollBuff.copyFrom(other.rollBuff); bonusSelectResult.copyFrom(other.bonusSelectResult); miracleSelectResult.copyFrom(other.miracleSelectResult); - rollBuff.copyFrom(other.rollBuff); } return this; } @@ -360,15 +432,15 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { if (other.hasBuffSelectResult()) { getMutableBuffSelectResult().mergeFrom(other.buffSelectResult); } + if (other.hasRollBuff()) { + getMutableRollBuff().mergeFrom(other.rollBuff); + } if (other.hasBonusSelectResult()) { getMutableBonusSelectResult().mergeFrom(other.bonusSelectResult); } if (other.hasMiracleSelectResult()) { getMutableMiracleSelectResult().mergeFrom(other.miracleSelectResult); } - if (other.hasRollBuff()) { - getMutableRollBuff().mergeFrom(other.rollBuff); - } return this; } @@ -380,9 +452,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { cachedSize = -1; bitField0_ = 0; buffSelectResult.clear(); + rollBuff.clear(); bonusSelectResult.clear(); miracleSelectResult.clear(); - rollBuff.clear(); return this; } @@ -394,9 +466,9 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { cachedSize = -1; bitField0_ = 0; buffSelectResult.clearQuick(); + rollBuff.clearQuick(); bonusSelectResult.clearQuick(); miracleSelectResult.clearQuick(); - rollBuff.clearQuick(); return this; } @@ -411,28 +483,28 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { HandleRogueCommonPendingActionCsReq other = (HandleRogueCommonPendingActionCsReq) o; return bitField0_ == other.bitField0_ && (!hasBuffSelectResult() || buffSelectResult.equals(other.buffSelectResult)) + && (!hasRollBuff() || rollBuff.equals(other.rollBuff)) && (!hasBonusSelectResult() || bonusSelectResult.equals(other.bonusSelectResult)) - && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult)) - && (!hasRollBuff() || rollBuff.equals(other.rollBuff)); + && (!hasMiracleSelectResult() || miracleSelectResult.equals(other.miracleSelectResult)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 11970); + output.writeRawLittleEndian16((short) 5034); output.writeMessageNoTag(buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 16826); - output.writeMessageNoTag(bonusSelectResult); + output.writeRawLittleEndian16((short) 16258); + output.writeMessageNoTag(rollBuff); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 27882); - output.writeMessageNoTag(miracleSelectResult); + output.writeRawLittleEndian16((short) 18594); + output.writeMessageNoTag(bonusSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 32690); - output.writeMessageNoTag(rollBuff); + output.writeRawLittleEndian16((short) 19402); + output.writeMessageNoTag(miracleSelectResult); } } @@ -443,13 +515,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); + size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rollBuff); + size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectResult); } return size; } @@ -462,40 +534,40 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 5954: { + case 2474: { // buffSelectResult clearPendingActionOtherBuffSelectResult(); input.readMessage(buffSelectResult); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8378) { + if (tag != 8066) { break; } } - case 8378: { - // bonusSelectResult - clearPendingActionOtherBonusSelectResult(); - input.readMessage(bonusSelectResult); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 13930) { - break; - } - } - case 13930: { - // miracleSelectResult - clearPendingActionOtherMiracleSelectResult(); - input.readMessage(miracleSelectResult); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 16306) { - break; - } - } - case 16306: { + case 8066: { // rollBuff clearPendingActionOtherRollBuff(); input.readMessage(rollBuff); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 9250) { + break; + } + } + case 9250: { + // bonusSelectResult + clearPendingActionOtherBonusSelectResult(); + input.readMessage(bonusSelectResult); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 9674) { + break; + } + } + case 9674: { + // miracleSelectResult + clearPendingActionOtherMiracleSelectResult(); + input.readMessage(miracleSelectResult); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -523,13 +595,13 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { output.writeMessage(FieldNames.buffSelectResult, buffSelectResult); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); + output.writeMessage(FieldNames.rollBuff, rollBuff); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); + output.writeMessage(FieldNames.bonusSelectResult, bonusSelectResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rollBuff, rollBuff); + output.writeMessage(FieldNames.miracleSelectResult, miracleSelectResult); } output.endObject(); } @@ -555,13 +627,26 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { } break; } + case -260653456: + case 535908053: { + if (input.isAtField(FieldNames.rollBuff)) { + if (!input.trySkipNullValue()) { + clearPendingActionOtherRollBuff(); + input.readMessage(rollBuff); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 732920312: case 396692640: { if (input.isAtField(FieldNames.bonusSelectResult)) { if (!input.trySkipNullValue()) { clearPendingActionOtherBonusSelectResult(); input.readMessage(bonusSelectResult); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -574,19 +659,6 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { if (!input.trySkipNullValue()) { clearPendingActionOtherMiracleSelectResult(); input.readMessage(miracleSelectResult); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -260653456: - case 535908053: { - if (input.isAtField(FieldNames.rollBuff)) { - if (!input.trySkipNullValue()) { - clearPendingActionOtherRollBuff(); - input.readMessage(rollBuff); bitField0_ |= 0x00000008; } } else { @@ -651,11 +723,11 @@ public final class HandleRogueCommonPendingActionCsReqOuterClass { static class FieldNames { static final FieldName buffSelectResult = FieldName.forField("buffSelectResult", "buff_select_result"); + static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff"); + static final FieldName bonusSelectResult = FieldName.forField("bonusSelectResult", "bonus_select_result"); static final FieldName miracleSelectResult = FieldName.forField("miracleSelectResult", "miracle_select_result"); - - static final FieldName rollBuff = FieldName.forField("rollBuff", "roll_buff"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java index ca9ed2f..adc61dc 100644 --- a/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HandleRogueCommonPendingActionScRspOuterClass.java @@ -19,35 +19,52 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 action_unique_id = 1; + * optional uint32 action_unique_id = 5; */ private int actionUniqueId; /** - * optional uint32 retcode = 15; + * optional uint32 times2 = 7; + */ + private int times2; + + /** + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; */ private final RogueBonusSelectOuterClass.RogueBonusSelect bonusSelect = RogueBonusSelectOuterClass.RogueBonusSelect.newInstance(); /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; */ private final RogueRerollBuffOuterClass.RogueRerollBuff rogueRerollBuff = RogueRerollBuffOuterClass.RogueRerollBuff.newInstance(); /** - * optional .RogueBuffSelect rogue_buff_select = 688; - */ - private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); - - /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; */ private final RogueMiracleSelectOuterClass.RogueMiracleSelect miracleSelect = RogueMiracleSelectOuterClass.RogueMiracleSelect.newInstance(); + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + */ + private final RogueBuffSelectOuterClass.RogueBuffSelect rogueBuffSelect = RogueBuffSelectOuterClass.RogueBuffSelect.newInstance(); + private HandleRogueCommonPendingActionScRsp() { } @@ -59,7 +76,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 action_unique_id = 1; + * optional uint32 action_unique_id = 5; * @return whether the actionUniqueId field is set */ public boolean hasActionUniqueId() { @@ -67,7 +84,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 action_unique_id = 1; + * optional uint32 action_unique_id = 5; * @return this */ public HandleRogueCommonPendingActionScRsp clearActionUniqueId() { @@ -77,7 +94,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 action_unique_id = 1; + * optional uint32 action_unique_id = 5; * @return the actionUniqueId */ public int getActionUniqueId() { @@ -85,7 +102,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 action_unique_id = 1; + * optional uint32 action_unique_id = 5; * @param value the actionUniqueId to set * @return this */ @@ -96,25 +113,62 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set + * optional uint32 times2 = 7; + * @return whether the times2 field is set */ - public boolean hasRetcode() { + public boolean hasTimes2() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 15; + * optional uint32 times2 = 7; + * @return this + */ + public HandleRogueCommonPendingActionScRsp clearTimes2() { + bitField0_ &= ~0x00000002; + times2 = 0; + return this; + } + + /** + * optional uint32 times2 = 7; + * @return the times2 + */ + public int getTimes2() { + return times2; + } + + /** + * optional uint32 times2 = 7; + * @param value the times2 to set + * @return this + */ + public HandleRogueCommonPendingActionScRsp setTimes2(final int value) { + bitField0_ |= 0x00000002; + times2 = value; + return this; + } + + /** + * optional uint32 retcode = 9; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 9; * @return this */ public HandleRogueCommonPendingActionScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -122,36 +176,48 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ public HandleRogueCommonPendingActionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; retcode = value; return this; } /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; * @return whether the bonusSelect field is set */ public boolean hasBonusSelect() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; * @return this */ public HandleRogueCommonPendingActionScRsp clearBonusSelect() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; bonusSelect.clear(); return this; } /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; * * 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. @@ -165,7 +231,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -174,42 +244,58 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * @return internal storage object for modifications */ public RogueBonusSelectOuterClass.RogueBonusSelect getMutableBonusSelect() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return bonusSelect; } /** - * optional .RogueBonusSelect bonus_select = 59; + * 
+     *  idk
+     *
+ * + * optional .RogueBonusSelect bonus_select = 157; * @param value the bonusSelect to set * @return this */ public HandleRogueCommonPendingActionScRsp setBonusSelect( final RogueBonusSelectOuterClass.RogueBonusSelect value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; bonusSelect.copyFrom(value); return this; } /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; * @return whether the rogueRerollBuff field is set */ public boolean hasRogueRerollBuff() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; * @return this */ public HandleRogueCommonPendingActionScRsp clearRogueRerollBuff() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; rogueRerollBuff.clear(); return this; } /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; * * 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. @@ -223,7 +309,11 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -232,82 +322,28 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { * @return internal storage object for modifications */ public RogueRerollBuffOuterClass.RogueRerollBuff getMutableRogueRerollBuff() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return rogueRerollBuff; } /** - * optional .RogueRerollBuff rogue_reroll_buff = 523; + * 
+     *  idk
+     *
+ * + * optional .RogueRerollBuff rogue_reroll_buff = 952; * @param value the rogueRerollBuff to set * @return this */ public HandleRogueCommonPendingActionScRsp setRogueRerollBuff( final RogueRerollBuffOuterClass.RogueRerollBuff value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; rogueRerollBuff.copyFrom(value); return this; } /** - * optional .RogueBuffSelect rogue_buff_select = 688; - * @return whether the rogueBuffSelect field is set - */ - public boolean hasRogueBuffSelect() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 688; - * @return this - */ - public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { - bitField0_ &= ~0x00000010; - rogueBuffSelect.clear(); - return this; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 688; - * - * 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 #getMutableRogueBuffSelect()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() { - return rogueBuffSelect; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 688; - * - * 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 RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { - bitField0_ |= 0x00000010; - return rogueBuffSelect; - } - - /** - * optional .RogueBuffSelect rogue_buff_select = 688; - * @param value the rogueBuffSelect to set - * @return this - */ - public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( - final RogueBuffSelectOuterClass.RogueBuffSelect value) { - bitField0_ |= 0x00000010; - rogueBuffSelect.copyFrom(value); - return this; - } - - /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; * @return whether the miracleSelect field is set */ public boolean hasMiracleSelect() { @@ -315,7 +351,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; * @return this */ public HandleRogueCommonPendingActionScRsp clearMiracleSelect() { @@ -325,7 +361,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; * * 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. @@ -339,7 +375,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -353,7 +389,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } /** - * optional .RogueMiracleSelect miracle_select = 741; + * optional .RogueMiracleSelect miracle_select = 1077; * @param value the miracleSelect to set * @return this */ @@ -364,6 +400,84 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { return this; } + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + * @return whether the rogueBuffSelect field is set + */ + public boolean hasRogueBuffSelect() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + * @return this + */ + public HandleRogueCommonPendingActionScRsp clearRogueBuffSelect() { + bitField0_ &= ~0x00000040; + rogueBuffSelect.clear(); + return this; + } + + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + * + * 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 #getMutableRogueBuffSelect()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBuffSelectOuterClass.RogueBuffSelect getRogueBuffSelect() { + return rogueBuffSelect; + } + + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + * + * 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 RogueBuffSelectOuterClass.RogueBuffSelect getMutableRogueBuffSelect() { + bitField0_ |= 0x00000040; + return rogueBuffSelect; + } + + /** + * 
+     *  idk
+     *
+ * + * optional .RogueBuffSelect rogue_buff_select = 1689; + * @param value the rogueBuffSelect to set + * @return this + */ + public HandleRogueCommonPendingActionScRsp setRogueBuffSelect( + final RogueBuffSelectOuterClass.RogueBuffSelect value) { + bitField0_ |= 0x00000040; + rogueBuffSelect.copyFrom(value); + return this; + } + @Override public HandleRogueCommonPendingActionScRsp copyFrom( final HandleRogueCommonPendingActionScRsp other) { @@ -371,11 +485,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; actionUniqueId = other.actionUniqueId; + times2 = other.times2; retcode = other.retcode; bonusSelect.copyFrom(other.bonusSelect); rogueRerollBuff.copyFrom(other.rogueRerollBuff); - rogueBuffSelect.copyFrom(other.rogueBuffSelect); miracleSelect.copyFrom(other.miracleSelect); + rogueBuffSelect.copyFrom(other.rogueBuffSelect); } return this; } @@ -390,6 +505,9 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (other.hasActionUniqueId()) { setActionUniqueId(other.actionUniqueId); } + if (other.hasTimes2()) { + setTimes2(other.times2); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -399,12 +517,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (other.hasRogueRerollBuff()) { getMutableRogueRerollBuff().mergeFrom(other.rogueRerollBuff); } - if (other.hasRogueBuffSelect()) { - getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect); - } if (other.hasMiracleSelect()) { getMutableMiracleSelect().mergeFrom(other.miracleSelect); } + if (other.hasRogueBuffSelect()) { + getMutableRogueBuffSelect().mergeFrom(other.rogueBuffSelect); + } return this; } @@ -416,11 +534,12 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { cachedSize = -1; bitField0_ = 0; actionUniqueId = 0; + times2 = 0; retcode = 0; bonusSelect.clear(); rogueRerollBuff.clear(); - rogueBuffSelect.clear(); miracleSelect.clear(); + rogueBuffSelect.clear(); return this; } @@ -433,8 +552,8 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { bitField0_ = 0; bonusSelect.clearQuick(); rogueRerollBuff.clearQuick(); - rogueBuffSelect.clearQuick(); miracleSelect.clearQuick(); + rogueBuffSelect.clearQuick(); return this; } @@ -449,39 +568,44 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { HandleRogueCommonPendingActionScRsp other = (HandleRogueCommonPendingActionScRsp) o; return bitField0_ == other.bitField0_ && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId) + && (!hasTimes2() || times2 == other.times2) && (!hasRetcode() || retcode == other.retcode) && (!hasBonusSelect() || bonusSelect.equals(other.bonusSelect)) && (!hasRogueRerollBuff() || rogueRerollBuff.equals(other.rogueRerollBuff)) - && (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect)) - && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)); + && (!hasMiracleSelect() || miracleSelect.equals(other.miracleSelect)) + && (!hasRogueBuffSelect() || rogueBuffSelect.equals(other.rogueBuffSelect)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(times2); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 986); - output.writeMessageNoTag(bonusSelect); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 8410); - output.writeMessageNoTag(rogueRerollBuff); + output.writeRawLittleEndian16((short) 2538); + output.writeMessageNoTag(bonusSelect); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 11138); - output.writeMessageNoTag(rogueBuffSelect); + output.writeRawLittleEndian16((short) 15298); + output.writeMessageNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 11946); + output.writeRawLittleEndian16((short) 17322); output.writeMessageNoTag(miracleSelect); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawLittleEndian16((short) 27082); + output.writeMessageNoTag(rogueBuffSelect); + } } @Override @@ -491,20 +615,23 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(times2); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelect); } if ((bitField0_ & 0x00000010) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect); + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueRerollBuff); } if ((bitField0_ & 0x00000020) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelect); } + if ((bitField0_ & 0x00000040) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueBuffSelect); + } return size; } @@ -516,56 +643,65 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // actionUniqueId actionUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { - // retcode - retcode = input.readUInt32(); + case 56: { + // times2 + times2 = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 474) { + if (tag != 72) { break; } } - case 474: { - // bonusSelect - input.readMessage(bonusSelect); + case 72: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 4186) { + if (tag != 1258) { break; } } - case 4186: { - // rogueRerollBuff - input.readMessage(rogueRerollBuff); + case 1258: { + // bonusSelect + input.readMessage(bonusSelect); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 5506) { + if (tag != 7618) { break; } } - case 5506: { - // rogueBuffSelect - input.readMessage(rogueBuffSelect); + case 7618: { + // rogueRerollBuff + input.readMessage(rogueRerollBuff); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 5930) { + if (tag != 8618) { break; } } - case 5930: { + case 8618: { // miracleSelect input.readMessage(miracleSelect); bitField0_ |= 0x00000020; tag = input.readTag(); + if (tag != 13514) { + break; + } + } + case 13514: { + // rogueBuffSelect + input.readMessage(rogueBuffSelect); + bitField0_ |= 0x00000040; + tag = input.readTag(); if (tag != 0) { break; } @@ -591,20 +727,23 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.times2, times2); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.bonusSelect, bonusSelect); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff); + output.writeMessage(FieldNames.bonusSelect, bonusSelect); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect); + output.writeMessage(FieldNames.rogueRerollBuff, rogueRerollBuff); } if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.miracleSelect, miracleSelect); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeMessage(FieldNames.rogueBuffSelect, rogueBuffSelect); + } output.endObject(); } @@ -628,11 +767,22 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } + case -873668180: { + if (input.isAtField(FieldNames.times2)) { + if (!input.trySkipNullValue()) { + times2 = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -644,7 +794,7 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (input.isAtField(FieldNames.bonusSelect)) { if (!input.trySkipNullValue()) { input.readMessage(bonusSelect); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -656,18 +806,6 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { if (input.isAtField(FieldNames.rogueRerollBuff)) { if (!input.trySkipNullValue()) { input.readMessage(rogueRerollBuff); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -183502679: - case -1750117501: { - if (input.isAtField(FieldNames.rogueBuffSelect)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueBuffSelect); bitField0_ |= 0x00000010; } } else { @@ -687,6 +825,18 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { } break; } + case -183502679: + case -1750117501: { + if (input.isAtField(FieldNames.rogueBuffSelect)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueBuffSelect); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -744,15 +894,17 @@ public final class HandleRogueCommonPendingActionScRspOuterClass { static class FieldNames { static final FieldName actionUniqueId = FieldName.forField("actionUniqueId", "action_unique_id"); + static final FieldName times2 = FieldName.forField("times2"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName bonusSelect = FieldName.forField("bonusSelect", "bonus_select"); static final FieldName rogueRerollBuff = FieldName.forField("rogueRerollBuff", "rogue_reroll_buff"); - static final FieldName rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select"); - static final FieldName miracleSelect = FieldName.forField("miracleSelect", "miracle_select"); + + static final FieldName rogueBuffSelect = FieldName.forField("rogueBuffSelect", "rogue_buff_select"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java index 7b7c041..5f4a632 100644 --- a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java @@ -19,7 +19,7 @@ public final class HeadIconOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 14; + * optional uint32 id = 5; */ private int id; @@ -34,7 +34,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 5; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 5; * @return this */ public HeadIcon clearId() { @@ -52,7 +52,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 5; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 5; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public final class HeadIconOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class HeadIconOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 40: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java index bf8a992..545a1bc 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java @@ -18,16 +18,16 @@ public final class InteractPropCsReqOuterClass { public static final class InteractPropCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 prop_entity_id = 9; - */ - private int propEntityId; - /** * optional uint32 interact_id = 13; */ private int interactId; + /** + * optional uint32 prop_entity_id = 15; + */ + private int propEntityId; + private InteractPropCsReq() { } @@ -38,49 +38,12 @@ public final class InteractPropCsReqOuterClass { return new InteractPropCsReq(); } - /** - * optional uint32 prop_entity_id = 9; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 prop_entity_id = 9; - * @return this - */ - public InteractPropCsReq clearPropEntityId() { - bitField0_ &= ~0x00000001; - propEntityId = 0; - return this; - } - - /** - * optional uint32 prop_entity_id = 9; - * @return the propEntityId - */ - public int getPropEntityId() { - return propEntityId; - } - - /** - * optional uint32 prop_entity_id = 9; - * @param value the propEntityId to set - * @return this - */ - public InteractPropCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000001; - propEntityId = value; - return this; - } - /** * optional uint32 interact_id = 13; * @return whether the interactId field is set */ public boolean hasInteractId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -88,7 +51,7 @@ public final class InteractPropCsReqOuterClass { * @return this */ public InteractPropCsReq clearInteractId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; interactId = 0; return this; } @@ -107,18 +70,55 @@ public final class InteractPropCsReqOuterClass { * @return this */ public InteractPropCsReq setInteractId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; interactId = value; return this; } + /** + * optional uint32 prop_entity_id = 15; + * @return whether the propEntityId field is set + */ + public boolean hasPropEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return this + */ + public InteractPropCsReq clearPropEntityId() { + bitField0_ &= ~0x00000002; + propEntityId = 0; + return this; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return the propEntityId + */ + public int getPropEntityId() { + return propEntityId; + } + + /** + * optional uint32 prop_entity_id = 15; + * @param value the propEntityId to set + * @return this + */ + public InteractPropCsReq setPropEntityId(final int value) { + bitField0_ |= 0x00000002; + propEntityId = value; + return this; + } + @Override public InteractPropCsReq copyFrom(final InteractPropCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - propEntityId = other.propEntityId; interactId = other.interactId; + propEntityId = other.propEntityId; } return this; } @@ -129,12 +129,12 @@ public final class InteractPropCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } if (other.hasInteractId()) { setInteractId(other.interactId); } + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } return this; } @@ -145,8 +145,8 @@ public final class InteractPropCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - propEntityId = 0; interactId = 0; + propEntityId = 0; return this; } @@ -170,30 +170,30 @@ public final class InteractPropCsReqOuterClass { } InteractPropCsReq other = (InteractPropCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasInteractId() || interactId == other.interactId); + && (!hasInteractId() || interactId == other.interactId) + && (!hasPropEntityId() || propEntityId == other.propEntityId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(propEntityId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(interactId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(propEntityId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } return size; } @@ -205,18 +205,18 @@ public final class InteractPropCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // propEntityId - propEntityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } case 104: { // interactId interactId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class InteractPropCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.interactId, interactId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.interactId, interactId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class InteractPropCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case -1603081743: + case 1844094916: { + if (input.isAtField(FieldNames.interactId)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + interactId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class InteractPropCsReqOuterClass { } break; } - case -1603081743: - case 1844094916: { - if (input.isAtField(FieldNames.interactId)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - interactId = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class InteractPropCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName interactId = FieldName.forField("interactId", "interact_id"); + + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java index 3198879..5e320b6 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java @@ -19,20 +19,20 @@ public final class InteractPropScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 prop_entity_id = 8; + * optional uint32 prop_state = 2; + */ + private int propState; + + /** + * optional uint32 prop_entity_id = 10; */ private int propEntityId; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; */ private int retcode; - /** - * optional uint32 prop_state = 12; - */ - private int propState; - private InteractPropScRsp() { } @@ -44,99 +44,25 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 8; - * @return whether the propEntityId field is set + * optional uint32 prop_state = 2; + * @return whether the propState field is set */ - public boolean hasPropEntityId() { + public boolean hasPropState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 prop_entity_id = 8; - * @return this - */ - public InteractPropScRsp clearPropEntityId() { - bitField0_ &= ~0x00000001; - propEntityId = 0; - return this; - } - - /** - * optional uint32 prop_entity_id = 8; - * @return the propEntityId - */ - public int getPropEntityId() { - return propEntityId; - } - - /** - * optional uint32 prop_entity_id = 8; - * @param value the propEntityId to set - * @return this - */ - public InteractPropScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000001; - propEntityId = value; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 10; - * @return this - */ - public InteractPropScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 10; - * @param value the retcode to set - * @return this - */ - public InteractPropScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 prop_state = 12; - * @return whether the propState field is set - */ - public boolean hasPropState() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_state = 12; + * optional uint32 prop_state = 2; * @return this */ public InteractPropScRsp clearPropState() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; propState = 0; return this; } /** - * optional uint32 prop_state = 12; + * optional uint32 prop_state = 2; * @return the propState */ public int getPropState() { @@ -144,24 +70,98 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_state = 12; + * optional uint32 prop_state = 2; * @param value the propState to set * @return this */ public InteractPropScRsp setPropState(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; propState = value; return this; } + /** + * optional uint32 prop_entity_id = 10; + * @return whether the propEntityId field is set + */ + public boolean hasPropEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 prop_entity_id = 10; + * @return this + */ + public InteractPropScRsp clearPropEntityId() { + bitField0_ &= ~0x00000002; + propEntityId = 0; + return this; + } + + /** + * optional uint32 prop_entity_id = 10; + * @return the propEntityId + */ + public int getPropEntityId() { + return propEntityId; + } + + /** + * optional uint32 prop_entity_id = 10; + * @param value the propEntityId to set + * @return this + */ + public InteractPropScRsp setPropEntityId(final int value) { + bitField0_ |= 0x00000002; + propEntityId = value; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 11; + * @return this + */ + public InteractPropScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 11; + * @param value the retcode to set + * @return this + */ + public InteractPropScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + @Override public InteractPropScRsp copyFrom(final InteractPropScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + propState = other.propState; propEntityId = other.propEntityId; retcode = other.retcode; - propState = other.propState; } return this; } @@ -172,15 +172,15 @@ public final class InteractPropScRspOuterClass { return this; } cachedSize = -1; + if (other.hasPropState()) { + setPropState(other.propState); + } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasPropState()) { - setPropState(other.propState); - } return this; } @@ -191,9 +191,9 @@ public final class InteractPropScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + propState = 0; propEntityId = 0; retcode = 0; - propState = 0; return this; } @@ -217,24 +217,24 @@ public final class InteractPropScRspOuterClass { } InteractPropScRsp other = (InteractPropScRsp) o; return bitField0_ == other.bitField0_ + && (!hasPropState() || propState == other.propState) && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasRetcode() || retcode == other.retcode) - && (!hasPropState() || propState == other.propState); + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(propState); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); } } @@ -242,13 +242,13 @@ public final class InteractPropScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -260,9 +260,9 @@ public final class InteractPropScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // propEntityId - propEntityId = input.readUInt32(); + case 16: { + // propState + propState = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 80) { @@ -270,17 +270,17 @@ public final class InteractPropScRspOuterClass { } } case 80: { - // retcode - retcode = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // propState - propState = input.readUInt32(); + case 88: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class InteractPropScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.propState, propState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propState, propState); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -323,12 +323,24 @@ public final class InteractPropScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -739191058: + case -1096911691: { + if (input.isAtField(FieldNames.propState)) { + if (!input.trySkipNullValue()) { + propState = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -68717343: case -57484005: { if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { propEntityId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -339,18 +351,6 @@ public final class InteractPropScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -739191058: - case -1096911691: { - if (input.isAtField(FieldNames.propState)) { - if (!input.trySkipNullValue()) { - propState = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class InteractPropScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName propState = FieldName.forField("propState", "prop_state"); + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName propState = FieldName.forField("propState", "prop_state"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java index 7ec5185..1c62993 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java @@ -20,7 +20,7 @@ public final class ItemCostListOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 11; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -35,7 +35,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 11; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 11; * @return this */ public ItemCostList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 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. @@ -67,7 +67,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 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 @@ -81,7 +81,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 11; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 4; + * repeated .ItemCost item_list = 11; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public final class ItemCostListOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 90); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemCostListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 90: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java index 79b2d1e..9ce4ba1 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemCostOuterClass.java @@ -19,17 +19,17 @@ public final class ItemCostOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 8; */ private int equipmentUniqueId; /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 14; */ private int relicUniqueId; /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 4; */ private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance(); @@ -44,7 +44,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 8; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -52,7 +52,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 8; * @return this */ public ItemCost clearEquipmentUniqueId() { @@ -62,7 +62,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 8; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -70,7 +70,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 7; + * optional uint32 equipment_unique_id = 8; * @param value the equipmentUniqueId to set * @return this */ @@ -81,7 +81,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 14; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -89,7 +89,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 14; * @return this */ public ItemCost clearRelicUniqueId() { @@ -99,7 +99,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 14; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -107,7 +107,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 14; * @param value the relicUniqueId to set * @return this */ @@ -118,7 +118,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 4; * @return whether the pileItem field is set */ public boolean hasPileItem() { @@ -126,7 +126,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 4; * @return this */ public ItemCost clearPileItem() { @@ -136,7 +136,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 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. @@ -150,7 +150,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 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 @@ -164,7 +164,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 6; + * optional .PileItem pile_item = 4; * @param value the pileItem to set * @return this */ @@ -246,15 +246,15 @@ public final class ItemCostOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 34); output.writeMessageNoTag(pileItem); } } @@ -281,25 +281,25 @@ public final class ItemCostOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 64: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { + case 112: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 34) { break; } } - case 50: { + case 34: { // pileItem input.readMessage(pileItem); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java index b51d417..f6c4d48 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemListOuterClass.java @@ -20,7 +20,7 @@ public final class ItemListOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .Item item_list = 2; + * repeated .Item item_list = 15; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory()); @@ -35,7 +35,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_list = 15; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_list = 15; * @return this */ public ItemList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_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. @@ -67,7 +67,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_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 @@ -81,7 +81,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_list = 15; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 2; + * repeated .Item item_list = 15; * @param values the itemList to add * @return this */ @@ -163,7 +163,7 @@ public final class ItemListOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 122: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java index 72b81b4..e7c3abb 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java @@ -19,12 +19,17 @@ public final class ItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 main_affix_id = 1; + * optional uint32 promotion = 1; */ - private int mainAffixId; + private int promotion; /** - * optional uint32 level = 3; + * optional uint32 num = 4; + */ + private int num; + + /** + * optional uint32 level = 5; */ private int level; @@ -34,25 +39,20 @@ public final class ItemOuterClass { private int itemId; /** - * optional uint32 num = 7; + * optional uint32 main_affix_id = 8; */ - private int num; + private int mainAffixId; /** - * optional uint32 rank = 9; - */ - private int rank; - - /** - * optional uint32 promotion = 12; - */ - private int promotion; - - /** - * optional uint32 unique_id = 14; + * optional uint32 unique_id = 10; */ private int uniqueId; + /** + * optional uint32 rank = 11; + */ + private int rank; + private Item() { } @@ -64,62 +64,99 @@ public final class ItemOuterClass { } /** - * optional uint32 main_affix_id = 1; - * @return whether the mainAffixId field is set + * optional uint32 promotion = 1; + * @return whether the promotion field is set */ - public boolean hasMainAffixId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 main_affix_id = 1; + * optional uint32 promotion = 1; * @return this */ - public Item clearMainAffixId() { + public Item clearPromotion() { bitField0_ &= ~0x00000001; - mainAffixId = 0; + promotion = 0; return this; } /** - * optional uint32 main_affix_id = 1; - * @return the mainAffixId + * optional uint32 promotion = 1; + * @return the promotion */ - public int getMainAffixId() { - return mainAffixId; + public int getPromotion() { + return promotion; } /** - * optional uint32 main_affix_id = 1; - * @param value the mainAffixId to set + * optional uint32 promotion = 1; + * @param value the promotion to set * @return this */ - public Item setMainAffixId(final int value) { + public Item setPromotion(final int value) { bitField0_ |= 0x00000001; - mainAffixId = value; + promotion = value; return this; } /** - * optional uint32 level = 3; - * @return whether the level field is set + * optional uint32 num = 4; + * @return whether the num field is set */ - public boolean hasLevel() { + public boolean hasNum() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 level = 3; + * optional uint32 num = 4; + * @return this + */ + public Item clearNum() { + bitField0_ &= ~0x00000002; + num = 0; + return this; + } + + /** + * optional uint32 num = 4; + * @return the num + */ + public int getNum() { + return num; + } + + /** + * optional uint32 num = 4; + * @param value the num to set + * @return this + */ + public Item setNum(final int value) { + bitField0_ |= 0x00000002; + num = value; + return this; + } + + /** + * optional uint32 level = 5; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 level = 5; * @return this */ public Item clearLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; level = 0; return this; } /** - * optional uint32 level = 3; + * optional uint32 level = 5; * @return the level */ public int getLevel() { @@ -127,12 +164,12 @@ public final class ItemOuterClass { } /** - * optional uint32 level = 3; + * optional uint32 level = 5; * @param value the level to set * @return this */ public Item setLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; level = value; return this; } @@ -142,7 +179,7 @@ public final class ItemOuterClass { * @return whether the itemId field is set */ public boolean hasItemId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -150,7 +187,7 @@ public final class ItemOuterClass { * @return this */ public Item clearItemId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; itemId = 0; return this; } @@ -169,142 +206,68 @@ public final class ItemOuterClass { * @return this */ public Item setItemId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; itemId = value; return this; } /** - * optional uint32 num = 7; - * @return whether the num field is set + * optional uint32 main_affix_id = 8; + * @return whether the mainAffixId field is set */ - public boolean hasNum() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 num = 7; - * @return this - */ - public Item clearNum() { - bitField0_ &= ~0x00000008; - num = 0; - return this; - } - - /** - * optional uint32 num = 7; - * @return the num - */ - public int getNum() { - return num; - } - - /** - * optional uint32 num = 7; - * @param value the num to set - * @return this - */ - public Item setNum(final int value) { - bitField0_ |= 0x00000008; - num = value; - return this; - } - - /** - * optional uint32 rank = 9; - * @return whether the rank field is set - */ - public boolean hasRank() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 rank = 9; + * optional uint32 main_affix_id = 8; * @return this */ - public Item clearRank() { + public Item clearMainAffixId() { bitField0_ &= ~0x00000010; - rank = 0; + mainAffixId = 0; return this; } /** - * optional uint32 rank = 9; - * @return the rank + * optional uint32 main_affix_id = 8; + * @return the mainAffixId */ - public int getRank() { - return rank; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 rank = 9; - * @param value the rank to set + * optional uint32 main_affix_id = 8; + * @param value the mainAffixId to set * @return this */ - public Item setRank(final int value) { + public Item setMainAffixId(final int value) { bitField0_ |= 0x00000010; - rank = value; + mainAffixId = value; return this; } /** - * optional uint32 promotion = 12; - * @return whether the promotion field is set + * optional uint32 unique_id = 10; + * @return whether the uniqueId field is set */ - public boolean hasPromotion() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 promotion = 12; - * @return this - */ - public Item clearPromotion() { - bitField0_ &= ~0x00000020; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 12; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 12; - * @param value the promotion to set - * @return this - */ - public Item setPromotion(final int value) { - bitField0_ |= 0x00000020; - promotion = value; - return this; - } - - /** - * optional uint32 unique_id = 14; - * @return whether the uniqueId field is set - */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 unique_id = 14; + * optional uint32 unique_id = 10; * @return this */ public Item clearUniqueId() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; uniqueId = 0; return this; } /** - * optional uint32 unique_id = 14; + * optional uint32 unique_id = 10; * @return the uniqueId */ public int getUniqueId() { @@ -312,28 +275,65 @@ public final class ItemOuterClass { } /** - * optional uint32 unique_id = 14; + * optional uint32 unique_id = 10; * @param value the uniqueId to set * @return this */ public Item setUniqueId(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; uniqueId = value; return this; } + /** + * optional uint32 rank = 11; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 rank = 11; + * @return this + */ + public Item clearRank() { + bitField0_ &= ~0x00000040; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 11; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 11; + * @param value the rank to set + * @return this + */ + public Item setRank(final int value) { + bitField0_ |= 0x00000040; + rank = value; + return this; + } + @Override public Item copyFrom(final Item other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mainAffixId = other.mainAffixId; + promotion = other.promotion; + num = other.num; level = other.level; itemId = other.itemId; - num = other.num; - rank = other.rank; - promotion = other.promotion; + mainAffixId = other.mainAffixId; uniqueId = other.uniqueId; + rank = other.rank; } return this; } @@ -344,8 +344,11 @@ public final class ItemOuterClass { return this; } cachedSize = -1; - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); + if (other.hasPromotion()) { + setPromotion(other.promotion); + } + if (other.hasNum()) { + setNum(other.num); } if (other.hasLevel()) { setLevel(other.level); @@ -353,18 +356,15 @@ public final class ItemOuterClass { if (other.hasItemId()) { setItemId(other.itemId); } - if (other.hasNum()) { - setNum(other.num); - } - if (other.hasRank()) { - setRank(other.rank); - } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } + if (other.hasRank()) { + setRank(other.rank); + } return this; } @@ -375,13 +375,13 @@ public final class ItemOuterClass { } cachedSize = -1; bitField0_ = 0; - mainAffixId = 0; + promotion = 0; + num = 0; level = 0; itemId = 0; - num = 0; - rank = 0; - promotion = 0; + mainAffixId = 0; uniqueId = 0; + rank = 0; return this; } @@ -405,44 +405,44 @@ public final class ItemOuterClass { } Item other = (Item) o; return bitField0_ == other.bitField0_ - && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasPromotion() || promotion == other.promotion) + && (!hasNum() || num == other.num) && (!hasLevel() || level == other.level) && (!hasItemId() || itemId == other.itemId) - && (!hasNum() || num == other.num) - && (!hasRank() || rank == other.rank) - && (!hasPromotion() || promotion == other.promotion) - && (!hasUniqueId() || uniqueId == other.uniqueId); + && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasRank() || rank == other.rank); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(mainAffixId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 48); output.writeUInt32NoTag(itemId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(num); - } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(rank); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(promotion); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(rank); } } @@ -450,26 +450,26 @@ public final class ItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + } + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } return size; } @@ -481,18 +481,27 @@ public final class ItemOuterClass { while (true) { switch (tag) { case 8: { - // mainAffixId - mainAffixId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 32) { break; } } - case 24: { + case 32: { + // num + num = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // level level = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 48) { break; @@ -501,42 +510,33 @@ public final class ItemOuterClass { case 48: { // itemId itemId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // num - num = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { - // rank - rank = input.readUInt32(); + case 64: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 80: { // uniqueId uniqueId = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // rank + rank = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { @@ -561,26 +561,26 @@ public final class ItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.num, num); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.rank, rank); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.promotion, promotion); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.num, num); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.itemId, itemId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.uniqueId, uniqueId); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } output.endObject(); } @@ -591,11 +591,10 @@ public final class ItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -603,11 +602,22 @@ public final class ItemOuterClass { } break; } + case 109446: { + if (input.isAtField(FieldNames.num)) { + if (!input.trySkipNullValue()) { + num = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 102865796: { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -619,17 +629,6 @@ public final class ItemOuterClass { if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { itemId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 109446: { - if (input.isAtField(FieldNames.num)) { - if (!input.trySkipNullValue()) { - num = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -637,10 +636,11 @@ public final class ItemOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -648,22 +648,22 @@ public final class ItemOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } case -294460212: case -538310583: { if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { uniqueId = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -723,19 +723,19 @@ public final class ItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName promotion = FieldName.forField("promotion"); + + static final FieldName num = FieldName.forField("num"); static final FieldName level = FieldName.forField("level"); static final FieldName itemId = FieldName.forField("itemId", "item_id"); - static final FieldName num = FieldName.forField("num"); - - static final FieldName rank = FieldName.forField("rank"); - - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + + static final FieldName rank = FieldName.forField("rank"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java index 98b5eb9..7a0bfd4 100644 --- a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java @@ -19,37 +19,37 @@ public final class JoinLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 4; - */ - private int slot; - - /** - * optional uint32 index = 5; - */ - private int index; - - /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 5; */ private int planeId; /** - * optional uint32 base_avatar_id = 15; + * optional uint32 slot = 6; + */ + private int slot; + + /** + * optional uint32 index = 11; + */ + private int index; + + /** + * optional uint32 base_avatar_id = 12; */ private int baseAvatarId; /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 7; */ private int avatarType; /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 10; */ private int extraLineupType; /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 3; */ private boolean isVirtual; @@ -64,99 +64,25 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 slot = 4; - * @return whether the slot field is set + * optional uint32 plane_id = 5; + * @return whether the planeId field is set */ - public boolean hasSlot() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 4; - * @return this - */ - public JoinLineupCsReq clearSlot() { - bitField0_ &= ~0x00000001; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 4; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 4; - * @param value the slot to set - * @return this - */ - public JoinLineupCsReq setSlot(final int value) { - bitField0_ |= 0x00000001; - slot = value; - return this; - } - - /** - * optional uint32 index = 5; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 5; - * @return this - */ - public JoinLineupCsReq clearIndex() { - bitField0_ &= ~0x00000002; - index = 0; - return this; - } - - /** - * optional uint32 index = 5; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 5; - * @param value the index to set - * @return this - */ - public JoinLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000002; - index = value; - return this; - } - - /** - * optional uint32 plane_id = 7; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 5; * @return this */ public JoinLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; planeId = 0; return this; } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 5; * @return the planeId */ public int getPlaneId() { @@ -164,18 +90,92 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 7; + * optional uint32 plane_id = 5; * @param value the planeId to set * @return this */ public JoinLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; planeId = value; return this; } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 slot = 6; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 slot = 6; + * @return this + */ + public JoinLineupCsReq clearSlot() { + bitField0_ &= ~0x00000002; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 6; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 6; + * @param value the slot to set + * @return this + */ + public JoinLineupCsReq setSlot(final int value) { + bitField0_ |= 0x00000002; + slot = value; + return this; + } + + /** + * optional uint32 index = 11; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 11; + * @return this + */ + public JoinLineupCsReq clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 11; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 11; + * @param value the index to set + * @return this + */ + public JoinLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 12; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -183,7 +183,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 12; * @return this */ public JoinLineupCsReq clearBaseAvatarId() { @@ -193,7 +193,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 12; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -201,7 +201,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 15; + * optional uint32 base_avatar_id = 12; * @param value the baseAvatarId to set * @return this */ @@ -212,7 +212,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 7; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -220,7 +220,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 7; * @return this */ public JoinLineupCsReq clearAvatarType() { @@ -230,7 +230,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 7; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -263,7 +263,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 7; * @param value the avatarType to set * @return this */ @@ -274,7 +274,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 10; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -282,7 +282,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 10; * @return this */ public JoinLineupCsReq clearExtraLineupType() { @@ -292,7 +292,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 10; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -325,7 +325,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 10; * @param value the extraLineupType to set * @return this */ @@ -337,7 +337,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 3; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -345,7 +345,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 3; * @return this */ public JoinLineupCsReq clearIsVirtual() { @@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 3; * @return the isVirtual */ public boolean getIsVirtual() { @@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 3; * @param value the isVirtual to set * @return this */ @@ -378,9 +378,9 @@ public final class JoinLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + planeId = other.planeId; slot = other.slot; index = other.index; - planeId = other.planeId; baseAvatarId = other.baseAvatarId; avatarType = other.avatarType; extraLineupType = other.extraLineupType; @@ -395,15 +395,15 @@ public final class JoinLineupCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasPlaneId()) { + setPlaneId(other.planeId); + } if (other.hasSlot()) { setSlot(other.slot); } if (other.hasIndex()) { setIndex(other.index); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } @@ -426,9 +426,9 @@ public final class JoinLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + planeId = 0; slot = 0; index = 0; - planeId = 0; baseAvatarId = 0; avatarType = 0; extraLineupType = 0; @@ -456,9 +456,9 @@ public final class JoinLineupCsReqOuterClass { } JoinLineupCsReq other = (JoinLineupCsReq) o; return bitField0_ == other.bitField0_ + && (!hasPlaneId() || planeId == other.planeId) && (!hasSlot() || slot == other.slot) && (!hasIndex() || index == other.index) - && (!hasPlaneId() || planeId == other.planeId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) @@ -468,31 +468,31 @@ public final class JoinLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(slot); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); output.writeUInt32NoTag(planeId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(slot); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(index); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 56); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isVirtual); } } @@ -501,13 +501,13 @@ public final class JoinLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); @@ -531,43 +531,43 @@ public final class JoinLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // slot - slot = input.readUInt32(); + case 40: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 48) { break; } } - case 40: { + case 48: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // index index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -575,11 +575,11 @@ public final class JoinLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -587,11 +587,11 @@ public final class JoinLineupCsReqOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 8) { + if (tag != 24) { break; } } - case 8: { + case 24: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; @@ -618,13 +618,13 @@ public final class JoinLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); @@ -648,11 +648,23 @@ public final class JoinLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { + if (!input.trySkipNullValue()) { + planeId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 3533310: { if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { slot = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -663,18 +675,6 @@ public final class JoinLineupCsReqOuterClass { if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { index = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -793,12 +793,12 @@ public final class JoinLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); + static final FieldName slot = FieldName.forField("slot"); static final FieldName index = FieldName.forField("index"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java index ff8b71c..70103db 100644 --- a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java @@ -24,20 +24,20 @@ public final class LeaveRogueScRspOuterClass { private int retcode; /** - * optional .SceneInfo scene = 6; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 6; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); + /** + * optional .SceneInfo scene = 12; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + private LeaveRogueScRsp() { } @@ -86,82 +86,25 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 6; - * @return whether the scene field is set + * optional .LineupInfo lineup = 6; + * @return whether the lineup field is set */ - public boolean hasScene() { + public boolean hasLineup() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .SceneInfo scene = 6; - * @return this - */ - public LeaveRogueScRsp clearScene() { - bitField0_ &= ~0x00000002; - scene.clear(); - return this; - } - - /** - * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000002; - return scene; - } - - /** - * optional .SceneInfo scene = 6; - * @param value the scene to set - * @return this - */ - public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000002; - scene.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 7; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 6; * @return this */ public LeaveRogueScRsp clearLineup() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 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. @@ -175,7 +118,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 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 @@ -184,41 +127,41 @@ public final class LeaveRogueScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return lineup; } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 6; * @param value the lineup to set * @return this */ public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lineup.copyFrom(value); return this; } /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; * @return this */ public LeaveRogueScRsp clearRogueInfo() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; rogueInfo.clear(); return this; } /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; * * 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. @@ -232,7 +175,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -241,30 +184,87 @@ public final class LeaveRogueScRspOuterClass { * @return internal storage object for modifications */ public RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return rogueInfo; } /** - * optional .RogueInfo rogue_info = 13; + * optional .RogueInfo rogue_info = 9; * @param value the rogueInfo to set * @return this */ public LeaveRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; rogueInfo.copyFrom(value); return this; } + /** + * optional .SceneInfo scene = 12; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .SceneInfo scene = 12; + * @return this + */ + public LeaveRogueScRsp clearScene() { + bitField0_ &= ~0x00000008; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000008; + return scene; + } + + /** + * optional .SceneInfo scene = 12; + * @param value the scene to set + * @return this + */ + public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000008; + scene.copyFrom(value); + return this; + } + @Override public LeaveRogueScRsp copyFrom(final LeaveRogueScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - scene.copyFrom(other.scene); lineup.copyFrom(other.lineup); rogueInfo.copyFrom(other.rogueInfo); + scene.copyFrom(other.scene); } return this; } @@ -278,15 +278,15 @@ public final class LeaveRogueScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasScene()) { - getMutableScene().mergeFrom(other.scene); - } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } return this; } @@ -298,9 +298,9 @@ public final class LeaveRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - scene.clear(); lineup.clear(); rogueInfo.clear(); + scene.clear(); return this; } @@ -311,9 +311,9 @@ public final class LeaveRogueScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - scene.clearQuick(); lineup.clearQuick(); rogueInfo.clearQuick(); + scene.clearQuick(); return this; } @@ -328,9 +328,9 @@ public final class LeaveRogueScRspOuterClass { LeaveRogueScRsp other = (LeaveRogueScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasScene() || scene.equals(other.scene)) && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); + && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) + && (!hasScene() || scene.equals(other.scene)); } @Override @@ -341,16 +341,16 @@ public final class LeaveRogueScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 50); - output.writeMessageNoTag(scene); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); output.writeMessageNoTag(lineup); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 106); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(scene); + } } @Override @@ -360,14 +360,14 @@ public final class LeaveRogueScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + } return size; } @@ -388,26 +388,26 @@ public final class LeaveRogueScRspOuterClass { } } case 50: { - // scene - input.readMessage(scene); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { // lineup input.readMessage(lineup); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 74) { break; } } - case 106: { + case 74: { // rogueInfo input.readMessage(rogueInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -435,14 +435,14 @@ public final class LeaveRogueScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.scene, scene); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.lineup, lineup); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rogueInfo, rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.scene, scene); + } output.endObject(); } @@ -464,22 +464,11 @@ public final class LeaveRogueScRspOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { - if (!input.trySkipNullValue()) { - input.readMessage(scene); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1102671473: { if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { input.readMessage(lineup); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -491,6 +480,17 @@ public final class LeaveRogueScRspOuterClass { if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueInfo); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109254796: { + if (input.isAtField(FieldNames.scene)) { + if (!input.trySkipNullValue()) { + input.readMessage(scene); bitField0_ |= 0x00000008; } } else { @@ -553,11 +553,11 @@ public final class LeaveRogueScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName scene = FieldName.forField("scene"); - static final FieldName lineup = FieldName.forField("lineup"); static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); + + static final FieldName scene = FieldName.forField("scene"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java index 6047cea..deb55cb 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java @@ -19,32 +19,32 @@ public final class LineupAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 hp = 5; + * optional uint32 hp = 2; */ private int hp; /** - * optional uint32 satiety = 8; + * optional uint32 satiety = 9; */ private int satiety; + /** + * optional uint32 id = 11; + */ + private int id; + /** * optional uint32 slot = 13; */ private int slot; - /** - * optional uint32 id = 15; - */ - private int id; - /** * optional .AvatarType avatar_type = 12; */ private int avatarType; /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 7; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -59,7 +59,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 5; + * optional uint32 hp = 2; * @return whether the hp field is set */ public boolean hasHp() { @@ -67,7 +67,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 5; + * optional uint32 hp = 2; * @return this */ public LineupAvatar clearHp() { @@ -77,7 +77,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 5; + * optional uint32 hp = 2; * @return the hp */ public int getHp() { @@ -85,7 +85,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 5; + * optional uint32 hp = 2; * @param value the hp to set * @return this */ @@ -96,7 +96,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 satiety = 8; + * optional uint32 satiety = 9; * @return whether the satiety field is set */ public boolean hasSatiety() { @@ -104,7 +104,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 satiety = 8; + * optional uint32 satiety = 9; * @return this */ public LineupAvatar clearSatiety() { @@ -114,7 +114,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 satiety = 8; + * optional uint32 satiety = 9; * @return the satiety */ public int getSatiety() { @@ -122,7 +122,7 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 satiety = 8; + * optional uint32 satiety = 9; * @param value the satiety to set * @return this */ @@ -132,12 +132,49 @@ public final class LineupAvatarOuterClass { return this; } + /** + * optional uint32 id = 11; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 id = 11; + * @return this + */ + public LineupAvatar clearId() { + bitField0_ &= ~0x00000004; + id = 0; + return this; + } + + /** + * optional uint32 id = 11; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 11; + * @param value the id to set + * @return this + */ + public LineupAvatar setId(final int value) { + bitField0_ |= 0x00000004; + id = value; + return this; + } + /** * optional uint32 slot = 13; * @return whether the slot field is set */ public boolean hasSlot() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -145,7 +182,7 @@ public final class LineupAvatarOuterClass { * @return this */ public LineupAvatar clearSlot() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; slot = 0; return this; } @@ -164,45 +201,8 @@ public final class LineupAvatarOuterClass { * @return this */ public LineupAvatar setSlot(final int value) { - bitField0_ |= 0x00000004; - slot = value; - return this; - } - - /** - * optional uint32 id = 15; - * @return whether the id field is set - */ - public boolean hasId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 id = 15; - * @return this - */ - public LineupAvatar clearId() { - bitField0_ &= ~0x00000008; - id = 0; - return this; - } - - /** - * optional uint32 id = 15; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 15; - * @param value the id to set - * @return this - */ - public LineupAvatar setId(final int value) { bitField0_ |= 0x00000008; - id = value; + slot = value; return this; } @@ -269,7 +269,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 7; * @return whether the spBar field is set */ public boolean hasSpBar() { @@ -277,7 +277,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 7; * @return this */ public LineupAvatar clearSpBar() { @@ -287,7 +287,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 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. @@ -301,7 +301,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 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 @@ -315,7 +315,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 11; + * optional .SpBarInfo sp_bar = 7; * @param value the spBar to set * @return this */ @@ -332,8 +332,8 @@ public final class LineupAvatarOuterClass { bitField0_ = other.bitField0_; hp = other.hp; satiety = other.satiety; - slot = other.slot; id = other.id; + slot = other.slot; avatarType = other.avatarType; spBar.copyFrom(other.spBar); } @@ -352,12 +352,12 @@ public final class LineupAvatarOuterClass { if (other.hasSatiety()) { setSatiety(other.satiety); } - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasId()) { setId(other.id); } + if (other.hasSlot()) { + setSlot(other.slot); + } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -376,8 +376,8 @@ public final class LineupAvatarOuterClass { bitField0_ = 0; hp = 0; satiety = 0; - slot = 0; id = 0; + slot = 0; avatarType = 0; spBar.clear(); return this; @@ -406,8 +406,8 @@ public final class LineupAvatarOuterClass { return bitField0_ == other.bitField0_ && (!hasHp() || hp == other.hp) && (!hasSatiety() || satiety == other.satiety) - && (!hasSlot() || slot == other.slot) && (!hasId() || id == other.id) + && (!hasSlot() || slot == other.slot) && (!hasAvatarType() || avatarType == other.avatarType) && (!hasSpBar() || spBar.equals(other.spBar)); } @@ -415,27 +415,27 @@ public final class LineupAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(hp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(satiety); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(id); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 96); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 58); output.writeMessageNoTag(spBar); } } @@ -450,10 +450,10 @@ public final class LineupAvatarOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -471,20 +471,29 @@ public final class LineupAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // hp hp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { + case 72: { // satiety satiety = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 104) { break; } @@ -492,15 +501,6 @@ public final class LineupAvatarOuterClass { case 104: { // slot slot = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // id - id = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 96) { @@ -515,11 +515,11 @@ public final class LineupAvatarOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 90) { + if (tag != 58) { break; } } - case 90: { + case 58: { // spBar input.readMessage(spBar); bitField0_ |= 0x00000020; @@ -552,10 +552,10 @@ public final class LineupAvatarOuterClass { output.writeUInt32(FieldNames.satiety, satiety); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -595,10 +595,10 @@ public final class LineupAvatarOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -606,10 +606,10 @@ public final class LineupAvatarOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -702,10 +702,10 @@ public final class LineupAvatarOuterClass { static final FieldName satiety = FieldName.forField("satiety"); - static final FieldName slot = FieldName.forField("slot"); - static final FieldName id = FieldName.forField("id"); + static final FieldName slot = FieldName.forField("slot"); + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); static final FieldName spBar = FieldName.forField("spBar", "sp_bar"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java index 006a024..1d59eb5 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java @@ -26,42 +26,42 @@ public final class LineupInfoOuterClass { private int planeId; /** - * optional uint32 max_mp = 9; - */ - private int maxMp; - - /** - * optional uint32 mp = 11; + * optional uint32 mp = 4; */ private int mp; /** - * optional uint32 leader_slot = 12; - */ - private int leaderSlot; - - /** - * optional uint32 index = 13; + * optional uint32 index = 7; */ private int index; /** - * optional .ExtraLineupType extra_lineup_type = 10; + * optional uint32 leader_slot = 11; + */ + private int leaderSlot; + + /** + * optional uint32 max_mp = 14; + */ + private int maxMp; + + /** + * optional .ExtraLineupType extra_lineup_type = 6; */ private int extraLineupType; /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 10; */ private boolean isVirtual; /** - * optional string name = 5; + * optional string name = 1; */ private final Utf8String name = Utf8String.newEmptyInstance(); /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 5; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory()); @@ -113,62 +113,25 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 max_mp = 9; - * @return whether the maxMp field is set + * optional uint32 mp = 4; + * @return whether the mp field is set */ - public boolean hasMaxMp() { + public boolean hasMp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 max_mp = 9; - * @return this - */ - public LineupInfo clearMaxMp() { - bitField0_ &= ~0x00000002; - maxMp = 0; - return this; - } - - /** - * optional uint32 max_mp = 9; - * @return the maxMp - */ - public int getMaxMp() { - return maxMp; - } - - /** - * optional uint32 max_mp = 9; - * @param value the maxMp to set - * @return this - */ - public LineupInfo setMaxMp(final int value) { - bitField0_ |= 0x00000002; - maxMp = value; - return this; - } - - /** - * optional uint32 mp = 11; - * @return whether the mp field is set - */ - public boolean hasMp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 mp = 11; + * optional uint32 mp = 4; * @return this */ public LineupInfo clearMp() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; mp = 0; return this; } /** - * optional uint32 mp = 11; + * optional uint32 mp = 4; * @return the mp */ public int getMp() { @@ -176,18 +139,55 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 mp = 11; + * optional uint32 mp = 4; * @param value the mp to set * @return this */ public LineupInfo setMp(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; mp = value; return this; } /** - * optional uint32 leader_slot = 12; + * optional uint32 index = 7; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 index = 7; + * @return this + */ + public LineupInfo clearIndex() { + bitField0_ &= ~0x00000004; + index = 0; + return this; + } + + /** + * optional uint32 index = 7; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 7; + * @param value the index to set + * @return this + */ + public LineupInfo setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + + /** + * optional uint32 leader_slot = 11; * @return whether the leaderSlot field is set */ public boolean hasLeaderSlot() { @@ -195,7 +195,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 12; + * optional uint32 leader_slot = 11; * @return this */ public LineupInfo clearLeaderSlot() { @@ -205,7 +205,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 12; + * optional uint32 leader_slot = 11; * @return the leaderSlot */ public int getLeaderSlot() { @@ -213,7 +213,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 12; + * optional uint32 leader_slot = 11; * @param value the leaderSlot to set * @return this */ @@ -224,44 +224,44 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 index = 13; - * @return whether the index field is set + * optional uint32 max_mp = 14; + * @return whether the maxMp field is set */ - public boolean hasIndex() { + public boolean hasMaxMp() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 index = 13; + * optional uint32 max_mp = 14; * @return this */ - public LineupInfo clearIndex() { + public LineupInfo clearMaxMp() { bitField0_ &= ~0x00000010; - index = 0; + maxMp = 0; return this; } /** - * optional uint32 index = 13; - * @return the index + * optional uint32 max_mp = 14; + * @return the maxMp */ - public int getIndex() { - return index; + public int getMaxMp() { + return maxMp; } /** - * optional uint32 index = 13; - * @param value the index to set + * optional uint32 max_mp = 14; + * @param value the maxMp to set * @return this */ - public LineupInfo setIndex(final int value) { + public LineupInfo setMaxMp(final int value) { bitField0_ |= 0x00000010; - index = value; + maxMp = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 10; + * optional .ExtraLineupType extra_lineup_type = 6; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -269,7 +269,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 10; + * optional .ExtraLineupType extra_lineup_type = 6; * @return this */ public LineupInfo clearExtraLineupType() { @@ -279,7 +279,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 10; + * optional .ExtraLineupType extra_lineup_type = 6; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -312,7 +312,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 10; + * optional .ExtraLineupType extra_lineup_type = 6; * @param value the extraLineupType to set * @return this */ @@ -323,7 +323,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 10; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -331,7 +331,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 10; * @return this */ public LineupInfo clearIsVirtual() { @@ -341,7 +341,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 10; * @return the isVirtual */ public boolean getIsVirtual() { @@ -349,7 +349,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 2; + * optional bool is_virtual = 10; * @param value the isVirtual to set * @return this */ @@ -360,7 +360,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @return whether the name field is set */ public boolean hasName() { @@ -368,7 +368,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @return this */ public LineupInfo clearName() { @@ -378,7 +378,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @return the name */ public String getName() { @@ -386,7 +386,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -394,7 +394,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -403,7 +403,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @param value the name to set * @return this */ @@ -414,7 +414,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 5; + * optional string name = 1; * @param value the name to set * @return this */ @@ -425,7 +425,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 5; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -433,7 +433,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 5; * @return this */ public LineupInfo clearAvatarList() { @@ -443,7 +443,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 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. @@ -457,7 +457,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 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 @@ -471,7 +471,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 5; * @param value the avatarList to add * @return this */ @@ -482,7 +482,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 7; + * repeated .LineupAvatar avatar_list = 5; * @param values the avatarList to add * @return this */ @@ -498,10 +498,10 @@ public final class LineupInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; planeId = other.planeId; - maxMp = other.maxMp; mp = other.mp; - leaderSlot = other.leaderSlot; index = other.index; + leaderSlot = other.leaderSlot; + maxMp = other.maxMp; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; name.copyFrom(other.name); @@ -519,17 +519,17 @@ public final class LineupInfoOuterClass { if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasMaxMp()) { - setMaxMp(other.maxMp); - } if (other.hasMp()) { setMp(other.mp); } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasLeaderSlot()) { setLeaderSlot(other.leaderSlot); } - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasMaxMp()) { + setMaxMp(other.maxMp); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -554,10 +554,10 @@ public final class LineupInfoOuterClass { cachedSize = -1; bitField0_ = 0; planeId = 0; - maxMp = 0; mp = 0; - leaderSlot = 0; index = 0; + leaderSlot = 0; + maxMp = 0; extraLineupType = 0; isVirtual = false; name.clear(); @@ -588,10 +588,10 @@ public final class LineupInfoOuterClass { LineupInfo other = (LineupInfo) o; return bitField0_ == other.bitField0_ && (!hasPlaneId() || planeId == other.planeId) - && (!hasMaxMp() || maxMp == other.maxMp) && (!hasMp() || mp == other.mp) - && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) && (!hasIndex() || index == other.index) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) + && (!hasMaxMp() || maxMp == other.maxMp) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasName() || name.equals(other.name)) @@ -605,36 +605,36 @@ public final class LineupInfoOuterClass { output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(maxMp); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(mp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(index); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(leaderSlot); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxMp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 10); output.writeStringNoTag(name); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(avatarList.get(i)); } } @@ -647,16 +647,16 @@ public final class LineupInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -685,47 +685,47 @@ public final class LineupInfoOuterClass { planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { - // maxMp - maxMp = input.readUInt32(); + case 32: { + // mp + mp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // mp - mp = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // leaderSlot leaderSlot = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // index - index = input.readUInt32(); + case 112: { + // maxMp + maxMp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -733,29 +733,29 @@ public final class LineupInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 16) { + if (tag != 80) { break; } } - case 16: { + case 80: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // name + input.readString(name); + bitField0_ |= 0x00000080; + tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // name - input.readString(name); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000100; @@ -784,16 +784,16 @@ public final class LineupInfoOuterClass { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.maxMp, maxMp); + output.writeUInt32(FieldNames.mp, mp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.mp, mp); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.maxMp, maxMp); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -829,11 +829,10 @@ public final class LineupInfoOuterClass { } break; } - case 103671335: - case -1081138594: { - if (input.isAtField(FieldNames.maxMp)) { + case 3491: { + if (input.isAtField(FieldNames.mp)) { if (!input.trySkipNullValue()) { - maxMp = input.readUInt32(); + mp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -841,10 +840,10 @@ public final class LineupInfoOuterClass { } break; } - case 3491: { - if (input.isAtField(FieldNames.mp)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - mp = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -864,10 +863,11 @@ public final class LineupInfoOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 103671335: + case -1081138594: { + if (input.isAtField(FieldNames.maxMp)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + maxMp = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -981,13 +981,13 @@ public final class LineupInfoOuterClass { static class FieldNames { static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); - static final FieldName mp = FieldName.forField("mp"); + static final FieldName index = FieldName.forField("index"); + static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); - static final FieldName index = FieldName.forField("index"); + static final FieldName maxMp = FieldName.forField("maxMp", "max_mp"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java index d2d3b81..47d9a93 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java @@ -19,7 +19,7 @@ public final class LineupSlotDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 3; + * optional uint32 id = 5; */ private int id; @@ -29,7 +29,7 @@ public final class LineupSlotDataOuterClass { private int slot; /** - * optional .AvatarType avatar_type = 12; + * optional .AvatarType avatar_type = 8; */ private int avatarType; @@ -44,7 +44,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 5; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 5; * @return this */ public LineupSlotData clearId() { @@ -62,7 +62,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 5; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 3; + * optional uint32 id = 5; * @param value the id to set * @return this */ @@ -118,7 +118,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 12; + * optional .AvatarType avatar_type = 8; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 12; + * optional .AvatarType avatar_type = 8; * @return this */ public LineupSlotData clearAvatarType() { @@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 12; + * optional .AvatarType avatar_type = 8; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 12; + * optional .AvatarType avatar_type = 8; * @param value the avatarType to set * @return this */ @@ -250,7 +250,7 @@ public final class LineupSlotDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { @@ -258,7 +258,7 @@ public final class LineupSlotDataOuterClass { output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeEnumNoTag(avatarType); } } @@ -285,7 +285,7 @@ public final class LineupSlotDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; @@ -299,11 +299,11 @@ public final class LineupSlotDataOuterClass { slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java index 0f954cc..8edd68d 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class LockEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool is_protected = 6; + * optional bool is_protected = 9; */ private boolean isProtected; /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 11; */ private final RepeatedInt equipmentIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 6; + * optional bool is_protected = 9; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -48,7 +48,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 6; + * optional bool is_protected = 9; * @return this */ public LockEquipmentCsReq clearIsProtected() { @@ -58,7 +58,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 6; + * optional bool is_protected = 9; * @return the isProtected */ public boolean getIsProtected() { @@ -66,7 +66,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 6; + * optional bool is_protected = 9; * @param value the isProtected to set * @return this */ @@ -77,7 +77,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 11; * @return whether the equipmentIdList field is set */ public boolean hasEquipmentIdList() { @@ -85,7 +85,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 11; * @return this */ public LockEquipmentCsReq clearEquipmentIdList() { @@ -95,7 +95,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 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. @@ -109,7 +109,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 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 @@ -123,7 +123,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 11; * @param value the equipmentIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 3; + * repeated uint32 equipment_id_list = 11; * @param values the equipmentIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class LockEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < equipmentIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(equipmentIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class LockEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 72: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 90) { break; } } - case 26: { + case 90: { // equipmentIdList [packed=true] input.readPackedUInt32(equipmentIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class LockEquipmentCsReqOuterClass { tag = input.readTag(); break; } - case 24: { + case 88: { // equipmentIdList [packed=false] tag = input.readRepeatedUInt32(equipmentIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java index 76cbebc..199082c 100644 --- a/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockEquipmentScRspOuterClass.java @@ -19,7 +19,7 @@ public final class LockEquipmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; */ private int retcode; @@ -34,7 +34,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -42,7 +42,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return this */ public LockEquipmentScRsp clearRetcode() { @@ -52,7 +52,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -60,7 +60,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -129,7 +129,7 @@ public final class LockEquipmentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } } @@ -150,7 +150,7 @@ public final class LockEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java index 2b078e6..9f52de2 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class LockRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 9; + * optional uint32 relic_unique_id = 6; */ private int relicUniqueId; /** - * optional bool is_protected = 7; + * optional bool is_protected = 4; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 9; + * optional uint32 relic_unique_id = 6; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 9; + * optional uint32 relic_unique_id = 6; * @return this */ public LockRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 9; + * optional uint32 relic_unique_id = 6; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 9; + * optional uint32 relic_unique_id = 6; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 7; + * optional bool is_protected = 4; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 7; + * optional bool is_protected = 4; * @return this */ public LockRelicCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 7; + * optional bool is_protected = 4; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 7; + * optional bool is_protected = 4; * @param value the isProtected to set * @return this */ @@ -177,11 +177,11 @@ public final class LockRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 48: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 32) { break; } } - case 56: { + case 32: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java index ff99ee3..c0d2041 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class MarkAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 6; */ private int avatarId; /** - * optional bool is_marked = 2; + * optional bool is_marked = 8; */ private boolean isMarked; @@ -39,7 +39,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 6; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 6; * @return this */ public MarkAvatarCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 6; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 6; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 8; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -84,7 +84,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 8; * @return this */ public MarkAvatarCsReq clearIsMarked() { @@ -94,7 +94,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 8; * @return the isMarked */ public boolean getIsMarked() { @@ -102,7 +102,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 8; * @param value the isMarked to set * @return this */ @@ -177,11 +177,11 @@ public final class MarkAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isMarked); } } @@ -205,16 +205,16 @@ public final class MarkAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { + case 64: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java index 6a06ad6..4c1d058 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java @@ -19,17 +19,17 @@ public final class MarkAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; - */ - private int retcode; - - /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 6; */ private int avatarId; /** - * optional bool is_marked = 2; + * optional uint32 retcode = 10; + */ + private int retcode; + + /** + * optional bool is_marked = 3; */ private boolean isMarked; @@ -44,62 +44,25 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set + * optional uint32 avatar_id = 6; + * @return whether the avatarId field is set */ - public boolean hasRetcode() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 4; - * @return this - */ - public MarkAvatarScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 4; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 4; - * @param value the retcode to set - * @return this - */ - public MarkAvatarScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 avatar_id = 8; - * @return whether the avatarId field is set - */ - public boolean hasAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 6; * @return this */ public MarkAvatarScRsp clearAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 6; * @return the avatarId */ public int getAvatarId() { @@ -107,18 +70,55 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 8; + * optional uint32 avatar_id = 6; * @param value the avatarId to set * @return this */ public MarkAvatarScRsp setAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; avatarId = value; return this; } /** - * optional bool is_marked = 2; + * optional uint32 retcode = 10; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public MarkAvatarScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 10; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 10; + * @param value the retcode to set + * @return this + */ + public MarkAvatarScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional bool is_marked = 3; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -126,7 +126,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @return this */ public MarkAvatarScRsp clearIsMarked() { @@ -136,7 +136,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @return the isMarked */ public boolean getIsMarked() { @@ -144,7 +144,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 2; + * optional bool is_marked = 3; * @param value the isMarked to set * @return this */ @@ -159,8 +159,8 @@ public final class MarkAvatarScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; avatarId = other.avatarId; + retcode = other.retcode; isMarked = other.isMarked; } return this; @@ -172,12 +172,12 @@ public final class MarkAvatarScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasIsMarked()) { setIsMarked(other.isMarked); } @@ -191,8 +191,8 @@ public final class MarkAvatarScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; avatarId = 0; + retcode = 0; isMarked = false; return this; } @@ -217,23 +217,23 @@ public final class MarkAvatarScRspOuterClass { } MarkAvatarScRsp other = (MarkAvatarScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasRetcode() || retcode == other.retcode) && (!hasIsMarked() || isMarked == other.isMarked); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(avatarId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isMarked); } } @@ -242,10 +242,10 @@ public final class MarkAvatarScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class MarkAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 48: { // avatarId avatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 80) { break; } } - case 16: { + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class MarkAvatarScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isMarked, isMarked); @@ -323,10 +323,11 @@ public final class MarkAvatarScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -334,11 +335,10 @@ public final class MarkAvatarScRspOuterClass { } break; } - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class MarkAvatarScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName isMarked = FieldName.forField("isMarked", "is_marked"); } } diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java index 115ba8b..55b249b 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class MarkReadMailCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 2; + * optional uint32 id = 9; */ private int id; @@ -34,7 +34,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 9; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 9; * @return this */ public MarkReadMailCsReq clearId() { @@ -52,7 +52,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 9; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 2; + * optional uint32 id = 9; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public final class MarkReadMailCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class MarkReadMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java index f4173a2..d21d0cc 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkReadMailScRspOuterClass.java @@ -19,12 +19,12 @@ public final class MarkReadMailScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 4; + * optional uint32 id = 6; */ private int id; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 7; */ private int retcode; @@ -39,7 +39,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 6; * @return whether the id field is set */ public boolean hasId() { @@ -47,7 +47,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 6; * @return this */ public MarkReadMailScRsp clearId() { @@ -57,7 +57,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 6; * @return the id */ public int getId() { @@ -65,7 +65,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 6; * @param value the id to set * @return this */ @@ -76,7 +76,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 7; * @return this */ public MarkReadMailScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class MarkReadMailScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class MarkReadMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 48: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java index 754248d..8c8c14c 100644 --- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java @@ -19,15 +19,15 @@ public final class MaterialOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 6; - */ - private int tid; - - /** - * optional uint32 num = 8; + * optional uint32 num = 5; */ private int num; + /** + * optional uint32 tid = 7; + */ + private int tid; + private Material() { } @@ -39,62 +39,25 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 6; - * @return whether the tid field is set + * optional uint32 num = 5; + * @return whether the num field is set */ - public boolean hasTid() { + public boolean hasNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 6; - * @return this - */ - public Material clearTid() { - bitField0_ &= ~0x00000001; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 6; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 6; - * @param value the tid to set - * @return this - */ - public Material setTid(final int value) { - bitField0_ |= 0x00000001; - tid = value; - return this; - } - - /** - * optional uint32 num = 8; - * @return whether the num field is set - */ - public boolean hasNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 num = 8; + * optional uint32 num = 5; * @return this */ public Material clearNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; num = 0; return this; } /** - * optional uint32 num = 8; + * optional uint32 num = 5; * @return the num */ public int getNum() { @@ -102,23 +65,60 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 8; + * optional uint32 num = 5; * @param value the num to set * @return this */ public Material setNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; num = value; return this; } + /** + * optional uint32 tid = 7; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 tid = 7; + * @return this + */ + public Material clearTid() { + bitField0_ &= ~0x00000002; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 7; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 7; + * @param value the tid to set + * @return this + */ + public Material setTid(final int value) { + bitField0_ |= 0x00000002; + tid = value; + return this; + } + @Override public Material copyFrom(final Material other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; num = other.num; + tid = other.tid; } return this; } @@ -129,12 +129,12 @@ public final class MaterialOuterClass { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasNum()) { setNum(other.num); } + if (other.hasTid()) { + setTid(other.tid); + } return this; } @@ -145,8 +145,8 @@ public final class MaterialOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; num = 0; + tid = 0; return this; } @@ -170,19 +170,19 @@ public final class MaterialOuterClass { } Material other = (Material) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) - && (!hasNum() || num == other.num); + && (!hasNum() || num == other.num) + && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(tid); } } @@ -190,10 +190,10 @@ public final class MaterialOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } return size; } @@ -205,18 +205,18 @@ public final class MaterialOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // tid - tid = input.readUInt32(); + case 40: { + // num + num = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // num - num = input.readUInt32(); + case 56: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class MaterialOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.tid, tid); } output.endObject(); } @@ -256,10 +256,10 @@ public final class MaterialOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class MaterialOuterClass { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 114831: { + if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + tid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -330,9 +330,9 @@ public final class MaterialOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); - static final FieldName num = FieldName.forField("num"); + + static final FieldName tid = FieldName.forField("tid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java index c520daf..6126b7d 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java @@ -19,17 +19,17 @@ public final class MazeChestOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 total_amount_list = 7; + * optional uint32 total_amount_list = 3; */ private int totalAmountList; /** - * optional uint32 unlocked_amount_list = 12; + * optional uint32 unlocked_amount_list = 7; */ private int unlockedAmountList; /** - * optional .MapInfoChestType map_info_chest_type = 8; + * optional .MapInfoChestType map_info_chest_type = 4; */ private int mapInfoChestType; @@ -44,7 +44,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 7; + * optional uint32 total_amount_list = 3; * @return whether the totalAmountList field is set */ public boolean hasTotalAmountList() { @@ -52,7 +52,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 7; + * optional uint32 total_amount_list = 3; * @return this */ public MazeChest clearTotalAmountList() { @@ -62,7 +62,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 7; + * optional uint32 total_amount_list = 3; * @return the totalAmountList */ public int getTotalAmountList() { @@ -70,7 +70,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 7; + * optional uint32 total_amount_list = 3; * @param value the totalAmountList to set * @return this */ @@ -81,7 +81,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 12; + * optional uint32 unlocked_amount_list = 7; * @return whether the unlockedAmountList field is set */ public boolean hasUnlockedAmountList() { @@ -89,7 +89,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 12; + * optional uint32 unlocked_amount_list = 7; * @return this */ public MazeChest clearUnlockedAmountList() { @@ -99,7 +99,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 12; + * optional uint32 unlocked_amount_list = 7; * @return the unlockedAmountList */ public int getUnlockedAmountList() { @@ -107,7 +107,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 12; + * optional uint32 unlocked_amount_list = 7; * @param value the unlockedAmountList to set * @return this */ @@ -118,7 +118,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 8; + * optional .MapInfoChestType map_info_chest_type = 4; * @return whether the mapInfoChestType field is set */ public boolean hasMapInfoChestType() { @@ -126,7 +126,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 8; + * optional .MapInfoChestType map_info_chest_type = 4; * @return this */ public MazeChest clearMapInfoChestType() { @@ -136,7 +136,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 8; + * optional .MapInfoChestType map_info_chest_type = 4; * @return the mapInfoChestType */ public MapInfoChestTypeOuterClass.MapInfoChestType getMapInfoChestType() { @@ -169,7 +169,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 8; + * optional .MapInfoChestType map_info_chest_type = 4; * @param value the mapInfoChestType to set * @return this */ @@ -250,15 +250,15 @@ public final class MazeChestOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(totalAmountList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(unlockedAmountList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeEnumNoTag(mapInfoChestType); } } @@ -285,25 +285,25 @@ public final class MazeChestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 24: { // totalAmountList totalAmountList = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { + case 56: { // unlockedAmountList unlockedAmountList = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { + case 32: { // mapInfoChestType final int value = input.readInt32(); if (MapInfoChestTypeOuterClass.MapInfoChestType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java index 94223dc..d7dcd2b 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeGroupOuterClass.java @@ -19,12 +19,12 @@ public final class MazeGroupOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 modify_time = 15; + * optional int64 modify_time = 3; */ private long modifyTime; /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 1; */ private int groupId; @@ -39,7 +39,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 15; + * optional int64 modify_time = 3; * @return whether the modifyTime field is set */ public boolean hasModifyTime() { @@ -47,7 +47,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 15; + * optional int64 modify_time = 3; * @return this */ public MazeGroup clearModifyTime() { @@ -57,7 +57,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 15; + * optional int64 modify_time = 3; * @return the modifyTime */ public long getModifyTime() { @@ -65,7 +65,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 15; + * optional int64 modify_time = 3; * @param value the modifyTime to set * @return this */ @@ -76,7 +76,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 1; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 1; * @return this */ public MazeGroup clearGroupId() { @@ -94,7 +94,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 1; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 1; * @param value the groupId to set * @return this */ @@ -177,11 +177,11 @@ public final class MazeGroupOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeInt64NoTag(modifyTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class MazeGroupOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 24: { // modifyTime modifyTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 8) { break; } } - case 40: { + case 8: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java index 6b57678..5505ebb 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java @@ -21,42 +21,42 @@ public final class MazeMapDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 content_id = 1; */ - private int retcode; + private int contentId; /** - * optional uint32 cur_map_entry_id = 2; - */ - private int curMapEntryId; - - /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; */ private int entryId; /** - * repeated uint32 unlocked_teleport_list = 10; + * optional uint32 retcode = 7; */ - private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); + private int retcode; /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 5; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeProp maze_prop_list = 3; + * repeated uint32 unlocked_teleport_list = 14; */ - private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 3; */ private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeProp maze_prop_list = 6; + */ + private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + + /** + * repeated .MazeGroup maze_group_list = 11; */ private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); @@ -71,99 +71,62 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 content_id = 1; + * @return whether the contentId field is set */ - public boolean hasRetcode() { + public boolean hasContentId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; + * optional uint32 content_id = 1; * @return this */ - public MazeMapData clearRetcode() { + public MazeMapData clearContentId() { bitField0_ &= ~0x00000001; - retcode = 0; + contentId = 0; return this; } /** - * optional uint32 retcode = 1; - * @return the retcode + * optional uint32 content_id = 1; + * @return the contentId */ - public int getRetcode() { - return retcode; + public int getContentId() { + return contentId; } /** - * optional uint32 retcode = 1; - * @param value the retcode to set + * optional uint32 content_id = 1; + * @param value the contentId to set * @return this */ - public MazeMapData setRetcode(final int value) { + public MazeMapData setContentId(final int value) { bitField0_ |= 0x00000001; - retcode = value; + contentId = value; return this; } /** - * optional uint32 cur_map_entry_id = 2; - * @return whether the curMapEntryId field is set + * optional uint32 entry_id = 4; + * @return whether the entryId field is set */ - public boolean hasCurMapEntryId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_map_entry_id = 2; - * @return this - */ - public MazeMapData clearCurMapEntryId() { - bitField0_ &= ~0x00000002; - curMapEntryId = 0; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 2; - * @return the curMapEntryId - */ - public int getCurMapEntryId() { - return curMapEntryId; - } - - /** - * optional uint32 cur_map_entry_id = 2; - * @param value the curMapEntryId to set - * @return this - */ - public MazeMapData setCurMapEntryId(final int value) { - bitField0_ |= 0x00000002; - curMapEntryId = value; - return this; - } - - /** - * optional uint32 entry_id = 5; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @return this */ public MazeMapData clearEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entryId = 0; return this; } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @return the entryId */ public int getEntryId() { @@ -171,104 +134,73 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 entry_id = 5; + * optional uint32 entry_id = 4; * @param value the entryId to set * @return this */ public MazeMapData setEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entryId = value; return this; } /** - * repeated uint32 unlocked_teleport_list = 10; - * @return whether the unlockedTeleportList field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasUnlockedTeleportList() { + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 7; + * @return this + */ + public MazeMapData clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 7; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 7; + * @param value the retcode to set + * @return this + */ + public MazeMapData setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * repeated uint32 lighten_section_list = 5; + * @return whether the lightenSectionList field is set + */ + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 unlocked_teleport_list = 10; - * @return this - */ - public MazeMapData clearUnlockedTeleportList() { - bitField0_ &= ~0x00000008; - unlockedTeleportList.clear(); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 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 #getMutableUnlockedTeleportList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnlockedTeleportList() { - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 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 RepeatedInt getMutableUnlockedTeleportList() { - bitField0_ |= 0x00000008; - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 10; - * @param value the unlockedTeleportList to add - * @return this - */ - public MazeMapData addUnlockedTeleportList(final int value) { - bitField0_ |= 0x00000008; - unlockedTeleportList.add(value); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 10; - * @param values the unlockedTeleportList to add - * @return this - */ - public MazeMapData addAllUnlockedTeleportList(final int... values) { - bitField0_ |= 0x00000008; - unlockedTeleportList.addAll(values); - return this; - } - - /** - * repeated uint32 lighten_section_list = 12; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 5; * @return this */ public MazeMapData clearLightenSectionList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; lightenSectionList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 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. @@ -282,7 +214,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 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 @@ -291,66 +223,66 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return lightenSectionList; } /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 5; * @param value the lightenSectionList to add * @return this */ public MazeMapData addLightenSectionList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 12; + * repeated uint32 lighten_section_list = 5; * @param values the lightenSectionList to add * @return this */ public MazeMapData addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.addAll(values); return this; } /** - * repeated .MazeProp maze_prop_list = 3; - * @return whether the mazePropList field is set + * repeated uint32 unlocked_teleport_list = 14; + * @return whether the unlockedTeleportList field is set */ - public boolean hasMazePropList() { - return (bitField0_ & 0x00000020) != 0; + public boolean hasUnlockedTeleportList() { + return (bitField0_ & 0x00000010) != 0; } /** - * repeated .MazeProp maze_prop_list = 3; + * repeated uint32 unlocked_teleport_list = 14; * @return this */ - public MazeMapData clearMazePropList() { - bitField0_ &= ~0x00000020; - mazePropList.clear(); + public MazeMapData clearUnlockedTeleportList() { + bitField0_ &= ~0x00000010; + unlockedTeleportList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 3; + * repeated uint32 unlocked_teleport_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. * - * Use {@link #getMutableMazePropList()} if you want to modify it. + * Use {@link #getMutableUnlockedTeleportList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMazePropList() { - return mazePropList; + public RepeatedInt getUnlockedTeleportList() { + return unlockedTeleportList; } /** - * repeated .MazeProp maze_prop_list = 3; + * repeated uint32 unlocked_teleport_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 @@ -358,53 +290,53 @@ public final class MazeMapDataOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000020; - return mazePropList; + public RepeatedInt getMutableUnlockedTeleportList() { + bitField0_ |= 0x00000010; + return unlockedTeleportList; } /** - * repeated .MazeProp maze_prop_list = 3; - * @param value the mazePropList to add + * repeated uint32 unlocked_teleport_list = 14; + * @param value the unlockedTeleportList to add * @return this */ - public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000020; - mazePropList.add(value); + public MazeMapData addUnlockedTeleportList(final int value) { + bitField0_ |= 0x00000010; + unlockedTeleportList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 3; - * @param values the mazePropList to add + * repeated uint32 unlocked_teleport_list = 14; + * @param values the unlockedTeleportList to add * @return this */ - public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000020; - mazePropList.addAll(values); + public MazeMapData addAllUnlockedTeleportList(final int... values) { + bitField0_ |= 0x00000010; + unlockedTeleportList.addAll(values); return this; } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 3; * @return whether the unlockedChestList field is set */ public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 3; * @return this */ public MazeMapData clearUnlockedChestList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; unlockedChestList.clear(); return this; } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 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. @@ -418,7 +350,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 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 @@ -427,34 +359,102 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return unlockedChestList; } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 3; * @param value the unlockedChestList to add * @return this */ public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; unlockedChestList.add(value); return this; } /** - * repeated .MazeChest unlocked_chest_list = 9; + * repeated .MazeChest unlocked_chest_list = 3; * @param values the unlockedChestList to add * @return this */ public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; unlockedChestList.addAll(values); return this; } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeProp maze_prop_list = 6; + * @return whether the mazePropList field is set + */ + public boolean hasMazePropList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .MazeProp maze_prop_list = 6; + * @return this + */ + public MazeMapData clearMazePropList() { + bitField0_ &= ~0x00000040; + mazePropList.clear(); + return this; + } + + /** + * repeated .MazeProp maze_prop_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 #getMutableMazePropList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMazePropList() { + return mazePropList; + } + + /** + * repeated .MazeProp maze_prop_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 getMutableMazePropList() { + bitField0_ |= 0x00000040; + return mazePropList; + } + + /** + * repeated .MazeProp maze_prop_list = 6; + * @param value the mazePropList to add + * @return this + */ + public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { + bitField0_ |= 0x00000040; + mazePropList.add(value); + return this; + } + + /** + * repeated .MazeProp maze_prop_list = 6; + * @param values the mazePropList to add + * @return this + */ + public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { + bitField0_ |= 0x00000040; + mazePropList.addAll(values); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 11; * @return whether the mazeGroupList field is set */ public boolean hasMazeGroupList() { @@ -462,7 +462,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeGroup maze_group_list = 11; * @return this */ public MazeMapData clearMazeGroupList() { @@ -472,7 +472,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeGroup maze_group_list = 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. @@ -486,7 +486,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeGroup maze_group_list = 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 @@ -500,7 +500,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeGroup maze_group_list = 11; * @param value the mazeGroupList to add * @return this */ @@ -511,7 +511,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeGroup maze_group_list = 14; + * repeated .MazeGroup maze_group_list = 11; * @param values the mazeGroupList to add * @return this */ @@ -526,13 +526,13 @@ public final class MazeMapDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; - curMapEntryId = other.curMapEntryId; + contentId = other.contentId; entryId = other.entryId; - unlockedTeleportList.copyFrom(other.unlockedTeleportList); + retcode = other.retcode; lightenSectionList.copyFrom(other.lightenSectionList); - mazePropList.copyFrom(other.mazePropList); + unlockedTeleportList.copyFrom(other.unlockedTeleportList); unlockedChestList.copyFrom(other.unlockedChestList); + mazePropList.copyFrom(other.mazePropList); mazeGroupList.copyFrom(other.mazeGroupList); } return this; @@ -544,27 +544,27 @@ public final class MazeMapDataOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasCurMapEntryId()) { - setCurMapEntryId(other.curMapEntryId); + if (other.hasContentId()) { + setContentId(other.contentId); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasUnlockedTeleportList()) { - getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasLightenSectionList()) { getMutableLightenSectionList().addAll(other.lightenSectionList); } - if (other.hasMazePropList()) { - getMutableMazePropList().addAll(other.mazePropList); + if (other.hasUnlockedTeleportList()) { + getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } if (other.hasUnlockedChestList()) { getMutableUnlockedChestList().addAll(other.unlockedChestList); } + if (other.hasMazePropList()) { + getMutableMazePropList().addAll(other.mazePropList); + } if (other.hasMazeGroupList()) { getMutableMazeGroupList().addAll(other.mazeGroupList); } @@ -578,13 +578,13 @@ public final class MazeMapDataOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; - curMapEntryId = 0; + contentId = 0; entryId = 0; - unlockedTeleportList.clear(); + retcode = 0; lightenSectionList.clear(); - mazePropList.clear(); + unlockedTeleportList.clear(); unlockedChestList.clear(); + mazePropList.clear(); mazeGroupList.clear(); return this; } @@ -596,10 +596,10 @@ public final class MazeMapDataOuterClass { } cachedSize = -1; bitField0_ = 0; - unlockedTeleportList.clear(); lightenSectionList.clear(); - mazePropList.clearQuick(); + unlockedTeleportList.clear(); unlockedChestList.clearQuick(); + mazePropList.clearQuick(); mazeGroupList.clearQuick(); return this; } @@ -614,13 +614,13 @@ public final class MazeMapDataOuterClass { } MazeMapData other = (MazeMapData) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) + && (!hasContentId() || contentId == other.contentId) && (!hasEntryId() || entryId == other.entryId) - && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) + && (!hasRetcode() || retcode == other.retcode) && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) + && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) + && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @@ -628,43 +628,43 @@ public final class MazeMapDataOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(contentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entryId); } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(unlockedTeleportList.array()[i]); - } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(lightenSectionList.array()[i]); } } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < unlockedTeleportList.length(); i++) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(unlockedTeleportList.array()[i]); + } + } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { + for (int i = 0; i < unlockedChestList.length(); i++) { output.writeRawByte((byte) 26); - output.writeMessageNoTag(mazePropList.get(i)); + output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(unlockedChestList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(mazePropList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(mazeGroupList.get(i)); } } @@ -674,25 +674,25 @@ public final class MazeMapDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(contentId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); + } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000080) != 0) { size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); @@ -708,44 +708,44 @@ public final class MazeMapDataOuterClass { while (true) { switch (tag) { case 8: { - // retcode - retcode = input.readUInt32(); + // contentId + contentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // curMapEntryId - curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 32: { // entryId entryId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 82) { + if (tag != 42) { break; } } - case 82: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { + case 42: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // unlockedTeleportList [packed=true] + input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 26) { @@ -753,22 +753,22 @@ public final class MazeMapDataOuterClass { } } case 26: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); - bitField0_ |= 0x00000020; - if (tag != 74) { - break; - } - } - case 74: { // unlockedChestList tag = input.readRepeatedMessage(unlockedChestList, tag); - bitField0_ |= 0x00000040; - if (tag != 114) { + bitField0_ |= 0x00000020; + if (tag != 50) { break; } } - case 114: { + case 50: { + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); + bitField0_ |= 0x00000040; + if (tag != 90) { + break; + } + } + case 90: { // mazeGroupList tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000080; @@ -786,15 +786,15 @@ public final class MazeMapDataOuterClass { tag = input.readTag(); break; } - case 80: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + case 40: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; break; } - case 96: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 112: { + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; break; } @@ -806,25 +806,25 @@ public final class MazeMapDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.contentId, contentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000080) != 0) { output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); @@ -839,10 +839,11 @@ public final class MazeMapDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -407108748: + case 264552097: { + if (input.isAtField(FieldNames.contentId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + contentId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -850,36 +851,23 @@ public final class MazeMapDataOuterClass { } break; } - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { - if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1591558867: case -2093663224: { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case 856936684: - case -10753834: { - if (input.isAtField(FieldNames.unlockedTeleportList)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unlockedTeleportList); - bitField0_ |= 0x00000008; + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -891,19 +879,19 @@ public final class MazeMapDataOuterClass { if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(lightenSectionList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); } break; } - case 1676123008: - case 1875839866: { - if (input.isAtField(FieldNames.mazePropList)) { + case 856936684: + case -10753834: { + if (input.isAtField(FieldNames.unlockedTeleportList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazePropList); - bitField0_ |= 0x00000020; + input.readRepeatedUInt32(unlockedTeleportList); + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -915,6 +903,18 @@ public final class MazeMapDataOuterClass { if (input.isAtField(FieldNames.unlockedChestList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(unlockedChestList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1676123008: + case 1875839866: { + if (input.isAtField(FieldNames.mazePropList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(mazePropList); bitField0_ |= 0x00000040; } } else { @@ -986,20 +986,20 @@ public final class MazeMapDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); + static final FieldName contentId = FieldName.forField("contentId", "content_id"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); - static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); + static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); + static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_list"); + static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java index bc060c5..b1de2bd 100644 --- a/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazePropOuterClass.java @@ -19,17 +19,17 @@ public final class MazePropOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 state = 1; + * optional uint32 state = 8; */ private int state; /** - * optional uint32 config_id = 3; + * optional uint32 config_id = 14; */ private int configId; /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 15; */ private int groupId; @@ -44,7 +44,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 8; * @return whether the state field is set */ public boolean hasState() { @@ -52,7 +52,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 8; * @return this */ public MazeProp clearState() { @@ -62,7 +62,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 8; * @return the state */ public int getState() { @@ -70,7 +70,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 1; + * optional uint32 state = 8; * @param value the state to set * @return this */ @@ -81,7 +81,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 3; + * optional uint32 config_id = 14; * @return whether the configId field is set */ public boolean hasConfigId() { @@ -89,7 +89,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 3; + * optional uint32 config_id = 14; * @return this */ public MazeProp clearConfigId() { @@ -99,7 +99,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 3; + * optional uint32 config_id = 14; * @return the configId */ public int getConfigId() { @@ -107,7 +107,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 3; + * optional uint32 config_id = 14; * @param value the configId to set * @return this */ @@ -118,7 +118,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 15; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -126,7 +126,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 15; * @return this */ public MazeProp clearGroupId() { @@ -136,7 +136,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 15; * @return the groupId */ public int getGroupId() { @@ -144,7 +144,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 15; * @param value the groupId to set * @return this */ @@ -225,15 +225,15 @@ public final class MazePropOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(configId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(groupId); } } @@ -260,25 +260,25 @@ public final class MazePropOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // state state = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { // configId configId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java index 044ae1d..8b8665e 100644 --- a/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java @@ -19,15 +19,15 @@ public final class MissionCustomValueDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 8; - */ - private int index; - - /** - * optional uint32 custom_value = 10; + * optional uint32 custom_value = 9; */ private int customValue; + /** + * optional uint32 index = 15; + */ + private int index; + private MissionCustomValueData() { } @@ -39,62 +39,25 @@ public final class MissionCustomValueDataOuterClass { } /** - * optional uint32 index = 8; - * @return whether the index field is set + * optional uint32 custom_value = 9; + * @return whether the customValue field is set */ - public boolean hasIndex() { + public boolean hasCustomValue() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 8; - * @return this - */ - public MissionCustomValueData clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 8; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 8; - * @param value the index to set - * @return this - */ - public MissionCustomValueData setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 custom_value = 10; - * @return whether the customValue field is set - */ - public boolean hasCustomValue() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 custom_value = 10; + * optional uint32 custom_value = 9; * @return this */ public MissionCustomValueData clearCustomValue() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; customValue = 0; return this; } /** - * optional uint32 custom_value = 10; + * optional uint32 custom_value = 9; * @return the customValue */ public int getCustomValue() { @@ -102,23 +65,60 @@ public final class MissionCustomValueDataOuterClass { } /** - * optional uint32 custom_value = 10; + * optional uint32 custom_value = 9; * @param value the customValue to set * @return this */ public MissionCustomValueData setCustomValue(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; customValue = value; return this; } + /** + * optional uint32 index = 15; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 index = 15; + * @return this + */ + public MissionCustomValueData clearIndex() { + bitField0_ &= ~0x00000002; + index = 0; + return this; + } + + /** + * optional uint32 index = 15; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 15; + * @param value the index to set + * @return this + */ + public MissionCustomValueData setIndex(final int value) { + bitField0_ |= 0x00000002; + index = value; + return this; + } + @Override public MissionCustomValueData copyFrom(final MissionCustomValueData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; customValue = other.customValue; + index = other.index; } return this; } @@ -129,12 +129,12 @@ public final class MissionCustomValueDataOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasCustomValue()) { setCustomValue(other.customValue); } + if (other.hasIndex()) { + setIndex(other.index); + } return this; } @@ -145,8 +145,8 @@ public final class MissionCustomValueDataOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; customValue = 0; + index = 0; return this; } @@ -170,19 +170,19 @@ public final class MissionCustomValueDataOuterClass { } MissionCustomValueData other = (MissionCustomValueData) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasCustomValue() || customValue == other.customValue); + && (!hasCustomValue() || customValue == other.customValue) + && (!hasIndex() || index == other.index); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(customValue); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(customValue); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(index); } } @@ -190,10 +190,10 @@ public final class MissionCustomValueDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(customValue); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(customValue); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } return size; } @@ -205,18 +205,18 @@ public final class MissionCustomValueDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // index - index = input.readUInt32(); + case 72: { + // customValue + customValue = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { - // customValue - customValue = input.readUInt32(); + case 120: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class MissionCustomValueDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.customValue, customValue); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.customValue, customValue); + output.writeUInt32(FieldNames.index, index); } output.endObject(); } @@ -256,10 +256,11 @@ public final class MissionCustomValueDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -1786407808: + case 732653347: { + if (input.isAtField(FieldNames.customValue)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + customValue = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class MissionCustomValueDataOuterClass { } break; } - case -1786407808: - case 732653347: { - if (input.isAtField(FieldNames.customValue)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - customValue = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class MissionCustomValueDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - static final FieldName customValue = FieldName.forField("customValue", "custom_value"); + + static final FieldName index = FieldName.forField("index"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java index caea82c..5fe9a46 100644 --- a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java @@ -19,17 +19,17 @@ public final class MissionOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 5; + * optional uint32 id = 2; */ private int id; /** - * optional uint32 progress = 11; + * optional uint32 progress = 8; */ private int progress; /** - * optional .MissionStatus status = 6; + * optional .MissionStatus status = 1; */ private int status; @@ -44,7 +44,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 2; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 2; * @return this */ public Mission clearId() { @@ -62,7 +62,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 2; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 2; * @param value the id to set * @return this */ @@ -81,7 +81,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 11; + * optional uint32 progress = 8; * @return whether the progress field is set */ public boolean hasProgress() { @@ -89,7 +89,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 11; + * optional uint32 progress = 8; * @return this */ public Mission clearProgress() { @@ -99,7 +99,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 11; + * optional uint32 progress = 8; * @return the progress */ public int getProgress() { @@ -107,7 +107,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 11; + * optional uint32 progress = 8; * @param value the progress to set * @return this */ @@ -118,7 +118,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 6; + * optional .MissionStatus status = 1; * @return whether the status field is set */ public boolean hasStatus() { @@ -126,7 +126,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 6; + * optional .MissionStatus status = 1; * @return this */ public Mission clearStatus() { @@ -136,7 +136,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 6; + * optional .MissionStatus status = 1; * @return the status */ public MissionStatusOuterClass.MissionStatus getStatus() { @@ -169,7 +169,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 6; + * optional .MissionStatus status = 1; * @param value the status to set * @return this */ @@ -250,15 +250,15 @@ public final class MissionOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeEnumNoTag(status); } } @@ -285,25 +285,25 @@ public final class MissionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 8) { break; } } - case 48: { + case 8: { // status final int value = input.readInt32(); if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java index 14ea218..daead16 100644 --- a/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MissionSyncOuterClass.java @@ -22,33 +22,15 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 1; */ private final RepeatedInt mainMissionId = RepeatedInt.newEmptyInstance(); /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 7; - */ - private final RepeatedInt cOLOAGDIBCC = RepeatedInt.newEmptyInstance(); - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 10; - */ - private final RepeatedInt lMHJAPFMKDI = RepeatedInt.newEmptyInstance(); - - /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 3; */ private final RepeatedMessage missionList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); @@ -64,10 +46,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 1; * @return whether the mainMissionId field is set */ public boolean hasMainMissionId() { @@ -76,10 +58,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 1; * @return this */ public MissionSync clearMainMissionId() { @@ -90,10 +72,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 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. @@ -108,10 +90,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 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 @@ -126,10 +108,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 1; * @param value the mainMissionId to add * @return this */ @@ -141,10 +123,10 @@ public final class MissionSyncOuterClass { /** * 
-     *  could be also 1 or 14
+     *  could be also 10
      *
* - * repeated uint32 main_mission_id = 4; + * repeated uint32 main_mission_id = 1; * @param values the mainMissionId to add * @return this */ @@ -155,209 +137,25 @@ public final class MissionSyncOuterClass { } /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 7; - * @return whether the cOLOAGDIBCC field is set + * repeated .Mission mission_list = 3; + * @return whether the missionList field is set */ - public boolean hasCOLOAGDIBCC() { + public boolean hasMissionList() { return (bitField0_ & 0x00000002) != 0; } /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 7; - * @return this - */ - public MissionSync clearCOLOAGDIBCC() { - bitField0_ &= ~0x00000002; - cOLOAGDIBCC.clear(); - return this; - } - - /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 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 #getMutableCOLOAGDIBCC()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getCOLOAGDIBCC() { - return cOLOAGDIBCC; - } - - /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 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 RepeatedInt getMutableCOLOAGDIBCC() { - bitField0_ |= 0x00000002; - return cOLOAGDIBCC; - } - - /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 7; - * @param value the cOLOAGDIBCC to add - * @return this - */ - public MissionSync addCOLOAGDIBCC(final int value) { - bitField0_ |= 0x00000002; - cOLOAGDIBCC.add(value); - return this; - } - - /** - * 
-     *  COLOAGDIBCC
-     *
- * - * repeated uint32 COLOAGDIBCC = 7; - * @param values the cOLOAGDIBCC to add - * @return this - */ - public MissionSync addAllCOLOAGDIBCC(final int... values) { - bitField0_ |= 0x00000002; - cOLOAGDIBCC.addAll(values); - return this; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 10; - * @return whether the lMHJAPFMKDI field is set - */ - public boolean hasLMHJAPFMKDI() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 10; - * @return this - */ - public MissionSync clearLMHJAPFMKDI() { - bitField0_ &= ~0x00000004; - lMHJAPFMKDI.clear(); - return this; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 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 #getMutableLMHJAPFMKDI()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getLMHJAPFMKDI() { - return lMHJAPFMKDI; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 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 RepeatedInt getMutableLMHJAPFMKDI() { - bitField0_ |= 0x00000004; - return lMHJAPFMKDI; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 10; - * @param value the lMHJAPFMKDI to add - * @return this - */ - public MissionSync addLMHJAPFMKDI(final int value) { - bitField0_ |= 0x00000004; - lMHJAPFMKDI.add(value); - return this; - } - - /** - * 
-     *  LMHJAPFMKDI
-     *
- * - * repeated uint32 LMHJAPFMKDI = 10; - * @param values the lMHJAPFMKDI to add - * @return this - */ - public MissionSync addAllLMHJAPFMKDI(final int... values) { - bitField0_ |= 0x00000004; - lMHJAPFMKDI.addAll(values); - return this; - } - - /** - * repeated .Mission mission_list = 11; - * @return whether the missionList field is set - */ - public boolean hasMissionList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 3; * @return this */ public MissionSync clearMissionList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; missionList.clear(); return this; } /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 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. @@ -371,7 +169,7 @@ public final class MissionSyncOuterClass { } /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 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 @@ -380,28 +178,28 @@ public final class MissionSyncOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMissionList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return missionList; } /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 3; * @param value the missionList to add * @return this */ public MissionSync addMissionList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; missionList.add(value); return this; } /** - * repeated .Mission mission_list = 11; + * repeated .Mission mission_list = 3; * @param values the missionList to add * @return this */ public MissionSync addAllMissionList(final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; missionList.addAll(values); return this; } @@ -412,8 +210,6 @@ public final class MissionSyncOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; mainMissionId.copyFrom(other.mainMissionId); - cOLOAGDIBCC.copyFrom(other.cOLOAGDIBCC); - lMHJAPFMKDI.copyFrom(other.lMHJAPFMKDI); missionList.copyFrom(other.missionList); } return this; @@ -428,12 +224,6 @@ public final class MissionSyncOuterClass { if (other.hasMainMissionId()) { getMutableMainMissionId().addAll(other.mainMissionId); } - if (other.hasCOLOAGDIBCC()) { - getMutableCOLOAGDIBCC().addAll(other.cOLOAGDIBCC); - } - if (other.hasLMHJAPFMKDI()) { - getMutableLMHJAPFMKDI().addAll(other.lMHJAPFMKDI); - } if (other.hasMissionList()) { getMutableMissionList().addAll(other.missionList); } @@ -448,8 +238,6 @@ public final class MissionSyncOuterClass { cachedSize = -1; bitField0_ = 0; mainMissionId.clear(); - cOLOAGDIBCC.clear(); - lMHJAPFMKDI.clear(); missionList.clear(); return this; } @@ -462,8 +250,6 @@ public final class MissionSyncOuterClass { cachedSize = -1; bitField0_ = 0; mainMissionId.clear(); - cOLOAGDIBCC.clear(); - lMHJAPFMKDI.clear(); missionList.clearQuick(); return this; } @@ -479,8 +265,6 @@ public final class MissionSyncOuterClass { MissionSync other = (MissionSync) o; return bitField0_ == other.bitField0_ && (!hasMainMissionId() || mainMissionId.equals(other.mainMissionId)) - && (!hasCOLOAGDIBCC() || cOLOAGDIBCC.equals(other.cOLOAGDIBCC)) - && (!hasLMHJAPFMKDI() || lMHJAPFMKDI.equals(other.lMHJAPFMKDI)) && (!hasMissionList() || missionList.equals(other.missionList)); } @@ -488,25 +272,13 @@ public final class MissionSyncOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mainMissionId.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(mainMissionId.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { - for (int i = 0; i < cOLOAGDIBCC.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(cOLOAGDIBCC.array()[i]); - } - } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < lMHJAPFMKDI.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(lMHJAPFMKDI.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < missionList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 26); output.writeMessageNoTag(missionList.get(i)); } } @@ -519,12 +291,6 @@ public final class MissionSyncOuterClass { size += (1 * mainMissionId.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionId); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * cOLOAGDIBCC.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(cOLOAGDIBCC); - } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * lMHJAPFMKDI.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lMHJAPFMKDI); - } - if ((bitField0_ & 0x00000008) != 0) { size += (1 * missionList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionList); } return size; @@ -537,37 +303,19 @@ public final class MissionSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 10: { // mainMissionId [packed=true] input.readPackedUInt32(mainMissionId, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { - // cOLOAGDIBCC [packed=true] - input.readPackedUInt32(cOLOAGDIBCC, tag); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // lMHJAPFMKDI [packed=true] - input.readPackedUInt32(lMHJAPFMKDI, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 26: { // missionList tag = input.readRepeatedMessage(missionList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -582,24 +330,12 @@ public final class MissionSyncOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // mainMissionId [packed=false] tag = input.readRepeatedUInt32(mainMissionId, tag); bitField0_ |= 0x00000001; break; } - case 56: { - // cOLOAGDIBCC [packed=false] - tag = input.readRepeatedUInt32(cOLOAGDIBCC, tag); - bitField0_ |= 0x00000002; - break; - } - case 80: { - // lMHJAPFMKDI [packed=false] - tag = input.readRepeatedUInt32(lMHJAPFMKDI, tag); - bitField0_ |= 0x00000004; - break; - } } } } @@ -611,12 +347,6 @@ public final class MissionSyncOuterClass { output.writeRepeatedUInt32(FieldNames.mainMissionId, mainMissionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRepeatedUInt32(FieldNames.cOLOAGDIBCC, cOLOAGDIBCC); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.lMHJAPFMKDI, lMHJAPFMKDI); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.missionList, missionList); } output.endObject(); @@ -641,34 +371,12 @@ public final class MissionSyncOuterClass { } break; } - case 1490029384: { - if (input.isAtField(FieldNames.cOLOAGDIBCC)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(cOLOAGDIBCC); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1665766775: { - if (input.isAtField(FieldNames.lMHJAPFMKDI)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lMHJAPFMKDI); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1383006282: case -58851471: { if (input.isAtField(FieldNames.missionList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(missionList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -729,10 +437,6 @@ public final class MissionSyncOuterClass { static class FieldNames { static final FieldName mainMissionId = FieldName.forField("mainMissionId", "main_mission_id"); - static final FieldName cOLOAGDIBCC = FieldName.forField("COLOAGDIBCC"); - - static final FieldName lMHJAPFMKDI = FieldName.forField("LMHJAPFMKDI"); - static final FieldName missionList = FieldName.forField("missionList", "mission_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java index 39399ab..9094f6e 100644 --- a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java @@ -19,12 +19,12 @@ public final class MonsterArchiveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 1; */ private int monsterId; /** - * optional uint32 num = 3; + * optional uint32 num = 2; */ private int num; @@ -39,7 +39,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 1; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -47,7 +47,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 1; * @return this */ public MonsterArchive clearMonsterId() { @@ -57,7 +57,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 1; * @return the monsterId */ public int getMonsterId() { @@ -65,7 +65,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 1; * @param value the monsterId to set * @return this */ @@ -76,7 +76,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 3; + * optional uint32 num = 2; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 3; + * optional uint32 num = 2; * @return this */ public MonsterArchive clearNum() { @@ -94,7 +94,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 3; + * optional uint32 num = 2; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 3; + * optional uint32 num = 2; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public final class MonsterArchiveOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class MonsterArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 16) { break; } } - case 24: { + case 16: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java index f876a42..31b28d5 100644 --- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java @@ -19,12 +19,12 @@ public final class MotionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .Vector pos = 10; + * optional .Vector pos = 5; */ private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance(); /** - * optional .Vector rot = 14; + * optional .Vector rot = 11; */ private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); @@ -39,7 +39,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 10; + * optional .Vector pos = 5; * @return whether the pos field is set */ public boolean hasPos() { @@ -47,7 +47,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 10; + * optional .Vector pos = 5; * @return this */ public MotionInfo clearPos() { @@ -57,7 +57,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 10; + * optional .Vector pos = 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. @@ -71,7 +71,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 10; + * optional .Vector pos = 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 @@ -85,7 +85,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 10; + * optional .Vector pos = 5; * @param value the pos to set * @return this */ @@ -96,7 +96,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 14; + * optional .Vector rot = 11; * @return whether the rot field is set */ public boolean hasRot() { @@ -104,7 +104,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 14; + * optional .Vector rot = 11; * @return this */ public MotionInfo clearRot() { @@ -114,7 +114,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 14; + * optional .Vector rot = 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. @@ -128,7 +128,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 14; + * optional .Vector rot = 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 @@ -142,7 +142,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 14; + * optional .Vector rot = 11; * @param value the rot to set * @return this */ @@ -219,11 +219,11 @@ public final class MotionInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 42); output.writeMessageNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rot); } } @@ -247,16 +247,16 @@ public final class MotionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 42: { // pos input.readMessage(pos); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // rot input.readMessage(rot); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java new file mode 100644 index 0000000..e78f09e --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarInfoOuterClass.java @@ -0,0 +1,927 @@ +// 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 MultiPathAvatarInfoOuterClass { + /** + * Protobuf type {@code MultiPathAvatarInfo} + */ + public static final class MultiPathAvatarInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 path_equipment_id = 9; + */ + private int pathEquipmentId; + + /** + * optional uint32 rank = 12; + */ + private int rank; + + /** + * optional .MultiPathAvatarType avatar_id = 11; + */ + private int avatarId; + + /** + * repeated uint32 unlocked_special_point_id_list = 15; + */ + private final RepeatedInt unlockedSpecialPointIdList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 5; + */ + private final RepeatedMessage multiPathSkillTree = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + + /** + * repeated .EquipRelic equip_relic_list = 13; + */ + private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); + + /** + * repeated .AvatarSkillTree special_skilltree_list = 14; + */ + private final RepeatedMessage specialSkilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + + private MultiPathAvatarInfo() { + } + + /** + * @return a new empty instance of {@code MultiPathAvatarInfo} + */ + public static MultiPathAvatarInfo newInstance() { + return new MultiPathAvatarInfo(); + } + + /** + * optional uint32 path_equipment_id = 9; + * @return whether the pathEquipmentId field is set + */ + public boolean hasPathEquipmentId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 path_equipment_id = 9; + * @return this + */ + public MultiPathAvatarInfo clearPathEquipmentId() { + bitField0_ &= ~0x00000001; + pathEquipmentId = 0; + return this; + } + + /** + * optional uint32 path_equipment_id = 9; + * @return the pathEquipmentId + */ + public int getPathEquipmentId() { + return pathEquipmentId; + } + + /** + * optional uint32 path_equipment_id = 9; + * @param value the pathEquipmentId to set + * @return this + */ + public MultiPathAvatarInfo setPathEquipmentId(final int value) { + bitField0_ |= 0x00000001; + pathEquipmentId = value; + return this; + } + + /** + * optional uint32 rank = 12; + * @return whether the rank field is set + */ + public boolean hasRank() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 rank = 12; + * @return this + */ + public MultiPathAvatarInfo clearRank() { + bitField0_ &= ~0x00000002; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 12; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 12; + * @param value the rank to set + * @return this + */ + public MultiPathAvatarInfo setRank(final int value) { + bitField0_ |= 0x00000002; + rank = value; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 11; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .MultiPathAvatarType avatar_id = 11; + * @return this + */ + public MultiPathAvatarInfo clearAvatarId() { + bitField0_ &= ~0x00000004; + avatarId = 0; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 11; + * @return the avatarId + */ + public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() { + return MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(avatarId); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link MultiPathAvatarInfo#getAvatarId()}.getNumber(). + * + * @return numeric wire representation + */ + public int getAvatarIdValue() { + return avatarId; + } + + /** + * 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 MultiPathAvatarTypeOuterClass.MultiPathAvatarType}. Setting an invalid value + * can cause {@link MultiPathAvatarInfo#getAvatarId()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public MultiPathAvatarInfo setAvatarIdValue(final int value) { + bitField0_ |= 0x00000004; + avatarId = value; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 11; + * @param value the avatarId to set + * @return this + */ + public MultiPathAvatarInfo setAvatarId( + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value) { + bitField0_ |= 0x00000004; + avatarId = value.getNumber(); + return this; + } + + /** + * repeated uint32 unlocked_special_point_id_list = 15; + * @return whether the unlockedSpecialPointIdList field is set + */ + public boolean hasUnlockedSpecialPointIdList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated uint32 unlocked_special_point_id_list = 15; + * @return this + */ + public MultiPathAvatarInfo clearUnlockedSpecialPointIdList() { + bitField0_ &= ~0x00000008; + unlockedSpecialPointIdList.clear(); + return this; + } + + /** + * repeated uint32 unlocked_special_point_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 #getMutableUnlockedSpecialPointIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUnlockedSpecialPointIdList() { + return unlockedSpecialPointIdList; + } + + /** + * repeated uint32 unlocked_special_point_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 getMutableUnlockedSpecialPointIdList() { + bitField0_ |= 0x00000008; + return unlockedSpecialPointIdList; + } + + /** + * repeated uint32 unlocked_special_point_id_list = 15; + * @param value the unlockedSpecialPointIdList to add + * @return this + */ + public MultiPathAvatarInfo addUnlockedSpecialPointIdList(final int value) { + bitField0_ |= 0x00000008; + unlockedSpecialPointIdList.add(value); + return this; + } + + /** + * repeated uint32 unlocked_special_point_id_list = 15; + * @param values the unlockedSpecialPointIdList to add + * @return this + */ + public MultiPathAvatarInfo addAllUnlockedSpecialPointIdList(final int... values) { + bitField0_ |= 0x00000008; + unlockedSpecialPointIdList.addAll(values); + return this; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 5; + * @return whether the multiPathSkillTree field is set + */ + public boolean hasMultiPathSkillTree() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 5; + * @return this + */ + public MultiPathAvatarInfo clearMultiPathSkillTree() { + bitField0_ &= ~0x00000010; + multiPathSkillTree.clear(); + return this; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 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 #getMutableMultiPathSkillTree()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMultiPathSkillTree() { + return multiPathSkillTree; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMultiPathSkillTree( + ) { + bitField0_ |= 0x00000010; + return multiPathSkillTree; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 5; + * @param value the multiPathSkillTree to add + * @return this + */ + public MultiPathAvatarInfo addMultiPathSkillTree( + final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + bitField0_ |= 0x00000010; + multiPathSkillTree.add(value); + return this; + } + + /** + * repeated .AvatarSkillTree multi_path_skill_tree = 5; + * @param values the multiPathSkillTree to add + * @return this + */ + public MultiPathAvatarInfo addAllMultiPathSkillTree( + final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + bitField0_ |= 0x00000010; + multiPathSkillTree.addAll(values); + return this; + } + + /** + * repeated .EquipRelic equip_relic_list = 13; + * @return whether the equipRelicList field is set + */ + public boolean hasEquipRelicList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .EquipRelic equip_relic_list = 13; + * @return this + */ + public MultiPathAvatarInfo clearEquipRelicList() { + bitField0_ &= ~0x00000020; + equipRelicList.clear(); + return this; + } + + /** + * repeated .EquipRelic equip_relic_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. + * + * Use {@link #getMutableEquipRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getEquipRelicList() { + return equipRelicList; + } + + /** + * repeated .EquipRelic equip_relic_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableEquipRelicList() { + bitField0_ |= 0x00000020; + return equipRelicList; + } + + /** + * repeated .EquipRelic equip_relic_list = 13; + * @param value the equipRelicList to add + * @return this + */ + public MultiPathAvatarInfo addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { + bitField0_ |= 0x00000020; + equipRelicList.add(value); + return this; + } + + /** + * repeated .EquipRelic equip_relic_list = 13; + * @param values the equipRelicList to add + * @return this + */ + public MultiPathAvatarInfo addAllEquipRelicList( + final EquipRelicOuterClass.EquipRelic... values) { + bitField0_ |= 0x00000020; + equipRelicList.addAll(values); + return this; + } + + /** + * repeated .AvatarSkillTree special_skilltree_list = 14; + * @return whether the specialSkilltreeList field is set + */ + public boolean hasSpecialSkilltreeList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .AvatarSkillTree special_skilltree_list = 14; + * @return this + */ + public MultiPathAvatarInfo clearSpecialSkilltreeList() { + bitField0_ &= ~0x00000040; + specialSkilltreeList.clear(); + return this; + } + + /** + * repeated .AvatarSkillTree special_skilltree_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. + * + * Use {@link #getMutableSpecialSkilltreeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getSpecialSkilltreeList() { + return specialSkilltreeList; + } + + /** + * repeated .AvatarSkillTree special_skilltree_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableSpecialSkilltreeList( + ) { + bitField0_ |= 0x00000040; + return specialSkilltreeList; + } + + /** + * repeated .AvatarSkillTree special_skilltree_list = 14; + * @param value the specialSkilltreeList to add + * @return this + */ + public MultiPathAvatarInfo addSpecialSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + bitField0_ |= 0x00000040; + specialSkilltreeList.add(value); + return this; + } + + /** + * repeated .AvatarSkillTree special_skilltree_list = 14; + * @param values the specialSkilltreeList to add + * @return this + */ + public MultiPathAvatarInfo addAllSpecialSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + bitField0_ |= 0x00000040; + specialSkilltreeList.addAll(values); + return this; + } + + @Override + public MultiPathAvatarInfo copyFrom(final MultiPathAvatarInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + pathEquipmentId = other.pathEquipmentId; + rank = other.rank; + avatarId = other.avatarId; + unlockedSpecialPointIdList.copyFrom(other.unlockedSpecialPointIdList); + multiPathSkillTree.copyFrom(other.multiPathSkillTree); + equipRelicList.copyFrom(other.equipRelicList); + specialSkilltreeList.copyFrom(other.specialSkilltreeList); + } + return this; + } + + @Override + public MultiPathAvatarInfo mergeFrom(final MultiPathAvatarInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasPathEquipmentId()) { + setPathEquipmentId(other.pathEquipmentId); + } + if (other.hasRank()) { + setRank(other.rank); + } + if (other.hasAvatarId()) { + setAvatarIdValue(other.avatarId); + } + if (other.hasUnlockedSpecialPointIdList()) { + getMutableUnlockedSpecialPointIdList().addAll(other.unlockedSpecialPointIdList); + } + if (other.hasMultiPathSkillTree()) { + getMutableMultiPathSkillTree().addAll(other.multiPathSkillTree); + } + if (other.hasEquipRelicList()) { + getMutableEquipRelicList().addAll(other.equipRelicList); + } + if (other.hasSpecialSkilltreeList()) { + getMutableSpecialSkilltreeList().addAll(other.specialSkilltreeList); + } + return this; + } + + @Override + public MultiPathAvatarInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + pathEquipmentId = 0; + rank = 0; + avatarId = 0; + unlockedSpecialPointIdList.clear(); + multiPathSkillTree.clear(); + equipRelicList.clear(); + specialSkilltreeList.clear(); + return this; + } + + @Override + public MultiPathAvatarInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + unlockedSpecialPointIdList.clear(); + multiPathSkillTree.clearQuick(); + equipRelicList.clearQuick(); + specialSkilltreeList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof MultiPathAvatarInfo)) { + return false; + } + MultiPathAvatarInfo other = (MultiPathAvatarInfo) o; + return bitField0_ == other.bitField0_ + && (!hasPathEquipmentId() || pathEquipmentId == other.pathEquipmentId) + && (!hasRank() || rank == other.rank) + && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasUnlockedSpecialPointIdList() || unlockedSpecialPointIdList.equals(other.unlockedSpecialPointIdList)) + && (!hasMultiPathSkillTree() || multiPathSkillTree.equals(other.multiPathSkillTree)) + && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)) + && (!hasSpecialSkilltreeList() || specialSkilltreeList.equals(other.specialSkilltreeList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(pathEquipmentId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(rank); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeEnumNoTag(avatarId); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < unlockedSpecialPointIdList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(unlockedSpecialPointIdList.array()[i]); + } + } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < multiPathSkillTree.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(multiPathSkillTree.get(i)); + } + } + if ((bitField0_ & 0x00000020) != 0) { + for (int i = 0; i < equipRelicList.length(); i++) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(equipRelicList.get(i)); + } + } + if ((bitField0_ & 0x00000040) != 0) { + for (int i = 0; i < specialSkilltreeList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(specialSkilltreeList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(pathEquipmentId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * unlockedSpecialPointIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedSpecialPointIdList); + } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * multiPathSkillTree.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathSkillTree); + } + if ((bitField0_ & 0x00000020) != 0) { + size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); + } + if ((bitField0_ & 0x00000040) != 0) { + size += (1 * specialSkilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(specialSkilltreeList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public MultiPathAvatarInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 72: { + // pathEquipmentId + pathEquipmentId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // avatarId + final int value = input.readInt32(); + if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { + avatarId = value; + bitField0_ |= 0x00000004; + } + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // unlockedSpecialPointIdList [packed=true] + input.readPackedUInt32(unlockedSpecialPointIdList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // multiPathSkillTree + tag = input.readRepeatedMessage(multiPathSkillTree, tag); + bitField0_ |= 0x00000010; + if (tag != 106) { + break; + } + } + case 106: { + // equipRelicList + tag = input.readRepeatedMessage(equipRelicList, tag); + bitField0_ |= 0x00000020; + if (tag != 114) { + break; + } + } + case 114: { + // specialSkilltreeList + tag = input.readRepeatedMessage(specialSkilltreeList, tag); + bitField0_ |= 0x00000040; + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 120: { + // unlockedSpecialPointIdList [packed=false] + tag = input.readRepeatedUInt32(unlockedSpecialPointIdList, tag); + bitField0_ |= 0x00000008; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.pathEquipmentId, pathEquipmentId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.avatarId, avatarId, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.unlockedSpecialPointIdList, unlockedSpecialPointIdList); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedMessage(FieldNames.multiPathSkillTree, multiPathSkillTree); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRepeatedMessage(FieldNames.specialSkilltreeList, specialSkilltreeList); + } + output.endObject(); + } + + @Override + public MultiPathAvatarInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1371565540: + case -1584422074: { + if (input.isAtField(FieldNames.pathEquipmentId)) { + if (!input.trySkipNullValue()) { + pathEquipmentId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3492908: { + if (input.isAtField(FieldNames.rank)) { + if (!input.trySkipNullValue()) { + rank = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value = input.readEnum(MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + if (value != null) { + avatarId = value.getNumber(); + bitField0_ |= 0x00000004; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -1953824813: + case 321612849: { + if (input.isAtField(FieldNames.unlockedSpecialPointIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(unlockedSpecialPointIdList); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 730273329: + case -1809703392: { + if (input.isAtField(FieldNames.multiPathSkillTree)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(multiPathSkillTree); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1578968161: + case -795441831: { + if (input.isAtField(FieldNames.equipRelicList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(equipRelicList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 772023924: + case -1081979468: { + if (input.isAtField(FieldNames.specialSkilltreeList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(specialSkilltreeList); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public MultiPathAvatarInfo clone() { + return new MultiPathAvatarInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static MultiPathAvatarInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new MultiPathAvatarInfo(), data).checkInitialized(); + } + + public static MultiPathAvatarInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new MultiPathAvatarInfo(), input).checkInitialized(); + } + + public static MultiPathAvatarInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new MultiPathAvatarInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating MultiPathAvatarInfo messages + */ + public static MessageFactory getFactory() { + return MultiPathAvatarInfoFactory.INSTANCE; + } + + private enum MultiPathAvatarInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public MultiPathAvatarInfo create() { + return MultiPathAvatarInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName pathEquipmentId = FieldName.forField("pathEquipmentId", "path_equipment_id"); + + static final FieldName rank = FieldName.forField("rank"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + + static final FieldName unlockedSpecialPointIdList = FieldName.forField("unlockedSpecialPointIdList", "unlocked_special_point_id_list"); + + static final FieldName multiPathSkillTree = FieldName.forField("multiPathSkillTree", "multi_path_skill_tree"); + + static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); + + static final FieldName specialSkilltreeList = FieldName.forField("specialSkilltreeList", "special_skilltree_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java new file mode 100644 index 0000000..8a7274e --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/MultiPathAvatarTypeOuterClass.java @@ -0,0 +1,224 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import us.hebi.quickbuf.ProtoEnum; +import us.hebi.quickbuf.ProtoUtil; + +public final class MultiPathAvatarTypeOuterClass { + /** + * Protobuf enum {@code MultiPathAvatarType} + */ + public enum MultiPathAvatarType implements ProtoEnum { + /** + * MultiPathAvatarTypeNone = 0; + */ + MultiPathAvatarTypeNone("MultiPathAvatarTypeNone", 0), + + /** + * Mar_7thKnightType = 1001; + */ + Mar_7thKnightType("Mar_7thKnightType", 1001), + + /** + * Mar_7thRogueType = 1224; + */ + Mar_7thRogueType("Mar_7thRogueType", 1224), + + /** + * BoyWarriorType = 8001; + */ + BoyWarriorType("BoyWarriorType", 8001), + + /** + * GirlWarriorType = 8002; + */ + GirlWarriorType("GirlWarriorType", 8002), + + /** + * BoyKnightType = 8003; + */ + BoyKnightType("BoyKnightType", 8003), + + /** + * GirlKnightType = 8004; + */ + GirlKnightType("GirlKnightType", 8004), + + /** + * BoyShamanType = 8005; + */ + BoyShamanType("BoyShamanType", 8005), + + /** + * GirlShamanType = 8006; + */ + GirlShamanType("GirlShamanType", 8006); + + /** + * MultiPathAvatarTypeNone = 0; + */ + public static final int MultiPathAvatarTypeNone_VALUE = 0; + + /** + * Mar_7thKnightType = 1001; + */ + public static final int Mar_7thKnightType_VALUE = 1001; + + /** + * Mar_7thRogueType = 1224; + */ + public static final int Mar_7thRogueType_VALUE = 1224; + + /** + * BoyWarriorType = 8001; + */ + public static final int BoyWarriorType_VALUE = 8001; + + /** + * GirlWarriorType = 8002; + */ + public static final int GirlWarriorType_VALUE = 8002; + + /** + * BoyKnightType = 8003; + */ + public static final int BoyKnightType_VALUE = 8003; + + /** + * GirlKnightType = 8004; + */ + public static final int GirlKnightType_VALUE = 8004; + + /** + * BoyShamanType = 8005; + */ + public static final int BoyShamanType_VALUE = 8005; + + /** + * GirlShamanType = 8006; + */ + public static final int GirlShamanType_VALUE = 8006; + + private final String name; + + private final int number; + + private MultiPathAvatarType(String name, int number) { + this.name = name; + this.number = number; + } + + /** + * @return the string representation of enum entry + */ + @Override + public String getName() { + return name; + } + + /** + * @return the numeric wire value of this enum entry + */ + @Override + public int getNumber() { + return number; + } + + /** + * @return a converter that maps between this enum's numeric and text representations + */ + public static ProtoEnum.EnumConverter converter() { + return MultiPathAvatarTypeConverter.INSTANCE; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value, or null if unknown. + */ + public static MultiPathAvatarType forNumber(int value) { + return MultiPathAvatarTypeConverter.INSTANCE.forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @param other Fallback value in case the value is not known. + * @return The enum associated with the given numeric wire value, or the fallback value if unknown. + */ + public static MultiPathAvatarType forNumberOr(int number, MultiPathAvatarType other) { + MultiPathAvatarType value = forNumber(number); + return value == null ? other : value; + } + + enum MultiPathAvatarTypeConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + @Override + public final MultiPathAvatarType forNumber(final int value) { + switch(value) { + case 0: return MultiPathAvatarTypeNone; + case 1001: return Mar_7thKnightType; + case 1224: return Mar_7thRogueType; + case 8001: return BoyWarriorType; + case 8002: return GirlWarriorType; + case 8003: return BoyKnightType; + case 8004: return GirlKnightType; + case 8005: return BoyShamanType; + case 8006: return GirlShamanType; + default: return null; + } + } + + @Override + public final MultiPathAvatarType forName(final CharSequence value) { + switch (value.length()) { + case 13: { + if (ProtoUtil.isEqual("BoyKnightType", value)) { + return BoyKnightType; + } + if (ProtoUtil.isEqual("BoyShamanType", value)) { + return BoyShamanType; + } + break; + } + case 14: { + if (ProtoUtil.isEqual("BoyWarriorType", value)) { + return BoyWarriorType; + } + if (ProtoUtil.isEqual("GirlKnightType", value)) { + return GirlKnightType; + } + if (ProtoUtil.isEqual("GirlShamanType", value)) { + return GirlShamanType; + } + break; + } + case 15: { + if (ProtoUtil.isEqual("GirlWarriorType", value)) { + return GirlWarriorType; + } + break; + } + case 16: { + if (ProtoUtil.isEqual("Mar_7thRogueType", value)) { + return Mar_7thRogueType; + } + break; + } + case 17: { + if (ProtoUtil.isEqual("Mar_7thKnightType", value)) { + return Mar_7thKnightType; + } + break; + } + case 23: { + if (ProtoUtil.isEqual("MultiPathAvatarTypeNone", value)) { + return MultiPathAvatarTypeNone; + } + break; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java index 655c45a..a577993 100644 --- a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class NewMailScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 10; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 10; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -43,7 +43,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 10; * @return this */ public NewMailScNotify clearMailIdList() { @@ -53,7 +53,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 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. @@ -67,7 +67,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 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 @@ -81,7 +81,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 10; * @param value the mailIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 2; + * repeated uint32 mail_id_list = 10; * @param values the mailIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class NewMailScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mailIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class NewMailScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 82: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class NewMailScNotifyOuterClass { tag = input.readTag(); break; } - case 16: { + case 80: { // mailIdList [packed=false] tag = input.readRepeatedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java index 33acfe8..9ec26b7 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcExtraInfoOuterClass.java @@ -19,7 +19,7 @@ public final class NpcExtraInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_info = 7; */ private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance(); @@ -34,7 +34,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_info = 7; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -42,7 +42,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_info = 7; * @return this */ public NpcExtraInfo clearRogueInfo() { @@ -52,7 +52,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_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. @@ -66,7 +66,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_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 @@ -80,7 +80,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 9; + * optional .NpcRogueInfo rogue_info = 7; * @param value the rogueInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class NpcExtraInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueInfo); } } @@ -171,7 +171,7 @@ public final class NpcExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 58: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java index 95a6c21..c79b918 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java @@ -19,37 +19,37 @@ public final class NpcRogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  ???
-     *
- * - * optional uint32 dialogue_group_id = 2; - */ - private int dialogueGroupId; - - /** - * optional uint32 rogue_npc_id = 8; + * optional uint32 rogue_npc_id = 11; */ private int rogueNpcId; /** - * optional bool AAHKFINCBIL = 7; + * 
+     *  ???
+     *
+ * + * optional uint32 dialogue_group_id = 12; */ - private boolean aAHKFINCBIL; + private int dialogueGroupId; + + /** + * optional bool JFCBEHNMGNO = 1; + */ + private boolean jFCBEHNMGNO; /** * 
      *  unk
      *
* - * optional bool finish_dialogue = 10; + * optional bool finish_dialogue = 9; */ private boolean finishDialogue; /** - * optional bool LCKILOCIFJH = 15; + * optional bool CLFMCIDHJLM = 15; */ - private boolean lCKILOCIFJH; + private boolean cLFMCIDHJLM; private NpcRogueInfo() { } @@ -62,27 +62,64 @@ public final class NpcRogueInfoOuterClass { } /** - * 
-     *  ???
-     *
- * - * optional uint32 dialogue_group_id = 2; - * @return whether the dialogueGroupId field is set + * optional uint32 rogue_npc_id = 11; + * @return whether the rogueNpcId field is set */ - public boolean hasDialogueGroupId() { + public boolean hasRogueNpcId() { return (bitField0_ & 0x00000001) != 0; } + /** + * optional uint32 rogue_npc_id = 11; + * @return this + */ + public NpcRogueInfo clearRogueNpcId() { + bitField0_ &= ~0x00000001; + rogueNpcId = 0; + return this; + } + + /** + * optional uint32 rogue_npc_id = 11; + * @return the rogueNpcId + */ + public int getRogueNpcId() { + return rogueNpcId; + } + + /** + * optional uint32 rogue_npc_id = 11; + * @param value the rogueNpcId to set + * @return this + */ + public NpcRogueInfo setRogueNpcId(final int value) { + bitField0_ |= 0x00000001; + rogueNpcId = value; + return this; + } + /** * 
      *  ???
      *
* - * optional uint32 dialogue_group_id = 2; + * optional uint32 dialogue_group_id = 12; + * @return whether the dialogueGroupId field is set + */ + public boolean hasDialogueGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  ???
+     *
+ * + * optional uint32 dialogue_group_id = 12; * @return this */ public NpcRogueInfo clearDialogueGroupId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; dialogueGroupId = 0; return this; } @@ -92,7 +129,7 @@ public final class NpcRogueInfoOuterClass { * ??? * * - * optional uint32 dialogue_group_id = 2; + * optional uint32 dialogue_group_id = 12; * @return the dialogueGroupId */ public int getDialogueGroupId() { @@ -104,87 +141,50 @@ public final class NpcRogueInfoOuterClass { * ??? * * - * optional uint32 dialogue_group_id = 2; + * optional uint32 dialogue_group_id = 12; * @param value the dialogueGroupId to set * @return this */ public NpcRogueInfo setDialogueGroupId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; dialogueGroupId = value; return this; } /** - * optional uint32 rogue_npc_id = 8; - * @return whether the rogueNpcId field is set + * optional bool JFCBEHNMGNO = 1; + * @return whether the jFCBEHNMGNO field is set */ - public boolean hasRogueNpcId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 rogue_npc_id = 8; - * @return this - */ - public NpcRogueInfo clearRogueNpcId() { - bitField0_ &= ~0x00000002; - rogueNpcId = 0; - return this; - } - - /** - * optional uint32 rogue_npc_id = 8; - * @return the rogueNpcId - */ - public int getRogueNpcId() { - return rogueNpcId; - } - - /** - * optional uint32 rogue_npc_id = 8; - * @param value the rogueNpcId to set - * @return this - */ - public NpcRogueInfo setRogueNpcId(final int value) { - bitField0_ |= 0x00000002; - rogueNpcId = value; - return this; - } - - /** - * optional bool AAHKFINCBIL = 7; - * @return whether the aAHKFINCBIL field is set - */ - public boolean hasAAHKFINCBIL() { + public boolean hasJFCBEHNMGNO() { return (bitField0_ & 0x00000004) != 0; } /** - * optional bool AAHKFINCBIL = 7; + * optional bool JFCBEHNMGNO = 1; * @return this */ - public NpcRogueInfo clearAAHKFINCBIL() { + public NpcRogueInfo clearJFCBEHNMGNO() { bitField0_ &= ~0x00000004; - aAHKFINCBIL = false; + jFCBEHNMGNO = false; return this; } /** - * optional bool AAHKFINCBIL = 7; - * @return the aAHKFINCBIL + * optional bool JFCBEHNMGNO = 1; + * @return the jFCBEHNMGNO */ - public boolean getAAHKFINCBIL() { - return aAHKFINCBIL; + public boolean getJFCBEHNMGNO() { + return jFCBEHNMGNO; } /** - * optional bool AAHKFINCBIL = 7; - * @param value the aAHKFINCBIL to set + * optional bool JFCBEHNMGNO = 1; + * @param value the jFCBEHNMGNO to set * @return this */ - public NpcRogueInfo setAAHKFINCBIL(final boolean value) { + public NpcRogueInfo setJFCBEHNMGNO(final boolean value) { bitField0_ |= 0x00000004; - aAHKFINCBIL = value; + jFCBEHNMGNO = value; return this; } @@ -193,7 +193,7 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 10; + * optional bool finish_dialogue = 9; * @return whether the finishDialogue field is set */ public boolean hasFinishDialogue() { @@ -205,7 +205,7 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 10; + * optional bool finish_dialogue = 9; * @return this */ public NpcRogueInfo clearFinishDialogue() { @@ -219,7 +219,7 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 10; + * optional bool finish_dialogue = 9; * @return the finishDialogue */ public boolean getFinishDialogue() { @@ -231,7 +231,7 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 10; + * optional bool finish_dialogue = 9; * @param value the finishDialogue to set * @return this */ @@ -242,39 +242,39 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool LCKILOCIFJH = 15; - * @return whether the lCKILOCIFJH field is set + * optional bool CLFMCIDHJLM = 15; + * @return whether the cLFMCIDHJLM field is set */ - public boolean hasLCKILOCIFJH() { + public boolean hasCLFMCIDHJLM() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool LCKILOCIFJH = 15; + * optional bool CLFMCIDHJLM = 15; * @return this */ - public NpcRogueInfo clearLCKILOCIFJH() { + public NpcRogueInfo clearCLFMCIDHJLM() { bitField0_ &= ~0x00000010; - lCKILOCIFJH = false; + cLFMCIDHJLM = false; return this; } /** - * optional bool LCKILOCIFJH = 15; - * @return the lCKILOCIFJH + * optional bool CLFMCIDHJLM = 15; + * @return the cLFMCIDHJLM */ - public boolean getLCKILOCIFJH() { - return lCKILOCIFJH; + public boolean getCLFMCIDHJLM() { + return cLFMCIDHJLM; } /** - * optional bool LCKILOCIFJH = 15; - * @param value the lCKILOCIFJH to set + * optional bool CLFMCIDHJLM = 15; + * @param value the cLFMCIDHJLM to set * @return this */ - public NpcRogueInfo setLCKILOCIFJH(final boolean value) { + public NpcRogueInfo setCLFMCIDHJLM(final boolean value) { bitField0_ |= 0x00000010; - lCKILOCIFJH = value; + cLFMCIDHJLM = value; return this; } @@ -283,11 +283,11 @@ public final class NpcRogueInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dialogueGroupId = other.dialogueGroupId; rogueNpcId = other.rogueNpcId; - aAHKFINCBIL = other.aAHKFINCBIL; + dialogueGroupId = other.dialogueGroupId; + jFCBEHNMGNO = other.jFCBEHNMGNO; finishDialogue = other.finishDialogue; - lCKILOCIFJH = other.lCKILOCIFJH; + cLFMCIDHJLM = other.cLFMCIDHJLM; } return this; } @@ -298,20 +298,20 @@ public final class NpcRogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasDialogueGroupId()) { - setDialogueGroupId(other.dialogueGroupId); - } if (other.hasRogueNpcId()) { setRogueNpcId(other.rogueNpcId); } - if (other.hasAAHKFINCBIL()) { - setAAHKFINCBIL(other.aAHKFINCBIL); + if (other.hasDialogueGroupId()) { + setDialogueGroupId(other.dialogueGroupId); + } + if (other.hasJFCBEHNMGNO()) { + setJFCBEHNMGNO(other.jFCBEHNMGNO); } if (other.hasFinishDialogue()) { setFinishDialogue(other.finishDialogue); } - if (other.hasLCKILOCIFJH()) { - setLCKILOCIFJH(other.lCKILOCIFJH); + if (other.hasCLFMCIDHJLM()) { + setCLFMCIDHJLM(other.cLFMCIDHJLM); } return this; } @@ -323,11 +323,11 @@ public final class NpcRogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dialogueGroupId = 0; rogueNpcId = 0; - aAHKFINCBIL = false; + dialogueGroupId = 0; + jFCBEHNMGNO = false; finishDialogue = false; - lCKILOCIFJH = false; + cLFMCIDHJLM = false; return this; } @@ -351,34 +351,34 @@ public final class NpcRogueInfoOuterClass { } NpcRogueInfo other = (NpcRogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasRogueNpcId() || rogueNpcId == other.rogueNpcId) - && (!hasAAHKFINCBIL() || aAHKFINCBIL == other.aAHKFINCBIL) + && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) + && (!hasJFCBEHNMGNO() || jFCBEHNMGNO == other.jFCBEHNMGNO) && (!hasFinishDialogue() || finishDialogue == other.finishDialogue) - && (!hasLCKILOCIFJH() || lCKILOCIFJH == other.lCKILOCIFJH); + && (!hasCLFMCIDHJLM() || cLFMCIDHJLM == other.cLFMCIDHJLM); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(dialogueGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(rogueNpcId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(dialogueGroupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeBoolNoTag(aAHKFINCBIL); + output.writeRawByte((byte) 8); + output.writeBoolNoTag(jFCBEHNMGNO); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeBoolNoTag(finishDialogue); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 120); - output.writeBoolNoTag(lCKILOCIFJH); + output.writeBoolNoTag(cLFMCIDHJLM); } } @@ -386,10 +386,10 @@ public final class NpcRogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueNpcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -410,34 +410,34 @@ public final class NpcRogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // dialogueGroupId - dialogueGroupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 88: { // rogueNpcId rogueNpcId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // dialogueGroupId + dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 8) { break; } } - case 56: { - // aAHKFINCBIL - aAHKFINCBIL = input.readBool(); + case 8: { + // jFCBEHNMGNO + jFCBEHNMGNO = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { + case 72: { // finishDialogue finishDialogue = input.readBool(); bitField0_ |= 0x00000008; @@ -447,8 +447,8 @@ public final class NpcRogueInfoOuterClass { } } case 120: { - // lCKILOCIFJH - lCKILOCIFJH = input.readBool(); + // cLFMCIDHJLM + cLFMCIDHJLM = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -473,19 +473,19 @@ public final class NpcRogueInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.rogueNpcId, rogueNpcId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.aAHKFINCBIL, aAHKFINCBIL); + output.writeBool(FieldNames.jFCBEHNMGNO, jFCBEHNMGNO); } if ((bitField0_ & 0x00000008) != 0) { output.writeBool(FieldNames.finishDialogue, finishDialogue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.lCKILOCIFJH, lCKILOCIFJH); + output.writeBool(FieldNames.cLFMCIDHJLM, cLFMCIDHJLM); } output.endObject(); } @@ -497,11 +497,11 @@ public final class NpcRogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1758320386: - case 1899979106: { - if (input.isAtField(FieldNames.dialogueGroupId)) { + case -1140086238: + case 1751967038: { + if (input.isAtField(FieldNames.rogueNpcId)) { if (!input.trySkipNullValue()) { - dialogueGroupId = input.readUInt32(); + rogueNpcId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -509,11 +509,11 @@ public final class NpcRogueInfoOuterClass { } break; } - case -1140086238: - case 1751967038: { - if (input.isAtField(FieldNames.rogueNpcId)) { + case 1758320386: + case 1899979106: { + if (input.isAtField(FieldNames.dialogueGroupId)) { if (!input.trySkipNullValue()) { - rogueNpcId = input.readUInt32(); + dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -521,10 +521,10 @@ public final class NpcRogueInfoOuterClass { } break; } - case -287370838: { - if (input.isAtField(FieldNames.aAHKFINCBIL)) { + case 763452523: { + if (input.isAtField(FieldNames.jFCBEHNMGNO)) { if (!input.trySkipNullValue()) { - aAHKFINCBIL = input.readBool(); + jFCBEHNMGNO = input.readBool(); bitField0_ |= 0x00000004; } } else { @@ -544,10 +544,10 @@ public final class NpcRogueInfoOuterClass { } break; } - case 1901777798: { - if (input.isAtField(FieldNames.lCKILOCIFJH)) { + case -1613982031: { + if (input.isAtField(FieldNames.cLFMCIDHJLM)) { if (!input.trySkipNullValue()) { - lCKILOCIFJH = input.readBool(); + cLFMCIDHJLM = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -607,15 +607,15 @@ public final class NpcRogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); - static final FieldName rogueNpcId = FieldName.forField("rogueNpcId", "rogue_npc_id"); - static final FieldName aAHKFINCBIL = FieldName.forField("AAHKFINCBIL"); + static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); + + static final FieldName jFCBEHNMGNO = FieldName.forField("JFCBEHNMGNO"); static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue"); - static final FieldName lCKILOCIFJH = FieldName.forField("LCKILOCIFJH"); + static final FieldName cLFMCIDHJLM = FieldName.forField("CLFMCIDHJLM"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java index 9e746b4..cc2db5a 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java @@ -19,7 +19,7 @@ public final class NpcTalkInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_talk_id = 14; + * optional uint32 npc_talk_id = 3; */ private int npcTalkId; @@ -34,7 +34,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 14; + * optional uint32 npc_talk_id = 3; * @return whether the npcTalkId field is set */ public boolean hasNpcTalkId() { @@ -42,7 +42,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 14; + * optional uint32 npc_talk_id = 3; * @return this */ public NpcTalkInfo clearNpcTalkId() { @@ -52,7 +52,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 14; + * optional uint32 npc_talk_id = 3; * @return the npcTalkId */ public int getNpcTalkId() { @@ -60,7 +60,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 14; + * optional uint32 npc_talk_id = 3; * @param value the npcTalkId to set * @return this */ @@ -129,7 +129,7 @@ public final class NpcTalkInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(npcTalkId); } } @@ -150,7 +150,7 @@ public final class NpcTalkInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 24: { // npcTalkId npcTalkId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java index 4ed8a48..fb2e174 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java @@ -21,19 +21,19 @@ public final class PVEBattleResultCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 5; + * optional uint32 battle_id = 3; */ - private int clientResVersion; + private int battleId; /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; */ private int stageId; /** - * optional uint32 battle_id = 11; + * optional uint32 client_res_version = 7; */ - private int battleId; + private int clientResVersion; /** * optional uint32 cost_time = 13; @@ -41,27 +41,27 @@ public final class PVEBattleResultCsReqOuterClass { private int costTime; /** - * optional .BattleEndStatus end_status = 15; + * optional .BattleEndStatus end_status = 9; */ private int endStatus; /** - * optional bool is_ai_consider_ultra_skill = 10; + * optional bool is_ai_consider_ultra_skill = 12; */ private boolean isAiConsiderUltraSkill; /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 5; */ private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance(); /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; */ private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance(); /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_list = 8; */ private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory()); @@ -76,44 +76,44 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 client_res_version = 5; - * @return whether the clientResVersion field is set + * optional uint32 battle_id = 3; + * @return whether the battleId field is set */ - public boolean hasClientResVersion() { + public boolean hasBattleId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_res_version = 5; + * optional uint32 battle_id = 3; * @return this */ - public PVEBattleResultCsReq clearClientResVersion() { + public PVEBattleResultCsReq clearBattleId() { bitField0_ &= ~0x00000001; - clientResVersion = 0; + battleId = 0; return this; } /** - * optional uint32 client_res_version = 5; - * @return the clientResVersion + * optional uint32 battle_id = 3; + * @return the battleId */ - public int getClientResVersion() { - return clientResVersion; + public int getBattleId() { + return battleId; } /** - * optional uint32 client_res_version = 5; - * @param value the clientResVersion to set + * optional uint32 battle_id = 3; + * @param value the battleId to set * @return this */ - public PVEBattleResultCsReq setClientResVersion(final int value) { + public PVEBattleResultCsReq setBattleId(final int value) { bitField0_ |= 0x00000001; - clientResVersion = value; + battleId = value; return this; } /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -121,7 +121,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; * @return this */ public PVEBattleResultCsReq clearStageId() { @@ -131,7 +131,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; * @return the stageId */ public int getStageId() { @@ -139,7 +139,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 8; + * optional uint32 stage_id = 6; * @param value the stageId to set * @return this */ @@ -150,39 +150,39 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 11; - * @return whether the battleId field is set + * optional uint32 client_res_version = 7; + * @return whether the clientResVersion field is set */ - public boolean hasBattleId() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 battle_id = 11; + * optional uint32 client_res_version = 7; * @return this */ - public PVEBattleResultCsReq clearBattleId() { + public PVEBattleResultCsReq clearClientResVersion() { bitField0_ &= ~0x00000004; - battleId = 0; + clientResVersion = 0; return this; } /** - * optional uint32 battle_id = 11; - * @return the battleId + * optional uint32 client_res_version = 7; + * @return the clientResVersion */ - public int getBattleId() { - return battleId; + public int getClientResVersion() { + return clientResVersion; } /** - * optional uint32 battle_id = 11; - * @param value the battleId to set + * optional uint32 client_res_version = 7; + * @param value the clientResVersion to set * @return this */ - public PVEBattleResultCsReq setBattleId(final int value) { + public PVEBattleResultCsReq setClientResVersion(final int value) { bitField0_ |= 0x00000004; - battleId = value; + clientResVersion = value; return this; } @@ -224,7 +224,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 15; + * optional .BattleEndStatus end_status = 9; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -232,7 +232,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 15; + * optional .BattleEndStatus end_status = 9; * @return this */ public PVEBattleResultCsReq clearEndStatus() { @@ -242,7 +242,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 15; + * optional .BattleEndStatus end_status = 9; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -275,7 +275,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 15; + * optional .BattleEndStatus end_status = 9; * @param value the endStatus to set * @return this */ @@ -287,7 +287,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 10; + * optional bool is_ai_consider_ultra_skill = 12; * @return whether the isAiConsiderUltraSkill field is set */ public boolean hasIsAiConsiderUltraSkill() { @@ -295,7 +295,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 10; + * optional bool is_ai_consider_ultra_skill = 12; * @return this */ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { @@ -305,7 +305,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 10; + * optional bool is_ai_consider_ultra_skill = 12; * @return the isAiConsiderUltraSkill */ public boolean getIsAiConsiderUltraSkill() { @@ -313,7 +313,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 10; + * optional bool is_ai_consider_ultra_skill = 12; * @param value the isAiConsiderUltraSkill to set * @return this */ @@ -324,7 +324,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 5; * @return whether the stt field is set */ public boolean hasStt() { @@ -332,7 +332,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 5; * @return this */ public PVEBattleResultCsReq clearStt() { @@ -342,7 +342,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 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. @@ -356,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 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 @@ -370,7 +370,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 14; + * optional .BattleStatistics stt = 5; * @param value the stt to set * @return this */ @@ -381,7 +381,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; * @return whether the turnSnapshotHash field is set */ public boolean hasTurnSnapshotHash() { @@ -389,7 +389,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; * @return this */ public PVEBattleResultCsReq clearTurnSnapshotHash() { @@ -399,7 +399,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 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. @@ -413,7 +413,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 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 @@ -427,7 +427,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; * @param value the turnSnapshotHash to add * @return this */ @@ -438,7 +438,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; * @param values the turnSnapshotHash to add * @return this */ @@ -449,7 +449,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 1; + * optional bytes turn_snapshot_hash = 11; * @param values the turnSnapshotHash to set * @return this */ @@ -460,7 +460,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_list = 8; * @return whether the opList field is set */ public boolean hasOpList() { @@ -468,7 +468,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_list = 8; * @return this */ public PVEBattleResultCsReq clearOpList() { @@ -478,7 +478,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_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. @@ -492,7 +492,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_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 @@ -506,7 +506,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_list = 8; * @param value the opList to add * @return this */ @@ -517,7 +517,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 12; + * repeated .BattleOp op_list = 8; * @param values the opList to add * @return this */ @@ -532,9 +532,9 @@ public final class PVEBattleResultCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientResVersion = other.clientResVersion; - stageId = other.stageId; battleId = other.battleId; + stageId = other.stageId; + clientResVersion = other.clientResVersion; costTime = other.costTime; endStatus = other.endStatus; isAiConsiderUltraSkill = other.isAiConsiderUltraSkill; @@ -551,14 +551,14 @@ public final class PVEBattleResultCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasClientResVersion()) { - setClientResVersion(other.clientResVersion); + if (other.hasBattleId()) { + setBattleId(other.battleId); } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasBattleId()) { - setBattleId(other.battleId); + if (other.hasClientResVersion()) { + setClientResVersion(other.clientResVersion); } if (other.hasCostTime()) { setCostTime(other.costTime); @@ -588,9 +588,9 @@ public final class PVEBattleResultCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - clientResVersion = 0; - stageId = 0; battleId = 0; + stageId = 0; + clientResVersion = 0; costTime = 0; endStatus = 0; isAiConsiderUltraSkill = false; @@ -623,9 +623,9 @@ public final class PVEBattleResultCsReqOuterClass { } PVEBattleResultCsReq other = (PVEBattleResultCsReq) o; return bitField0_ == other.bitField0_ - && (!hasClientResVersion() || clientResVersion == other.clientResVersion) - && (!hasStageId() || stageId == other.stageId) && (!hasBattleId() || battleId == other.battleId) + && (!hasStageId() || stageId == other.stageId) + && (!hasClientResVersion() || clientResVersion == other.clientResVersion) && (!hasCostTime() || costTime == other.costTime) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill) @@ -637,40 +637,40 @@ public final class PVEBattleResultCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(battleId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(costTime); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 96); output.writeBoolNoTag(isAiConsiderUltraSkill); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 42); output.writeMessageNoTag(stt); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 90); output.writeBytesNoTag(turnSnapshotHash); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < opList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 66); output.writeMessageNoTag(opList.get(i)); } } @@ -680,13 +680,13 @@ public final class PVEBattleResultCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); @@ -716,27 +716,27 @@ public final class PVEBattleResultCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 24: { + // battleId + battleId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { - // battleId - battleId = input.readUInt32(); + case 56: { + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -748,11 +748,11 @@ public final class PVEBattleResultCsReqOuterClass { costTime = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // endStatus final int value = input.readInt32(); if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { @@ -760,38 +760,38 @@ public final class PVEBattleResultCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 80) { + if (tag != 96) { break; } } - case 80: { + case 96: { // isAiConsiderUltraSkill isAiConsiderUltraSkill = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 114) { + if (tag != 42) { break; } } - case 114: { + case 42: { // stt input.readMessage(stt); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 10) { + if (tag != 90) { break; } } - case 10: { + case 90: { // turnSnapshotHash input.readBytes(turnSnapshotHash); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 98) { + if (tag != 66) { break; } } - case 98: { + case 66: { // opList tag = input.readRepeatedMessage(opList, tag); bitField0_ |= 0x00000100; @@ -817,13 +817,13 @@ public final class PVEBattleResultCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.costTime, costTime); @@ -853,11 +853,11 @@ public final class PVEBattleResultCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + battleId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -877,11 +877,11 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1018,11 +1018,11 @@ public final class PVEBattleResultCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); + static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); static final FieldName costTime = FieldName.forField("costTime", "cost_time"); diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java index d1078e1..710e4e7 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java @@ -21,72 +21,72 @@ public final class PVEBattleResultScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_id = 2; - */ - private int eventId; - - /** - * optional uint32 battle_id = 4; - */ - private int battleId; - - /** - * optional uint32 mismatch_turn_count = 6; + * optional uint32 mismatch_turn_count = 2; */ private int mismatchTurnCount; /** - * optional uint32 stage_id = 7; + * optional uint32 event_id = 3; + */ + private int eventId; + + /** + * optional uint32 stage_id = 4; */ private int stageId; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .BattleEndStatus end_status = 11; + * optional uint32 battle_id = 10; + */ + private int battleId; + + /** + * optional .BattleEndStatus end_status = 7; */ private int endStatus; /** - * optional bool check_identical = 8; + * optional bool check_identical = 1; */ private boolean checkIdentical; /** - * optional .ItemList drop_data = 1; - */ - private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); - - /** - * optional .ItemList unk1 = 3; + * optional .ItemList unk1 = 5; */ private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 6; */ private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk3 = 253; + * optional .ItemList drop_data = 14; + */ + private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); + + /** + * optional .ItemList unk3 = 1822; */ private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance(); /** - * optional string res_version = 5; + * optional string res_version = 12; */ private final Utf8String resVersion = Utf8String.newEmptyInstance(); /** - * optional string bin_version = 13; + * optional string bin_version = 15; */ private final Utf8String binVersion = Utf8String.newEmptyInstance(); /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 11; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); @@ -101,99 +101,25 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 2; - * @return whether the eventId field is set + * optional uint32 mismatch_turn_count = 2; + * @return whether the mismatchTurnCount field is set */ - public boolean hasEventId() { + public boolean hasMismatchTurnCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 event_id = 2; - * @return this - */ - public PVEBattleResultScRsp clearEventId() { - bitField0_ &= ~0x00000001; - eventId = 0; - return this; - } - - /** - * optional uint32 event_id = 2; - * @return the eventId - */ - public int getEventId() { - return eventId; - } - - /** - * optional uint32 event_id = 2; - * @param value the eventId to set - * @return this - */ - public PVEBattleResultScRsp setEventId(final int value) { - bitField0_ |= 0x00000001; - eventId = value; - return this; - } - - /** - * optional uint32 battle_id = 4; - * @return whether the battleId field is set - */ - public boolean hasBattleId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 battle_id = 4; - * @return this - */ - public PVEBattleResultScRsp clearBattleId() { - bitField0_ &= ~0x00000002; - battleId = 0; - return this; - } - - /** - * optional uint32 battle_id = 4; - * @return the battleId - */ - public int getBattleId() { - return battleId; - } - - /** - * optional uint32 battle_id = 4; - * @param value the battleId to set - * @return this - */ - public PVEBattleResultScRsp setBattleId(final int value) { - bitField0_ |= 0x00000002; - battleId = value; - return this; - } - - /** - * optional uint32 mismatch_turn_count = 6; - * @return whether the mismatchTurnCount field is set - */ - public boolean hasMismatchTurnCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 mismatch_turn_count = 6; + * optional uint32 mismatch_turn_count = 2; * @return this */ public PVEBattleResultScRsp clearMismatchTurnCount() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; mismatchTurnCount = 0; return this; } /** - * optional uint32 mismatch_turn_count = 6; + * optional uint32 mismatch_turn_count = 2; * @return the mismatchTurnCount */ public int getMismatchTurnCount() { @@ -201,36 +127,73 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 6; + * optional uint32 mismatch_turn_count = 2; * @param value the mismatchTurnCount to set * @return this */ public PVEBattleResultScRsp setMismatchTurnCount(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; mismatchTurnCount = value; return this; } /** - * optional uint32 stage_id = 7; - * @return whether the stageId field is set + * optional uint32 event_id = 3; + * @return whether the eventId field is set */ - public boolean hasStageId() { - return (bitField0_ & 0x00000008) != 0; + public boolean hasEventId() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 stage_id = 7; + * optional uint32 event_id = 3; + * @return this + */ + public PVEBattleResultScRsp clearEventId() { + bitField0_ &= ~0x00000002; + eventId = 0; + return this; + } + + /** + * optional uint32 event_id = 3; + * @return the eventId + */ + public int getEventId() { + return eventId; + } + + /** + * optional uint32 event_id = 3; + * @param value the eventId to set + * @return this + */ + public PVEBattleResultScRsp setEventId(final int value) { + bitField0_ |= 0x00000002; + eventId = value; + return this; + } + + /** + * optional uint32 stage_id = 4; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 stage_id = 4; * @return this */ public PVEBattleResultScRsp clearStageId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; stageId = 0; return this; } /** - * optional uint32 stage_id = 7; + * optional uint32 stage_id = 4; * @return the stageId */ public int getStageId() { @@ -238,36 +201,36 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 stage_id = 7; + * optional uint32 stage_id = 4; * @param value the stageId to set * @return this */ public PVEBattleResultScRsp setStageId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; stageId = value; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 8; * @return this */ public PVEBattleResultScRsp clearRetcode() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -275,18 +238,55 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ public PVEBattleResultScRsp setRetcode(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; retcode = value; return this; } /** - * optional .BattleEndStatus end_status = 11; + * optional uint32 battle_id = 10; + * @return whether the battleId field is set + */ + public boolean hasBattleId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 battle_id = 10; + * @return this + */ + public PVEBattleResultScRsp clearBattleId() { + bitField0_ &= ~0x00000010; + battleId = 0; + return this; + } + + /** + * optional uint32 battle_id = 10; + * @return the battleId + */ + public int getBattleId() { + return battleId; + } + + /** + * optional uint32 battle_id = 10; + * @param value the battleId to set + * @return this + */ + public PVEBattleResultScRsp setBattleId(final int value) { + bitField0_ |= 0x00000010; + battleId = value; + return this; + } + + /** + * optional .BattleEndStatus end_status = 7; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -294,7 +294,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 7; * @return this */ public PVEBattleResultScRsp clearEndStatus() { @@ -304,7 +304,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 7; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -337,7 +337,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 11; + * optional .BattleEndStatus end_status = 7; * @param value the endStatus to set * @return this */ @@ -349,7 +349,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 8; + * optional bool check_identical = 1; * @return whether the checkIdentical field is set */ public boolean hasCheckIdentical() { @@ -357,7 +357,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 8; + * optional bool check_identical = 1; * @return this */ public PVEBattleResultScRsp clearCheckIdentical() { @@ -367,7 +367,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 8; + * optional bool check_identical = 1; * @return the checkIdentical */ public boolean getCheckIdentical() { @@ -375,7 +375,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 8; + * optional bool check_identical = 1; * @param value the checkIdentical to set * @return this */ @@ -386,82 +386,25 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 1; - * @return whether the dropData field is set + * optional .ItemList unk1 = 5; + * @return whether the unk1 field is set */ - public boolean hasDropData() { + public boolean hasUnk1() { return (bitField0_ & 0x00000080) != 0; } /** - * optional .ItemList drop_data = 1; - * @return this - */ - public PVEBattleResultScRsp clearDropData() { - bitField0_ &= ~0x00000080; - dropData.clear(); - return this; - } - - /** - * optional .ItemList drop_data = 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 #getMutableDropData()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ItemListOuterClass.ItemList getDropData() { - return dropData; - } - - /** - * optional .ItemList drop_data = 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 getMutableDropData() { - bitField0_ |= 0x00000080; - return dropData; - } - - /** - * optional .ItemList drop_data = 1; - * @param value the dropData to set - * @return this - */ - public PVEBattleResultScRsp setDropData(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000080; - dropData.copyFrom(value); - return this; - } - - /** - * optional .ItemList unk1 = 3; - * @return whether the unk1 field is set - */ - public boolean hasUnk1() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional .ItemList unk1 = 3; + * optional .ItemList unk1 = 5; * @return this */ public PVEBattleResultScRsp clearUnk1() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; unk1.clear(); return this; } /** - * optional .ItemList unk1 = 3; + * optional .ItemList unk1 = 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. @@ -475,7 +418,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 3; + * optional .ItemList unk1 = 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 @@ -484,41 +427,41 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableUnk1() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return unk1; } /** - * optional .ItemList unk1 = 3; + * optional .ItemList unk1 = 5; * @param value the unk1 to set * @return this */ public PVEBattleResultScRsp setUnk1(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; unk1.copyFrom(value); return this; } /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 6; * @return whether the unk2 field is set */ public boolean hasUnk2() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 6; * @return this */ public PVEBattleResultScRsp clearUnk2() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; unk2.clear(); return this; } /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 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. @@ -532,7 +475,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 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 @@ -541,23 +484,80 @@ public final class PVEBattleResultScRspOuterClass { * @return internal storage object for modifications */ public ItemListOuterClass.ItemList getMutableUnk2() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return unk2; } /** - * optional .ItemList unk2 = 10; + * optional .ItemList unk2 = 6; * @param value the unk2 to set * @return this */ public PVEBattleResultScRsp setUnk2(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; unk2.copyFrom(value); return this; } /** - * optional .ItemList unk3 = 253; + * optional .ItemList drop_data = 14; + * @return whether the dropData field is set + */ + public boolean hasDropData() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional .ItemList drop_data = 14; + * @return this + */ + public PVEBattleResultScRsp clearDropData() { + bitField0_ &= ~0x00000200; + dropData.clear(); + return this; + } + + /** + * optional .ItemList drop_data = 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. + * + * Use {@link #getMutableDropData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getDropData() { + return dropData; + } + + /** + * optional .ItemList drop_data = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ItemListOuterClass.ItemList getMutableDropData() { + bitField0_ |= 0x00000200; + return dropData; + } + + /** + * optional .ItemList drop_data = 14; + * @param value the dropData to set + * @return this + */ + public PVEBattleResultScRsp setDropData(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000200; + dropData.copyFrom(value); + return this; + } + + /** + * optional .ItemList unk3 = 1822; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -565,7 +565,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 253; + * optional .ItemList unk3 = 1822; * @return this */ public PVEBattleResultScRsp clearUnk3() { @@ -575,7 +575,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 253; + * optional .ItemList unk3 = 1822; * * 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. @@ -589,7 +589,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 253; + * optional .ItemList unk3 = 1822; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -603,7 +603,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 253; + * optional .ItemList unk3 = 1822; * @param value the unk3 to set * @return this */ @@ -614,7 +614,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @return whether the resVersion field is set */ public boolean hasResVersion() { @@ -622,7 +622,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @return this */ public PVEBattleResultScRsp clearResVersion() { @@ -632,7 +632,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @return the resVersion */ public String getResVersion() { @@ -640,7 +640,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @return internal {@code Utf8String} representation of resVersion for reading */ public Utf8String getResVersionBytes() { @@ -648,7 +648,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @return internal {@code Utf8String} representation of resVersion for modifications */ public Utf8String getMutableResVersionBytes() { @@ -657,7 +657,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @param value the resVersion to set * @return this */ @@ -668,7 +668,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 5; + * optional string res_version = 12; * @param value the resVersion to set * @return this */ @@ -679,7 +679,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @return whether the binVersion field is set */ public boolean hasBinVersion() { @@ -687,7 +687,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @return this */ public PVEBattleResultScRsp clearBinVersion() { @@ -697,7 +697,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @return the binVersion */ public String getBinVersion() { @@ -705,7 +705,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @return internal {@code Utf8String} representation of binVersion for reading */ public Utf8String getBinVersionBytes() { @@ -713,7 +713,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @return internal {@code Utf8String} representation of binVersion for modifications */ public Utf8String getMutableBinVersionBytes() { @@ -722,7 +722,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @param value the binVersion to set * @return this */ @@ -733,7 +733,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 13; + * optional string bin_version = 15; * @param value the binVersion to set * @return this */ @@ -744,7 +744,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 11; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { @@ -752,7 +752,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 11; * @return this */ public PVEBattleResultScRsp clearBattleAvatarList() { @@ -762,7 +762,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 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. @@ -776,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 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 @@ -790,7 +790,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 11; * @param value the battleAvatarList to add * @return this */ @@ -802,7 +802,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 15; + * repeated .BattleAvatar battle_avatar_list = 11; * @param values the battleAvatarList to add * @return this */ @@ -818,16 +818,16 @@ public final class PVEBattleResultScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - eventId = other.eventId; - battleId = other.battleId; mismatchTurnCount = other.mismatchTurnCount; + eventId = other.eventId; stageId = other.stageId; retcode = other.retcode; + battleId = other.battleId; endStatus = other.endStatus; checkIdentical = other.checkIdentical; - dropData.copyFrom(other.dropData); unk1.copyFrom(other.unk1); unk2.copyFrom(other.unk2); + dropData.copyFrom(other.dropData); unk3.copyFrom(other.unk3); resVersion.copyFrom(other.resVersion); binVersion.copyFrom(other.binVersion); @@ -842,36 +842,36 @@ public final class PVEBattleResultScRspOuterClass { return this; } cachedSize = -1; - if (other.hasEventId()) { - setEventId(other.eventId); - } - if (other.hasBattleId()) { - setBattleId(other.battleId); - } if (other.hasMismatchTurnCount()) { setMismatchTurnCount(other.mismatchTurnCount); } + if (other.hasEventId()) { + setEventId(other.eventId); + } if (other.hasStageId()) { setStageId(other.stageId); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasBattleId()) { + setBattleId(other.battleId); + } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); } if (other.hasCheckIdentical()) { setCheckIdentical(other.checkIdentical); } - if (other.hasDropData()) { - getMutableDropData().mergeFrom(other.dropData); - } if (other.hasUnk1()) { getMutableUnk1().mergeFrom(other.unk1); } if (other.hasUnk2()) { getMutableUnk2().mergeFrom(other.unk2); } + if (other.hasDropData()) { + getMutableDropData().mergeFrom(other.dropData); + } if (other.hasUnk3()) { getMutableUnk3().mergeFrom(other.unk3); } @@ -894,16 +894,16 @@ public final class PVEBattleResultScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - eventId = 0; - battleId = 0; mismatchTurnCount = 0; + eventId = 0; stageId = 0; retcode = 0; + battleId = 0; endStatus = 0; checkIdentical = false; - dropData.clear(); unk1.clear(); unk2.clear(); + dropData.clear(); unk3.clear(); resVersion.clear(); binVersion.clear(); @@ -918,9 +918,9 @@ public final class PVEBattleResultScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - dropData.clearQuick(); unk1.clearQuick(); unk2.clearQuick(); + dropData.clearQuick(); unk3.clearQuick(); resVersion.clear(); binVersion.clear(); @@ -938,16 +938,16 @@ public final class PVEBattleResultScRspOuterClass { } PVEBattleResultScRsp other = (PVEBattleResultScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEventId() || eventId == other.eventId) - && (!hasBattleId() || battleId == other.battleId) && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) + && (!hasEventId() || eventId == other.eventId) && (!hasStageId() || stageId == other.stageId) && (!hasRetcode() || retcode == other.retcode) + && (!hasBattleId() || battleId == other.battleId) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasCheckIdentical() || checkIdentical == other.checkIdentical) - && (!hasDropData() || dropData.equals(other.dropData)) && (!hasUnk1() || unk1.equals(other.unk1)) && (!hasUnk2() || unk2.equals(other.unk2)) + && (!hasDropData() || dropData.equals(other.dropData)) && (!hasUnk3() || unk3.equals(other.unk3)) && (!hasResVersion() || resVersion.equals(other.resVersion)) && (!hasBinVersion() || binVersion.equals(other.binVersion)) @@ -958,59 +958,59 @@ public final class PVEBattleResultScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(eventId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(battleId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); output.writeUInt32NoTag(mismatchTurnCount); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(eventId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 32); output.writeUInt32NoTag(stageId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeBoolNoTag(checkIdentical); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(dropData); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(unk1); } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 82); + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 50); output.writeMessageNoTag(unk2); } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(dropData); + } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 4074); + output.writeRawLittleEndian16((short) 29170); output.writeMessageNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 98); output.writeStringNoTag(resVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 122); output.writeStringNoTag(binVersion); } if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(battleAvatarList.get(i)); } } @@ -1020,20 +1020,20 @@ public final class PVEBattleResultScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); } @@ -1041,14 +1041,14 @@ public final class PVEBattleResultScRspOuterClass { size += 2; } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(dropData); - } - if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(unk1); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(unk2); } + if ((bitField0_ & 0x00000200) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(dropData); + } if ((bitField0_ & 0x00000400) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(unk3); } @@ -1072,51 +1072,51 @@ public final class PVEBattleResultScRspOuterClass { while (true) { switch (tag) { case 16: { + // mismatchTurnCount + mismatchTurnCount = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // eventId eventId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 32) { break; } } case 32: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000002; + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { - // mismatchTurnCount - mismatchTurnCount = input.readUInt32(); - bitField0_ |= 0x00000004; + case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // battleId + battleId = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { // endStatus final int value = input.readInt32(); if (BattleEndStatusOuterClass.BattleEndStatus.forNumber(value) != null) { @@ -1124,74 +1124,74 @@ public final class PVEBattleResultScRspOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 64) { + if (tag != 8) { break; } } - case 64: { + case 8: { // checkIdentical checkIdentical = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 10) { - break; - } - } - case 10: { - // dropData - input.readMessage(dropData); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // unk1 - input.readMessage(unk1); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // unk2 - input.readMessage(unk2); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 2026) { - break; - } - } - case 2026: { - // unk3 - input.readMessage(unk3); - bitField0_ |= 0x00000400; - tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // resVersion - input.readString(resVersion); - bitField0_ |= 0x00000800; + // unk1 + input.readMessage(unk1); + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 106) { + if (tag != 50) { break; } } - case 106: { - // binVersion - input.readString(binVersion); - bitField0_ |= 0x00001000; + case 50: { + // unk2 + input.readMessage(unk2); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // dropData + input.readMessage(dropData); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 14578) { + break; + } + } + case 14578: { + // unk3 + input.readMessage(unk3); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // resVersion + input.readString(resVersion); + bitField0_ |= 0x00000800; tag = input.readTag(); if (tag != 122) { break; } } case 122: { + // binVersion + input.readString(binVersion); + bitField0_ |= 0x00001000; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // battleAvatarList tag = input.readRepeatedMessage(battleAvatarList, tag); bitField0_ |= 0x00002000; @@ -1217,20 +1217,20 @@ public final class PVEBattleResultScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.eventId, eventId); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.battleId, battleId); + } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); } @@ -1238,14 +1238,14 @@ public final class PVEBattleResultScRspOuterClass { output.writeBool(FieldNames.checkIdentical, checkIdentical); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.dropData, dropData); - } - if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.unk1, unk1); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.unk2, unk2); } + if ((bitField0_ & 0x00000200) != 0) { + output.writeMessage(FieldNames.dropData, dropData); + } if ((bitField0_ & 0x00000400) != 0) { output.writeMessage(FieldNames.unk3, unk3); } @@ -1268,11 +1268,11 @@ public final class PVEBattleResultScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { + case -2096079772: + case -1800906274: { + if (input.isAtField(FieldNames.mismatchTurnCount)) { if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); + mismatchTurnCount = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1280,11 +1280,11 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); + eventId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1292,24 +1292,12 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case -2096079772: - case -1800906274: { - if (input.isAtField(FieldNames.mismatchTurnCount)) { - if (!input.trySkipNullValue()) { - mismatchTurnCount = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1897528135: case 1306191356: { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1320,6 +1308,18 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { + if (!input.trySkipNullValue()) { + battleId = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1356,23 +1356,11 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case -433028295: - case -513968390: { - if (input.isAtField(FieldNames.dropData)) { - if (!input.trySkipNullValue()) { - input.readMessage(dropData); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } case 3594623: { if (input.isAtField(FieldNames.unk1)) { if (!input.trySkipNullValue()) { input.readMessage(unk1); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1383,6 +1371,18 @@ public final class PVEBattleResultScRspOuterClass { if (input.isAtField(FieldNames.unk2)) { if (!input.trySkipNullValue()) { input.readMessage(unk2); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case -433028295: + case -513968390: { + if (input.isAtField(FieldNames.dropData)) { + if (!input.trySkipNullValue()) { + input.readMessage(dropData); bitField0_ |= 0x00000200; } } else { @@ -1490,26 +1490,26 @@ public final class PVEBattleResultScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName eventId = FieldName.forField("eventId", "event_id"); - - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count"); + static final FieldName eventId = FieldName.forField("eventId", "event_id"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); + static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); static final FieldName checkIdentical = FieldName.forField("checkIdentical", "check_identical"); - static final FieldName dropData = FieldName.forField("dropData", "drop_data"); - static final FieldName unk1 = FieldName.forField("unk1"); static final FieldName unk2 = FieldName.forField("unk2"); + static final FieldName dropData = FieldName.forField("dropData", "drop_data"); + static final FieldName unk3 = FieldName.forField("unk3"); static final FieldName resVersion = FieldName.forField("resVersion", "res_version"); diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java index faeb018..31971ca 100644 --- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class PickRogueAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 3; */ private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 3; * @return whether the baseAvatarList field is set */ public boolean hasBaseAvatarList() { @@ -43,7 +43,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 3; * @return this */ public PickRogueAvatarCsReq clearBaseAvatarList() { @@ -53,7 +53,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 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. @@ -67,7 +67,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 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 @@ -81,7 +81,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 3; * @param value the baseAvatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class PickRogueAvatarCsReqOuterClass { } /** - * repeated uint32 base_avatar_list = 12; + * repeated uint32 base_avatar_list = 3; * @param values the baseAvatarList to add * @return this */ @@ -163,7 +163,7 @@ public final class PickRogueAvatarCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < baseAvatarList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(baseAvatarList.array()[i]); } } @@ -185,7 +185,7 @@ public final class PickRogueAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 26: { // baseAvatarList [packed=true] input.readPackedUInt32(baseAvatarList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class PickRogueAvatarCsReqOuterClass { tag = input.readTag(); break; } - case 96: { + case 24: { // baseAvatarList [packed=false] tag = input.readRepeatedUInt32(baseAvatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java index 5b6abf0..56ad601 100644 --- a/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PickRogueAvatarScRspOuterClass.java @@ -20,7 +20,7 @@ public final class PickRogueAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_list = 6; */ private final RepeatedInt baseAvatarList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_list = 6; * @return whether the baseAvatarList field is set */ public boolean hasBaseAvatarList() { @@ -43,7 +43,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_list = 6; * @return this */ public PickRogueAvatarScRsp clearBaseAvatarList() { @@ -53,7 +53,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_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. @@ -67,7 +67,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_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 @@ -81,7 +81,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_list = 6; * @param value the baseAvatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class PickRogueAvatarScRspOuterClass { } /** - * repeated uint32 base_avatar_list = 7; + * repeated uint32 base_avatar_list = 6; * @param values the baseAvatarList to add * @return this */ @@ -163,7 +163,7 @@ public final class PickRogueAvatarScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < baseAvatarList.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(baseAvatarList.array()[i]); } } @@ -185,7 +185,7 @@ public final class PickRogueAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 50: { // baseAvatarList [packed=true] input.readPackedUInt32(baseAvatarList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class PickRogueAvatarScRspOuterClass { tag = input.readTag(); break; } - case 56: { + case 48: { // baseAvatarList [packed=false] tag = input.readRepeatedUInt32(baseAvatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java index 06968b5..499bbad 100644 --- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java @@ -19,12 +19,12 @@ public final class PileItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 1; */ private int itemId; /** - * optional uint32 item_num = 11; + * optional uint32 item_num = 8; */ private int itemNum; @@ -39,7 +39,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 1; * @return whether the itemId field is set */ public boolean hasItemId() { @@ -47,7 +47,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 1; * @return this */ public PileItem clearItemId() { @@ -57,7 +57,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 1; * @return the itemId */ public int getItemId() { @@ -65,7 +65,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 3; + * optional uint32 item_id = 1; * @param value the itemId to set * @return this */ @@ -76,7 +76,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 11; + * optional uint32 item_num = 8; * @return whether the itemNum field is set */ public boolean hasItemNum() { @@ -84,7 +84,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 11; + * optional uint32 item_num = 8; * @return this */ public PileItem clearItemNum() { @@ -94,7 +94,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 11; + * optional uint32 item_num = 8; * @return the itemNum */ public int getItemNum() { @@ -102,7 +102,7 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 11; + * optional uint32 item_num = 8; * @param value the itemNum to set * @return this */ @@ -177,11 +177,11 @@ public final class PileItemOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(itemNum); } } @@ -205,16 +205,16 @@ public final class PileItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 8: { // itemId itemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // itemNum itemNum = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java index 36d2483..68fff08 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 play_music_id = 14; + * optional uint32 play_music_id = 2; */ private int playMusicId; @@ -34,7 +34,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 14; + * optional uint32 play_music_id = 2; * @return whether the playMusicId field is set */ public boolean hasPlayMusicId() { @@ -42,7 +42,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 14; + * optional uint32 play_music_id = 2; * @return this */ public PlayBackGroundMusicCsReq clearPlayMusicId() { @@ -52,7 +52,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 14; + * optional uint32 play_music_id = 2; * @return the playMusicId */ public int getPlayMusicId() { @@ -60,7 +60,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 14; + * optional uint32 play_music_id = 2; * @param value the playMusicId to set * @return this */ @@ -129,7 +129,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(playMusicId); } } @@ -150,7 +150,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 16: { // playMusicId playMusicId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java index a3710c2..584389e 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicScRspOuterClass.java @@ -19,20 +19,20 @@ public final class PlayBackGroundMusicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 playing_id = 4; + * optional uint32 play_music_id = 7; + */ + private int playMusicId; + + /** + * optional uint32 playing_id = 10; */ private int playingId; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 11; */ private int retcode; - /** - * optional uint32 play_music_id = 15; - */ - private int playMusicId; - private PlayBackGroundMusicScRsp() { } @@ -44,99 +44,25 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 4; - * @return whether the playingId field is set + * optional uint32 play_music_id = 7; + * @return whether the playMusicId field is set */ - public boolean hasPlayingId() { + public boolean hasPlayMusicId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 playing_id = 4; - * @return this - */ - public PlayBackGroundMusicScRsp clearPlayingId() { - bitField0_ &= ~0x00000001; - playingId = 0; - return this; - } - - /** - * optional uint32 playing_id = 4; - * @return the playingId - */ - public int getPlayingId() { - return playingId; - } - - /** - * optional uint32 playing_id = 4; - * @param value the playingId to set - * @return this - */ - public PlayBackGroundMusicScRsp setPlayingId(final int value) { - bitField0_ |= 0x00000001; - playingId = value; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 9; - * @return this - */ - public PlayBackGroundMusicScRsp clearRetcode() { - bitField0_ &= ~0x00000002; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 9; - * @param value the retcode to set - * @return this - */ - public PlayBackGroundMusicScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 play_music_id = 15; - * @return whether the playMusicId field is set - */ - public boolean hasPlayMusicId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 play_music_id = 15; + * optional uint32 play_music_id = 7; * @return this */ public PlayBackGroundMusicScRsp clearPlayMusicId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; playMusicId = 0; return this; } /** - * optional uint32 play_music_id = 15; + * optional uint32 play_music_id = 7; * @return the playMusicId */ public int getPlayMusicId() { @@ -144,24 +70,98 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 play_music_id = 15; + * optional uint32 play_music_id = 7; * @param value the playMusicId to set * @return this */ public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; playMusicId = value; return this; } + /** + * optional uint32 playing_id = 10; + * @return whether the playingId field is set + */ + public boolean hasPlayingId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 playing_id = 10; + * @return this + */ + public PlayBackGroundMusicScRsp clearPlayingId() { + bitField0_ &= ~0x00000002; + playingId = 0; + return this; + } + + /** + * optional uint32 playing_id = 10; + * @return the playingId + */ + public int getPlayingId() { + return playingId; + } + + /** + * optional uint32 playing_id = 10; + * @param value the playingId to set + * @return this + */ + public PlayBackGroundMusicScRsp setPlayingId(final int value) { + bitField0_ |= 0x00000002; + playingId = value; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 11; + * @return this + */ + public PlayBackGroundMusicScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 11; + * @param value the retcode to set + * @return this + */ + public PlayBackGroundMusicScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + @Override public PlayBackGroundMusicScRsp copyFrom(final PlayBackGroundMusicScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + playMusicId = other.playMusicId; playingId = other.playingId; retcode = other.retcode; - playMusicId = other.playMusicId; } return this; } @@ -172,15 +172,15 @@ public final class PlayBackGroundMusicScRspOuterClass { return this; } cachedSize = -1; + if (other.hasPlayMusicId()) { + setPlayMusicId(other.playMusicId); + } if (other.hasPlayingId()) { setPlayingId(other.playingId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasPlayMusicId()) { - setPlayMusicId(other.playMusicId); - } return this; } @@ -191,9 +191,9 @@ public final class PlayBackGroundMusicScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + playMusicId = 0; playingId = 0; retcode = 0; - playMusicId = 0; return this; } @@ -217,24 +217,24 @@ public final class PlayBackGroundMusicScRspOuterClass { } PlayBackGroundMusicScRsp other = (PlayBackGroundMusicScRsp) o; return bitField0_ == other.bitField0_ + && (!hasPlayMusicId() || playMusicId == other.playMusicId) && (!hasPlayingId() || playingId == other.playingId) - && (!hasRetcode() || retcode == other.retcode) - && (!hasPlayMusicId() || playMusicId == other.playMusicId); + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(playingId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(playMusicId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(playMusicId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); } } @@ -242,13 +242,13 @@ public final class PlayBackGroundMusicScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -260,27 +260,27 @@ public final class PlayBackGroundMusicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // playingId - playingId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 56: { // playMusicId playMusicId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // playingId + playingId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class PlayBackGroundMusicScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.playingId, playingId); + output.writeUInt32(FieldNames.playMusicId, playMusicId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.playingId, playingId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.playMusicId, playMusicId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -323,12 +323,24 @@ public final class PlayBackGroundMusicScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 835898444: + case -1319856608: { + if (input.isAtField(FieldNames.playMusicId)) { + if (!input.trySkipNullValue()) { + playMusicId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -1868462615: case -2087744820: { if (input.isAtField(FieldNames.playingId)) { if (!input.trySkipNullValue()) { playingId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -339,18 +351,6 @@ public final class PlayBackGroundMusicScRspOuterClass { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 835898444: - case -1319856608: { - if (input.isAtField(FieldNames.playMusicId)) { - if (!input.trySkipNullValue()) { - playMusicId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class PlayBackGroundMusicScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id"); + static final FieldName playingId = FieldName.forField("playingId", "playing_id"); static final FieldName retcode = FieldName.forField("retcode"); - - static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerCollectionInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerCollectionInfoOuterClass.java index a1d9585..cbbaa32 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerCollectionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerCollectionInfoOuterClass.java @@ -19,29 +19,29 @@ public final class PlayerCollectionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 OPKIPBKCHHK = 6; + * optional uint32 NCCNLKFCAKM = 1; */ - private int oPKIPBKCHHK; + private int nCCNLKFCAKM; /** - * optional uint32 HFMNHPOGANN = 9; + * optional uint32 KJNOOOJDGDN = 3; */ - private int hFMNHPOGANN; + private int kJNOOOJDGDN; /** - * optional uint32 APBMGEBOHPK = 10; + * optional uint32 ONEEHDCGMOH = 5; */ - private int aPBMGEBOHPK; + private int oNEEHDCGMOH; /** - * optional uint32 FOLOHMFJFLM = 12; + * optional uint32 DGJKPAAINFI = 7; */ - private int fOLOHMFJFLM; + private int dGJKPAAINFI; /** - * optional uint32 JBADNDDCGFK = 15; + * optional uint32 JMGKJKDLIFI = 14; */ - private int jBADNDDCGFK; + private int jMGKJKDLIFI; private PlayerCollectionInfo() { } @@ -54,187 +54,187 @@ public final class PlayerCollectionInfoOuterClass { } /** - * optional uint32 OPKIPBKCHHK = 6; - * @return whether the oPKIPBKCHHK field is set + * optional uint32 NCCNLKFCAKM = 1; + * @return whether the nCCNLKFCAKM field is set */ - public boolean hasOPKIPBKCHHK() { + public boolean hasNCCNLKFCAKM() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 OPKIPBKCHHK = 6; + * optional uint32 NCCNLKFCAKM = 1; * @return this */ - public PlayerCollectionInfo clearOPKIPBKCHHK() { + public PlayerCollectionInfo clearNCCNLKFCAKM() { bitField0_ &= ~0x00000001; - oPKIPBKCHHK = 0; + nCCNLKFCAKM = 0; return this; } /** - * optional uint32 OPKIPBKCHHK = 6; - * @return the oPKIPBKCHHK + * optional uint32 NCCNLKFCAKM = 1; + * @return the nCCNLKFCAKM */ - public int getOPKIPBKCHHK() { - return oPKIPBKCHHK; + public int getNCCNLKFCAKM() { + return nCCNLKFCAKM; } /** - * optional uint32 OPKIPBKCHHK = 6; - * @param value the oPKIPBKCHHK to set + * optional uint32 NCCNLKFCAKM = 1; + * @param value the nCCNLKFCAKM to set * @return this */ - public PlayerCollectionInfo setOPKIPBKCHHK(final int value) { + public PlayerCollectionInfo setNCCNLKFCAKM(final int value) { bitField0_ |= 0x00000001; - oPKIPBKCHHK = value; + nCCNLKFCAKM = value; return this; } /** - * optional uint32 HFMNHPOGANN = 9; - * @return whether the hFMNHPOGANN field is set + * optional uint32 KJNOOOJDGDN = 3; + * @return whether the kJNOOOJDGDN field is set */ - public boolean hasHFMNHPOGANN() { + public boolean hasKJNOOOJDGDN() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 HFMNHPOGANN = 9; + * optional uint32 KJNOOOJDGDN = 3; * @return this */ - public PlayerCollectionInfo clearHFMNHPOGANN() { + public PlayerCollectionInfo clearKJNOOOJDGDN() { bitField0_ &= ~0x00000002; - hFMNHPOGANN = 0; + kJNOOOJDGDN = 0; return this; } /** - * optional uint32 HFMNHPOGANN = 9; - * @return the hFMNHPOGANN + * optional uint32 KJNOOOJDGDN = 3; + * @return the kJNOOOJDGDN */ - public int getHFMNHPOGANN() { - return hFMNHPOGANN; + public int getKJNOOOJDGDN() { + return kJNOOOJDGDN; } /** - * optional uint32 HFMNHPOGANN = 9; - * @param value the hFMNHPOGANN to set + * optional uint32 KJNOOOJDGDN = 3; + * @param value the kJNOOOJDGDN to set * @return this */ - public PlayerCollectionInfo setHFMNHPOGANN(final int value) { + public PlayerCollectionInfo setKJNOOOJDGDN(final int value) { bitField0_ |= 0x00000002; - hFMNHPOGANN = value; + kJNOOOJDGDN = value; return this; } /** - * optional uint32 APBMGEBOHPK = 10; - * @return whether the aPBMGEBOHPK field is set + * optional uint32 ONEEHDCGMOH = 5; + * @return whether the oNEEHDCGMOH field is set */ - public boolean hasAPBMGEBOHPK() { + public boolean hasONEEHDCGMOH() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 APBMGEBOHPK = 10; + * optional uint32 ONEEHDCGMOH = 5; * @return this */ - public PlayerCollectionInfo clearAPBMGEBOHPK() { + public PlayerCollectionInfo clearONEEHDCGMOH() { bitField0_ &= ~0x00000004; - aPBMGEBOHPK = 0; + oNEEHDCGMOH = 0; return this; } /** - * optional uint32 APBMGEBOHPK = 10; - * @return the aPBMGEBOHPK + * optional uint32 ONEEHDCGMOH = 5; + * @return the oNEEHDCGMOH */ - public int getAPBMGEBOHPK() { - return aPBMGEBOHPK; + public int getONEEHDCGMOH() { + return oNEEHDCGMOH; } /** - * optional uint32 APBMGEBOHPK = 10; - * @param value the aPBMGEBOHPK to set + * optional uint32 ONEEHDCGMOH = 5; + * @param value the oNEEHDCGMOH to set * @return this */ - public PlayerCollectionInfo setAPBMGEBOHPK(final int value) { + public PlayerCollectionInfo setONEEHDCGMOH(final int value) { bitField0_ |= 0x00000004; - aPBMGEBOHPK = value; + oNEEHDCGMOH = value; return this; } /** - * optional uint32 FOLOHMFJFLM = 12; - * @return whether the fOLOHMFJFLM field is set + * optional uint32 DGJKPAAINFI = 7; + * @return whether the dGJKPAAINFI field is set */ - public boolean hasFOLOHMFJFLM() { + public boolean hasDGJKPAAINFI() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 FOLOHMFJFLM = 12; + * optional uint32 DGJKPAAINFI = 7; * @return this */ - public PlayerCollectionInfo clearFOLOHMFJFLM() { + public PlayerCollectionInfo clearDGJKPAAINFI() { bitField0_ &= ~0x00000008; - fOLOHMFJFLM = 0; + dGJKPAAINFI = 0; return this; } /** - * optional uint32 FOLOHMFJFLM = 12; - * @return the fOLOHMFJFLM + * optional uint32 DGJKPAAINFI = 7; + * @return the dGJKPAAINFI */ - public int getFOLOHMFJFLM() { - return fOLOHMFJFLM; + public int getDGJKPAAINFI() { + return dGJKPAAINFI; } /** - * optional uint32 FOLOHMFJFLM = 12; - * @param value the fOLOHMFJFLM to set + * optional uint32 DGJKPAAINFI = 7; + * @param value the dGJKPAAINFI to set * @return this */ - public PlayerCollectionInfo setFOLOHMFJFLM(final int value) { + public PlayerCollectionInfo setDGJKPAAINFI(final int value) { bitField0_ |= 0x00000008; - fOLOHMFJFLM = value; + dGJKPAAINFI = value; return this; } /** - * optional uint32 JBADNDDCGFK = 15; - * @return whether the jBADNDDCGFK field is set + * optional uint32 JMGKJKDLIFI = 14; + * @return whether the jMGKJKDLIFI field is set */ - public boolean hasJBADNDDCGFK() { + public boolean hasJMGKJKDLIFI() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 JBADNDDCGFK = 15; + * optional uint32 JMGKJKDLIFI = 14; * @return this */ - public PlayerCollectionInfo clearJBADNDDCGFK() { + public PlayerCollectionInfo clearJMGKJKDLIFI() { bitField0_ &= ~0x00000010; - jBADNDDCGFK = 0; + jMGKJKDLIFI = 0; return this; } /** - * optional uint32 JBADNDDCGFK = 15; - * @return the jBADNDDCGFK + * optional uint32 JMGKJKDLIFI = 14; + * @return the jMGKJKDLIFI */ - public int getJBADNDDCGFK() { - return jBADNDDCGFK; + public int getJMGKJKDLIFI() { + return jMGKJKDLIFI; } /** - * optional uint32 JBADNDDCGFK = 15; - * @param value the jBADNDDCGFK to set + * optional uint32 JMGKJKDLIFI = 14; + * @param value the jMGKJKDLIFI to set * @return this */ - public PlayerCollectionInfo setJBADNDDCGFK(final int value) { + public PlayerCollectionInfo setJMGKJKDLIFI(final int value) { bitField0_ |= 0x00000010; - jBADNDDCGFK = value; + jMGKJKDLIFI = value; return this; } @@ -243,11 +243,11 @@ public final class PlayerCollectionInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - oPKIPBKCHHK = other.oPKIPBKCHHK; - hFMNHPOGANN = other.hFMNHPOGANN; - aPBMGEBOHPK = other.aPBMGEBOHPK; - fOLOHMFJFLM = other.fOLOHMFJFLM; - jBADNDDCGFK = other.jBADNDDCGFK; + nCCNLKFCAKM = other.nCCNLKFCAKM; + kJNOOOJDGDN = other.kJNOOOJDGDN; + oNEEHDCGMOH = other.oNEEHDCGMOH; + dGJKPAAINFI = other.dGJKPAAINFI; + jMGKJKDLIFI = other.jMGKJKDLIFI; } return this; } @@ -258,20 +258,20 @@ public final class PlayerCollectionInfoOuterClass { return this; } cachedSize = -1; - if (other.hasOPKIPBKCHHK()) { - setOPKIPBKCHHK(other.oPKIPBKCHHK); + if (other.hasNCCNLKFCAKM()) { + setNCCNLKFCAKM(other.nCCNLKFCAKM); } - if (other.hasHFMNHPOGANN()) { - setHFMNHPOGANN(other.hFMNHPOGANN); + if (other.hasKJNOOOJDGDN()) { + setKJNOOOJDGDN(other.kJNOOOJDGDN); } - if (other.hasAPBMGEBOHPK()) { - setAPBMGEBOHPK(other.aPBMGEBOHPK); + if (other.hasONEEHDCGMOH()) { + setONEEHDCGMOH(other.oNEEHDCGMOH); } - if (other.hasFOLOHMFJFLM()) { - setFOLOHMFJFLM(other.fOLOHMFJFLM); + if (other.hasDGJKPAAINFI()) { + setDGJKPAAINFI(other.dGJKPAAINFI); } - if (other.hasJBADNDDCGFK()) { - setJBADNDDCGFK(other.jBADNDDCGFK); + if (other.hasJMGKJKDLIFI()) { + setJMGKJKDLIFI(other.jMGKJKDLIFI); } return this; } @@ -283,11 +283,11 @@ public final class PlayerCollectionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - oPKIPBKCHHK = 0; - hFMNHPOGANN = 0; - aPBMGEBOHPK = 0; - fOLOHMFJFLM = 0; - jBADNDDCGFK = 0; + nCCNLKFCAKM = 0; + kJNOOOJDGDN = 0; + oNEEHDCGMOH = 0; + dGJKPAAINFI = 0; + jMGKJKDLIFI = 0; return this; } @@ -311,34 +311,34 @@ public final class PlayerCollectionInfoOuterClass { } PlayerCollectionInfo other = (PlayerCollectionInfo) o; return bitField0_ == other.bitField0_ - && (!hasOPKIPBKCHHK() || oPKIPBKCHHK == other.oPKIPBKCHHK) - && (!hasHFMNHPOGANN() || hFMNHPOGANN == other.hFMNHPOGANN) - && (!hasAPBMGEBOHPK() || aPBMGEBOHPK == other.aPBMGEBOHPK) - && (!hasFOLOHMFJFLM() || fOLOHMFJFLM == other.fOLOHMFJFLM) - && (!hasJBADNDDCGFK() || jBADNDDCGFK == other.jBADNDDCGFK); + && (!hasNCCNLKFCAKM() || nCCNLKFCAKM == other.nCCNLKFCAKM) + && (!hasKJNOOOJDGDN() || kJNOOOJDGDN == other.kJNOOOJDGDN) + && (!hasONEEHDCGMOH() || oNEEHDCGMOH == other.oNEEHDCGMOH) + && (!hasDGJKPAAINFI() || dGJKPAAINFI == other.dGJKPAAINFI) + && (!hasJMGKJKDLIFI() || jMGKJKDLIFI == other.jMGKJKDLIFI); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(oPKIPBKCHHK); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(nCCNLKFCAKM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(hFMNHPOGANN); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(kJNOOOJDGDN); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(aPBMGEBOHPK); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(oNEEHDCGMOH); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(fOLOHMFJFLM); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(dGJKPAAINFI); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(jBADNDDCGFK); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(jMGKJKDLIFI); } } @@ -346,19 +346,19 @@ public final class PlayerCollectionInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oPKIPBKCHHK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nCCNLKFCAKM); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hFMNHPOGANN); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kJNOOOJDGDN); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aPBMGEBOHPK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oNEEHDCGMOH); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fOLOHMFJFLM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dGJKPAAINFI); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jBADNDDCGFK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jMGKJKDLIFI); } return size; } @@ -370,45 +370,45 @@ public final class PlayerCollectionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // oPKIPBKCHHK - oPKIPBKCHHK = input.readUInt32(); + case 8: { + // nCCNLKFCAKM + nCCNLKFCAKM = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 24) { break; } } - case 72: { - // hFMNHPOGANN - hFMNHPOGANN = input.readUInt32(); + case 24: { + // kJNOOOJDGDN + kJNOOOJDGDN = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { - // aPBMGEBOHPK - aPBMGEBOHPK = input.readUInt32(); + case 40: { + // oNEEHDCGMOH + oNEEHDCGMOH = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 56) { break; } } - case 96: { - // fOLOHMFJFLM - fOLOHMFJFLM = input.readUInt32(); + case 56: { + // dGJKPAAINFI + dGJKPAAINFI = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // jBADNDDCGFK - jBADNDDCGFK = input.readUInt32(); + case 112: { + // jMGKJKDLIFI + jMGKJKDLIFI = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -433,19 +433,19 @@ public final class PlayerCollectionInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.oPKIPBKCHHK, oPKIPBKCHHK); + output.writeUInt32(FieldNames.nCCNLKFCAKM, nCCNLKFCAKM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.hFMNHPOGANN, hFMNHPOGANN); + output.writeUInt32(FieldNames.kJNOOOJDGDN, kJNOOOJDGDN); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.aPBMGEBOHPK, aPBMGEBOHPK); + output.writeUInt32(FieldNames.oNEEHDCGMOH, oNEEHDCGMOH); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.fOLOHMFJFLM, fOLOHMFJFLM); + output.writeUInt32(FieldNames.dGJKPAAINFI, dGJKPAAINFI); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.jBADNDDCGFK, jBADNDDCGFK); + output.writeUInt32(FieldNames.jMGKJKDLIFI, jMGKJKDLIFI); } output.endObject(); } @@ -457,10 +457,10 @@ public final class PlayerCollectionInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1436262498: { - if (input.isAtField(FieldNames.oPKIPBKCHHK)) { + case -105203577: { + if (input.isAtField(FieldNames.nCCNLKFCAKM)) { if (!input.trySkipNullValue()) { - oPKIPBKCHHK = input.readUInt32(); + nCCNLKFCAKM = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -468,10 +468,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case 1498883298: { - if (input.isAtField(FieldNames.hFMNHPOGANN)) { + case 1436526167: { + if (input.isAtField(FieldNames.kJNOOOJDGDN)) { if (!input.trySkipNullValue()) { - hFMNHPOGANN = input.readUInt32(); + kJNOOOJDGDN = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -479,10 +479,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -1027359554: { - if (input.isAtField(FieldNames.aPBMGEBOHPK)) { + case -1347260185: { + if (input.isAtField(FieldNames.oNEEHDCGMOH)) { if (!input.trySkipNullValue()) { - aPBMGEBOHPK = input.readUInt32(); + oNEEHDCGMOH = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -490,10 +490,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -1809610350: { - if (input.isAtField(FieldNames.fOLOHMFJFLM)) { + case -1838026860: { + if (input.isAtField(FieldNames.dGJKPAAINFI)) { if (!input.trySkipNullValue()) { - fOLOHMFJFLM = input.readUInt32(); + dGJKPAAINFI = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -501,10 +501,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -666349892: { - if (input.isAtField(FieldNames.jBADNDDCGFK)) { + case -527426212: { + if (input.isAtField(FieldNames.jMGKJKDLIFI)) { if (!input.trySkipNullValue()) { - jBADNDDCGFK = input.readUInt32(); + jMGKJKDLIFI = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -565,15 +565,15 @@ public final class PlayerCollectionInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName oPKIPBKCHHK = FieldName.forField("OPKIPBKCHHK"); + static final FieldName nCCNLKFCAKM = FieldName.forField("NCCNLKFCAKM"); - static final FieldName hFMNHPOGANN = FieldName.forField("HFMNHPOGANN"); + static final FieldName kJNOOOJDGDN = FieldName.forField("KJNOOOJDGDN"); - static final FieldName aPBMGEBOHPK = FieldName.forField("APBMGEBOHPK"); + static final FieldName oNEEHDCGMOH = FieldName.forField("ONEEHDCGMOH"); - static final FieldName fOLOHMFJFLM = FieldName.forField("FOLOHMFJFLM"); + static final FieldName dGJKPAAINFI = FieldName.forField("DGJKPAAINFI"); - static final FieldName jBADNDDCGFK = FieldName.forField("JBADNDDCGFK"); + static final FieldName jMGKJKDLIFI = FieldName.forField("JMGKJKDLIFI"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java index 1ebdb5a..6681328 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java @@ -21,19 +21,14 @@ public final class PlayerDetailInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 3; - */ - private int uid; - - /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 6; */ private int worldLevel; /** - * optional uint32 level = 11; + * optional uint32 uid = 9; */ - private int level; + private int uid; /** * optional uint32 head_icon = 12; @@ -41,42 +36,52 @@ public final class PlayerDetailInfoOuterClass { private int headIcon; /** - * optional .PlatformType platform_type = 9; + * optional uint32 level = 14; + */ + private int level; + + /** + * optional .PlatformType platform_type = 5; */ private int platformType; /** - * optional bool show_display_avatars = 8; + * optional bool show_display_avatars = 1; */ private boolean showDisplayAvatars; /** - * optional .PlayerRecordInfo record_info = 14; + * optional bool is_banned = 11; + */ + private boolean isBanned; + + /** + * optional .PlayerRecordInfo record_info = 13; */ private final PlayerRecordInfoOuterClass.PlayerRecordInfo recordInfo = PlayerRecordInfoOuterClass.PlayerRecordInfo.newInstance(); /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; */ private final PlayerDisplaySettingsOuterClass.PlayerDisplaySettings displaySettings = PlayerDisplaySettingsOuterClass.PlayerDisplaySettings.newInstance(); /** - * optional string signature = 2; - */ - private final Utf8String signature = Utf8String.newEmptyInstance(); - - /** - * optional string nickname = 15; + * optional string nickname = 2; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * optional string signature = 4; + */ + private final Utf8String signature = Utf8String.newEmptyInstance(); + + /** + * repeated .DisplayAvatarDetailInfo display_avatar_list = 8; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory()); /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; */ private final RepeatedMessage assistAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory()); @@ -91,62 +96,25 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 uid = 3; - * @return whether the uid field is set + * optional uint32 world_level = 6; + * @return whether the worldLevel field is set */ - public boolean hasUid() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 uid = 3; - * @return this - */ - public PlayerDetailInfo clearUid() { - bitField0_ &= ~0x00000001; - uid = 0; - return this; - } - - /** - * optional uint32 uid = 3; - * @return the uid - */ - public int getUid() { - return uid; - } - - /** - * optional uint32 uid = 3; - * @param value the uid to set - * @return this - */ - public PlayerDetailInfo setUid(final int value) { - bitField0_ |= 0x00000001; - uid = value; - return this; - } - - /** - * optional uint32 world_level = 5; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 6; * @return this */ public PlayerDetailInfo clearWorldLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 6; * @return the worldLevel */ public int getWorldLevel() { @@ -154,50 +122,50 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 6; * @param value the worldLevel to set * @return this */ public PlayerDetailInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; worldLevel = value; return this; } /** - * optional uint32 level = 11; - * @return whether the level field is set + * optional uint32 uid = 9; + * @return whether the uid field is set */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasUid() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 level = 11; + * optional uint32 uid = 9; * @return this */ - public PlayerDetailInfo clearLevel() { - bitField0_ &= ~0x00000004; - level = 0; + public PlayerDetailInfo clearUid() { + bitField0_ &= ~0x00000002; + uid = 0; return this; } /** - * optional uint32 level = 11; - * @return the level + * optional uint32 uid = 9; + * @return the uid */ - public int getLevel() { - return level; + public int getUid() { + return uid; } /** - * optional uint32 level = 11; - * @param value the level to set + * optional uint32 uid = 9; + * @param value the uid to set * @return this */ - public PlayerDetailInfo setLevel(final int value) { - bitField0_ |= 0x00000004; - level = value; + public PlayerDetailInfo setUid(final int value) { + bitField0_ |= 0x00000002; + uid = value; return this; } @@ -206,7 +174,7 @@ public final class PlayerDetailInfoOuterClass { * @return whether the headIcon field is set */ public boolean hasHeadIcon() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -214,7 +182,7 @@ public final class PlayerDetailInfoOuterClass { * @return this */ public PlayerDetailInfo clearHeadIcon() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; headIcon = 0; return this; } @@ -233,13 +201,50 @@ public final class PlayerDetailInfoOuterClass { * @return this */ public PlayerDetailInfo setHeadIcon(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; headIcon = value; return this; } /** - * optional .PlatformType platform_type = 9; + * optional uint32 level = 14; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 level = 14; + * @return this + */ + public PlayerDetailInfo clearLevel() { + bitField0_ &= ~0x00000008; + level = 0; + return this; + } + + /** + * optional uint32 level = 14; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 14; + * @param value the level to set + * @return this + */ + public PlayerDetailInfo setLevel(final int value) { + bitField0_ |= 0x00000008; + level = value; + return this; + } + + /** + * optional .PlatformType platform_type = 5; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -247,7 +252,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 9; + * optional .PlatformType platform_type = 5; * @return this */ public PlayerDetailInfo clearPlatformType() { @@ -257,7 +262,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 9; + * optional .PlatformType platform_type = 5; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -290,7 +295,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 9; + * optional .PlatformType platform_type = 5; * @param value the platformType to set * @return this */ @@ -301,7 +306,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 8; + * optional bool show_display_avatars = 1; * @return whether the showDisplayAvatars field is set */ public boolean hasShowDisplayAvatars() { @@ -309,7 +314,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 8; + * optional bool show_display_avatars = 1; * @return this */ public PlayerDetailInfo clearShowDisplayAvatars() { @@ -319,7 +324,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 8; + * optional bool show_display_avatars = 1; * @return the showDisplayAvatars */ public boolean getShowDisplayAvatars() { @@ -327,7 +332,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 8; + * optional bool show_display_avatars = 1; * @param value the showDisplayAvatars to set * @return this */ @@ -338,25 +343,62 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 14; - * @return whether the recordInfo field is set + * optional bool is_banned = 11; + * @return whether the isBanned field is set */ - public boolean hasRecordInfo() { + public boolean hasIsBanned() { return (bitField0_ & 0x00000040) != 0; } /** - * optional .PlayerRecordInfo record_info = 14; + * optional bool is_banned = 11; + * @return this + */ + public PlayerDetailInfo clearIsBanned() { + bitField0_ &= ~0x00000040; + isBanned = false; + return this; + } + + /** + * optional bool is_banned = 11; + * @return the isBanned + */ + public boolean getIsBanned() { + return isBanned; + } + + /** + * optional bool is_banned = 11; + * @param value the isBanned to set + * @return this + */ + public PlayerDetailInfo setIsBanned(final boolean value) { + bitField0_ |= 0x00000040; + isBanned = value; + return this; + } + + /** + * optional .PlayerRecordInfo record_info = 13; + * @return whether the recordInfo field is set + */ + public boolean hasRecordInfo() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .PlayerRecordInfo record_info = 13; * @return this */ public PlayerDetailInfo clearRecordInfo() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000080; recordInfo.clear(); return this; } /** - * optional .PlayerRecordInfo record_info = 14; + * optional .PlayerRecordInfo record_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. @@ -370,7 +412,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 14; + * optional .PlayerRecordInfo record_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 @@ -379,41 +421,41 @@ public final class PlayerDetailInfoOuterClass { * @return internal storage object for modifications */ public PlayerRecordInfoOuterClass.PlayerRecordInfo getMutableRecordInfo() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; return recordInfo; } /** - * optional .PlayerRecordInfo record_info = 14; + * optional .PlayerRecordInfo record_info = 13; * @param value the recordInfo to set * @return this */ public PlayerDetailInfo setRecordInfo(final PlayerRecordInfoOuterClass.PlayerRecordInfo value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; recordInfo.copyFrom(value); return this; } /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; * @return whether the displaySettings field is set */ public boolean hasDisplaySettings() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; * @return this */ public PlayerDetailInfo clearDisplaySettings() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000100; displaySettings.clear(); return this; } /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; * * 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. @@ -427,7 +469,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -436,89 +478,24 @@ public final class PlayerDetailInfoOuterClass { * @return internal storage object for modifications */ public PlayerDisplaySettingsOuterClass.PlayerDisplaySettings getMutableDisplaySettings() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return displaySettings; } /** - * optional .PlayerDisplaySettings display_settings = 1964; + * optional .PlayerDisplaySettings display_settings = 1265; * @param value the displaySettings to set * @return this */ public PlayerDetailInfo setDisplaySettings( final PlayerDisplaySettingsOuterClass.PlayerDisplaySettings value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; displaySettings.copyFrom(value); return this; } /** - * optional string signature = 2; - * @return whether the signature field is set - */ - public boolean hasSignature() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional string signature = 2; - * @return this - */ - public PlayerDetailInfo clearSignature() { - bitField0_ &= ~0x00000100; - signature.clear(); - return this; - } - - /** - * optional string signature = 2; - * @return the signature - */ - public String getSignature() { - return signature.getString(); - } - - /** - * optional string signature = 2; - * @return internal {@code Utf8String} representation of signature for reading - */ - public Utf8String getSignatureBytes() { - return this.signature; - } - - /** - * optional string signature = 2; - * @return internal {@code Utf8String} representation of signature for modifications - */ - public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000100; - return this.signature; - } - - /** - * optional string signature = 2; - * @param value the signature to set - * @return this - */ - public PlayerDetailInfo setSignature(final CharSequence value) { - bitField0_ |= 0x00000100; - signature.copyFrom(value); - return this; - } - - /** - * optional string signature = 2; - * @param value the signature to set - * @return this - */ - public PlayerDetailInfo setSignature(final Utf8String value) { - bitField0_ |= 0x00000100; - signature.copyFrom(value); - return this; - } - - /** - * optional string nickname = 15; + * optional string nickname = 2; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -526,7 +503,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return this */ public PlayerDetailInfo clearNickname() { @@ -536,7 +513,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return the nickname */ public String getNickname() { @@ -544,7 +521,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -552,7 +529,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -561,7 +538,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @param value the nickname to set * @return this */ @@ -572,7 +549,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 15; + * optional string nickname = 2; * @param value the nickname to set * @return this */ @@ -583,25 +560,90 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; - * @return whether the displayAvatarList field is set + * optional string signature = 4; + * @return whether the signature field is set */ - public boolean hasDisplayAvatarList() { + public boolean hasSignature() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * optional string signature = 4; + * @return this + */ + public PlayerDetailInfo clearSignature() { + bitField0_ &= ~0x00000400; + signature.clear(); + return this; + } + + /** + * optional string signature = 4; + * @return the signature + */ + public String getSignature() { + return signature.getString(); + } + + /** + * optional string signature = 4; + * @return internal {@code Utf8String} representation of signature for reading + */ + public Utf8String getSignatureBytes() { + return this.signature; + } + + /** + * optional string signature = 4; + * @return internal {@code Utf8String} representation of signature for modifications + */ + public Utf8String getMutableSignatureBytes() { + bitField0_ |= 0x00000400; + return this.signature; + } + + /** + * optional string signature = 4; + * @param value the signature to set + * @return this + */ + public PlayerDetailInfo setSignature(final CharSequence value) { + bitField0_ |= 0x00000400; + signature.copyFrom(value); + return this; + } + + /** + * optional string signature = 4; + * @param value the signature to set + * @return this + */ + public PlayerDetailInfo setSignature(final Utf8String value) { + bitField0_ |= 0x00000400; + signature.copyFrom(value); + return this; + } + + /** + * repeated .DisplayAvatarDetailInfo display_avatar_list = 8; + * @return whether the displayAvatarList field is set + */ + public boolean hasDisplayAvatarList() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .DisplayAvatarDetailInfo display_avatar_list = 8; * @return this */ public PlayerDetailInfo clearDisplayAvatarList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000800; displayAvatarList.clear(); return this; } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * repeated .DisplayAvatarDetailInfo display_avatar_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. @@ -616,7 +658,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * repeated .DisplayAvatarDetailInfo display_avatar_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 @@ -626,54 +668,54 @@ public final class PlayerDetailInfoOuterClass { */ public RepeatedMessage getMutableDisplayAvatarList( ) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return displayAvatarList; } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 8; * @param value the displayAvatarList to add * @return this */ public PlayerDetailInfo addDisplayAvatarList( final DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; displayAvatarList.add(value); return this; } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 8; * @param values the displayAvatarList to add * @return this */ public PlayerDetailInfo addAllDisplayAvatarList( final DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; displayAvatarList.addAll(values); return this; } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * @return whether the assistAvatarList field is set */ public boolean hasAssistAvatarList() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00001000) != 0; } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * @return this */ public PlayerDetailInfo clearAssistAvatarList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00001000; assistAvatarList.clear(); return this; } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * * 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. @@ -688,7 +730,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -698,30 +740,30 @@ public final class PlayerDetailInfoOuterClass { */ public RepeatedMessage getMutableAssistAvatarList( ) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; return assistAvatarList; } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * @param value the assistAvatarList to add * @return this */ public PlayerDetailInfo addAssistAvatarList( final DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; assistAvatarList.add(value); return this; } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 1854; * @param values the assistAvatarList to add * @return this */ public PlayerDetailInfo addAllAssistAvatarList( final DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo... values) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; assistAvatarList.addAll(values); return this; } @@ -731,16 +773,17 @@ public final class PlayerDetailInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - uid = other.uid; worldLevel = other.worldLevel; - level = other.level; + uid = other.uid; headIcon = other.headIcon; + level = other.level; platformType = other.platformType; showDisplayAvatars = other.showDisplayAvatars; + isBanned = other.isBanned; recordInfo.copyFrom(other.recordInfo); displaySettings.copyFrom(other.displaySettings); - signature.copyFrom(other.signature); nickname.copyFrom(other.nickname); + signature.copyFrom(other.signature); displayAvatarList.copyFrom(other.displayAvatarList); assistAvatarList.copyFrom(other.assistAvatarList); } @@ -753,36 +796,39 @@ public final class PlayerDetailInfoOuterClass { return this; } cachedSize = -1; - if (other.hasUid()) { - setUid(other.uid); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasUid()) { + setUid(other.uid); } if (other.hasHeadIcon()) { setHeadIcon(other.headIcon); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasPlatformType()) { setPlatformTypeValue(other.platformType); } if (other.hasShowDisplayAvatars()) { setShowDisplayAvatars(other.showDisplayAvatars); } + if (other.hasIsBanned()) { + setIsBanned(other.isBanned); + } if (other.hasRecordInfo()) { getMutableRecordInfo().mergeFrom(other.recordInfo); } if (other.hasDisplaySettings()) { getMutableDisplaySettings().mergeFrom(other.displaySettings); } - if (other.hasSignature()) { - getMutableSignatureBytes().copyFrom(other.signature); - } if (other.hasNickname()) { getMutableNicknameBytes().copyFrom(other.nickname); } + if (other.hasSignature()) { + getMutableSignatureBytes().copyFrom(other.signature); + } if (other.hasDisplayAvatarList()) { getMutableDisplayAvatarList().addAll(other.displayAvatarList); } @@ -799,16 +845,17 @@ public final class PlayerDetailInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - uid = 0; worldLevel = 0; - level = 0; + uid = 0; headIcon = 0; + level = 0; platformType = 0; showDisplayAvatars = false; + isBanned = false; recordInfo.clear(); displaySettings.clear(); - signature.clear(); nickname.clear(); + signature.clear(); displayAvatarList.clear(); assistAvatarList.clear(); return this; @@ -823,8 +870,8 @@ public final class PlayerDetailInfoOuterClass { bitField0_ = 0; recordInfo.clearQuick(); displaySettings.clearQuick(); - signature.clear(); nickname.clear(); + signature.clear(); displayAvatarList.clearQuick(); assistAvatarList.clearQuick(); return this; @@ -840,16 +887,17 @@ public final class PlayerDetailInfoOuterClass { } PlayerDetailInfo other = (PlayerDetailInfo) o; return bitField0_ == other.bitField0_ - && (!hasUid() || uid == other.uid) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasLevel() || level == other.level) + && (!hasUid() || uid == other.uid) && (!hasHeadIcon() || headIcon == other.headIcon) + && (!hasLevel() || level == other.level) && (!hasPlatformType() || platformType == other.platformType) && (!hasShowDisplayAvatars() || showDisplayAvatars == other.showDisplayAvatars) + && (!hasIsBanned() || isBanned == other.isBanned) && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)) && (!hasDisplaySettings() || displaySettings.equals(other.displaySettings)) - && (!hasSignature() || signature.equals(other.signature)) && (!hasNickname() || nickname.equals(other.nickname)) + && (!hasSignature() || signature.equals(other.signature)) && (!hasDisplayAvatarList() || displayAvatarList.equals(other.displayAvatarList)) && (!hasAssistAvatarList() || assistAvatarList.equals(other.assistAvatarList)); } @@ -857,54 +905,58 @@ public final class PlayerDetailInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(uid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(level); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(uid); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); output.writeUInt32NoTag(headIcon); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeEnumNoTag(platformType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeBoolNoTag(showDisplayAvatars); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(recordInfo); + output.writeRawByte((byte) 88); + output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawLittleEndian16((short) 31458); - output.writeMessageNoTag(displaySettings); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(recordInfo); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 18); - output.writeStringNoTag(signature); + output.writeRawLittleEndian16((short) 20362); + output.writeMessageNoTag(displaySettings); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 18); output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { + output.writeRawByte((byte) 34); + output.writeStringNoTag(signature); + } + if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 66); output.writeMessageNoTag(displayAvatarList.get(i)); } } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < assistAvatarList.length(); i++) { - output.writeRawLittleEndian16((short) 6058); + output.writeRawLittleEndian16((short) 29682); output.writeMessageNoTag(assistAvatarList.get(i)); } } @@ -914,16 +966,16 @@ public final class PlayerDetailInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); @@ -932,21 +984,24 @@ public final class PlayerDetailInfoOuterClass { size += 2; } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); + size += 2; } if ((bitField0_ & 0x00000080) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(displaySettings); + size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(signature); + size += 2 + ProtoSink.computeMessageSizeNoTag(displaySettings); } if ((bitField0_ & 0x00000200) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { - size += (1 * displayAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(displayAvatarList); + size += 1 + ProtoSink.computeStringSizeNoTag(signature); } if ((bitField0_ & 0x00000800) != 0) { + size += (1 * displayAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(displayAvatarList); + } + if ((bitField0_ & 0x00001000) != 0) { size += (2 * assistAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assistAvatarList); } return size; @@ -959,28 +1014,19 @@ public final class PlayerDetailInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // uid - uid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 48: { // worldLevel worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000004; + case 72: { + // uid + uid = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 96) { break; @@ -989,13 +1035,22 @@ public final class PlayerDetailInfoOuterClass { case 96: { // headIcon headIcon = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { + case 112: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // platformType final int value = input.readInt32(); if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { @@ -1003,67 +1058,76 @@ public final class PlayerDetailInfoOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 64) { + if (tag != 8) { break; } } - case 64: { + case 8: { // showDisplayAvatars showDisplayAvatars = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 114) { + if (tag != 88) { break; } } - case 114: { - // recordInfo - input.readMessage(recordInfo); + case 88: { + // isBanned + isBanned = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 15714) { + if (tag != 106) { break; } } - case 15714: { + case 106: { + // recordInfo + input.readMessage(recordInfo); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 10122) { + break; + } + } + case 10122: { // displaySettings input.readMessage(displaySettings); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // signature - input.readString(signature); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { // nickname input.readString(nickname); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { + // signature + input.readString(signature); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); - bitField0_ |= 0x00000400; - if (tag != 2986) { + bitField0_ |= 0x00000800; + if (tag != 14834) { break; } } - case 2986: { + case 14834: { // assistAvatarList tag = input.readRepeatedMessage(assistAvatarList, tag); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; if (tag != 0) { break; } @@ -1086,16 +1150,16 @@ public final class PlayerDetailInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.uid, uid); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.uid, uid); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.headIcon, headIcon); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.headIcon, headIcon); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); @@ -1104,21 +1168,24 @@ public final class PlayerDetailInfoOuterClass { output.writeBool(FieldNames.showDisplayAvatars, showDisplayAvatars); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.recordInfo, recordInfo); + output.writeBool(FieldNames.isBanned, isBanned); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.displaySettings, displaySettings); + output.writeMessage(FieldNames.recordInfo, recordInfo); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.signature, signature); + output.writeMessage(FieldNames.displaySettings, displaySettings); } if ((bitField0_ & 0x00000200) != 0) { output.writeString(FieldNames.nickname, nickname); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.displayAvatarList, displayAvatarList); + output.writeString(FieldNames.signature, signature); } if ((bitField0_ & 0x00000800) != 0) { + output.writeRepeatedMessage(FieldNames.displayAvatarList, displayAvatarList); + } + if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.assistAvatarList, assistAvatarList); } output.endObject(); @@ -1131,10 +1198,11 @@ public final class PlayerDetailInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1142,11 +1210,10 @@ public final class PlayerDetailInfoOuterClass { } break; } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1154,22 +1221,22 @@ public final class PlayerDetailInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1116107143: case -219098248: { if (input.isAtField(FieldNames.headIcon)) { if (!input.trySkipNullValue()) { headIcon = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1206,12 +1273,24 @@ public final class PlayerDetailInfoOuterClass { } break; } + case -722308888: + case -932303917: { + if (input.isAtField(FieldNames.isBanned)) { + if (!input.trySkipNullValue()) { + isBanned = input.readBool(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case 734573727: case 1317125084: { if (input.isAtField(FieldNames.recordInfo)) { if (!input.trySkipNullValue()) { input.readMessage(recordInfo); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1223,17 +1302,6 @@ public final class PlayerDetailInfoOuterClass { if (input.isAtField(FieldNames.displaySettings)) { if (!input.trySkipNullValue()) { input.readMessage(displaySettings); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1073584312: { - if (input.isAtField(FieldNames.signature)) { - if (!input.trySkipNullValue()) { - input.readString(signature); bitField0_ |= 0x00000100; } } else { @@ -1252,12 +1320,23 @@ public final class PlayerDetailInfoOuterClass { } break; } + case 1073584312: { + if (input.isAtField(FieldNames.signature)) { + if (!input.trySkipNullValue()) { + input.readString(signature); + bitField0_ |= 0x00000400; + } + } else { + input.skipUnknownField(); + } + break; + } case 2117925881: case 245562311: { if (input.isAtField(FieldNames.displayAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(displayAvatarList); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1269,7 +1348,7 @@ public final class PlayerDetailInfoOuterClass { if (input.isAtField(FieldNames.assistAvatarList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(assistAvatarList); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -1329,26 +1408,28 @@ public final class PlayerDetailInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName uid = FieldName.forField("uid"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName level = FieldName.forField("level"); + static final FieldName uid = FieldName.forField("uid"); static final FieldName headIcon = FieldName.forField("headIcon", "head_icon"); + static final FieldName level = FieldName.forField("level"); + static final FieldName platformType = FieldName.forField("platformType", "platform_type"); static final FieldName showDisplayAvatars = FieldName.forField("showDisplayAvatars", "show_display_avatars"); + static final FieldName isBanned = FieldName.forField("isBanned", "is_banned"); + static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info"); static final FieldName displaySettings = FieldName.forField("displaySettings", "display_settings"); - static final FieldName signature = FieldName.forField("signature"); - static final FieldName nickname = FieldName.forField("nickname"); + static final FieldName signature = FieldName.forField("signature"); + static final FieldName displayAvatarList = FieldName.forField("displayAvatarList", "display_avatar_list"); static final FieldName assistAvatarList = FieldName.forField("assistAvatarList", "assist_avatar_list"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java index 3a46793..3c6c319 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java @@ -19,34 +19,34 @@ public final class PlayerDisplaySettingsOuterClass { private static final long serialVersionUID = 0L; /** - * optional .DisplayRecordType GLJHHOCLNFC = 10; + * optional .DisplayRecordType EPMCKMCDIGB = 15; */ - private int gLJHHOCLNFC; + private int ePMCKMCDIGB; /** - * optional bool LJEELNKPIFJ = 1; + * optional bool DKLJGCEHPJL = 5; */ - private boolean lJEELNKPIFJ; + private boolean dKLJGCEHPJL; /** - * optional bool AMGBJCGCHLE = 3; + * optional bool BPELFJGIJID = 7; */ - private boolean aMGBJCGCHLE; + private boolean bPELFJGIJID; /** - * optional bool IDFLCNJJLDO = 8; + * optional bool DAFHJJEDMOF = 8; */ - private boolean iDFLCNJJLDO; + private boolean dAFHJJEDMOF; /** - * optional bool FEEELLEAEPC = 12; + * optional bool KDAKDMCGFND = 11; */ - private boolean fEEELLEAEPC; + private boolean kDAKDMCGFND; /** - * optional bool AOKKOOOODCN = 13; + * optional bool KEACGBKOFKF = 13; */ - private boolean aOKKOOOODCN; + private boolean kEACGBKOFKF; private PlayerDisplaySettings() { } @@ -59,250 +59,250 @@ public final class PlayerDisplaySettingsOuterClass { } /** - * optional .DisplayRecordType GLJHHOCLNFC = 10; - * @return whether the gLJHHOCLNFC field is set + * optional .DisplayRecordType EPMCKMCDIGB = 15; + * @return whether the ePMCKMCDIGB field is set */ - public boolean hasGLJHHOCLNFC() { + public boolean hasEPMCKMCDIGB() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .DisplayRecordType GLJHHOCLNFC = 10; + * optional .DisplayRecordType EPMCKMCDIGB = 15; * @return this */ - public PlayerDisplaySettings clearGLJHHOCLNFC() { + public PlayerDisplaySettings clearEPMCKMCDIGB() { bitField0_ &= ~0x00000001; - gLJHHOCLNFC = 0; + ePMCKMCDIGB = 0; return this; } /** - * optional .DisplayRecordType GLJHHOCLNFC = 10; - * @return the gLJHHOCLNFC + * optional .DisplayRecordType EPMCKMCDIGB = 15; + * @return the ePMCKMCDIGB */ - public DisplayRecordTypeOuterClass.DisplayRecordType getGLJHHOCLNFC() { - return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(gLJHHOCLNFC); + public DisplayRecordTypeOuterClass.DisplayRecordType getEPMCKMCDIGB() { + return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(ePMCKMCDIGB); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link PlayerDisplaySettings#getGLJHHOCLNFC()}.getNumber(). + * equivalent to {@link PlayerDisplaySettings#getEPMCKMCDIGB()}.getNumber(). * * @return numeric wire representation */ - public int getGLJHHOCLNFCValue() { - return gLJHHOCLNFC; + public int getEPMCKMCDIGBValue() { + return ePMCKMCDIGB; } /** * 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 DisplayRecordTypeOuterClass.DisplayRecordType}. Setting an invalid value - * can cause {@link PlayerDisplaySettings#getGLJHHOCLNFC()} to return null + * can cause {@link PlayerDisplaySettings#getEPMCKMCDIGB()} to return null * * @param value the numeric wire value to set * @return this */ - public PlayerDisplaySettings setGLJHHOCLNFCValue(final int value) { + public PlayerDisplaySettings setEPMCKMCDIGBValue(final int value) { bitField0_ |= 0x00000001; - gLJHHOCLNFC = value; + ePMCKMCDIGB = value; return this; } /** - * optional .DisplayRecordType GLJHHOCLNFC = 10; - * @param value the gLJHHOCLNFC to set + * optional .DisplayRecordType EPMCKMCDIGB = 15; + * @param value the ePMCKMCDIGB to set * @return this */ - public PlayerDisplaySettings setGLJHHOCLNFC( + public PlayerDisplaySettings setEPMCKMCDIGB( final DisplayRecordTypeOuterClass.DisplayRecordType value) { bitField0_ |= 0x00000001; - gLJHHOCLNFC = value.getNumber(); + ePMCKMCDIGB = value.getNumber(); return this; } /** - * optional bool LJEELNKPIFJ = 1; - * @return whether the lJEELNKPIFJ field is set + * optional bool DKLJGCEHPJL = 5; + * @return whether the dKLJGCEHPJL field is set */ - public boolean hasLJEELNKPIFJ() { + public boolean hasDKLJGCEHPJL() { return (bitField0_ & 0x00000002) != 0; } /** - * optional bool LJEELNKPIFJ = 1; + * optional bool DKLJGCEHPJL = 5; * @return this */ - public PlayerDisplaySettings clearLJEELNKPIFJ() { + public PlayerDisplaySettings clearDKLJGCEHPJL() { bitField0_ &= ~0x00000002; - lJEELNKPIFJ = false; + dKLJGCEHPJL = false; return this; } /** - * optional bool LJEELNKPIFJ = 1; - * @return the lJEELNKPIFJ + * optional bool DKLJGCEHPJL = 5; + * @return the dKLJGCEHPJL */ - public boolean getLJEELNKPIFJ() { - return lJEELNKPIFJ; + public boolean getDKLJGCEHPJL() { + return dKLJGCEHPJL; } /** - * optional bool LJEELNKPIFJ = 1; - * @param value the lJEELNKPIFJ to set + * optional bool DKLJGCEHPJL = 5; + * @param value the dKLJGCEHPJL to set * @return this */ - public PlayerDisplaySettings setLJEELNKPIFJ(final boolean value) { + public PlayerDisplaySettings setDKLJGCEHPJL(final boolean value) { bitField0_ |= 0x00000002; - lJEELNKPIFJ = value; + dKLJGCEHPJL = value; return this; } /** - * optional bool AMGBJCGCHLE = 3; - * @return whether the aMGBJCGCHLE field is set + * optional bool BPELFJGIJID = 7; + * @return whether the bPELFJGIJID field is set */ - public boolean hasAMGBJCGCHLE() { + public boolean hasBPELFJGIJID() { return (bitField0_ & 0x00000004) != 0; } /** - * optional bool AMGBJCGCHLE = 3; + * optional bool BPELFJGIJID = 7; * @return this */ - public PlayerDisplaySettings clearAMGBJCGCHLE() { + public PlayerDisplaySettings clearBPELFJGIJID() { bitField0_ &= ~0x00000004; - aMGBJCGCHLE = false; + bPELFJGIJID = false; return this; } /** - * optional bool AMGBJCGCHLE = 3; - * @return the aMGBJCGCHLE + * optional bool BPELFJGIJID = 7; + * @return the bPELFJGIJID */ - public boolean getAMGBJCGCHLE() { - return aMGBJCGCHLE; + public boolean getBPELFJGIJID() { + return bPELFJGIJID; } /** - * optional bool AMGBJCGCHLE = 3; - * @param value the aMGBJCGCHLE to set + * optional bool BPELFJGIJID = 7; + * @param value the bPELFJGIJID to set * @return this */ - public PlayerDisplaySettings setAMGBJCGCHLE(final boolean value) { + public PlayerDisplaySettings setBPELFJGIJID(final boolean value) { bitField0_ |= 0x00000004; - aMGBJCGCHLE = value; + bPELFJGIJID = value; return this; } /** - * optional bool IDFLCNJJLDO = 8; - * @return whether the iDFLCNJJLDO field is set + * optional bool DAFHJJEDMOF = 8; + * @return whether the dAFHJJEDMOF field is set */ - public boolean hasIDFLCNJJLDO() { + public boolean hasDAFHJJEDMOF() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool IDFLCNJJLDO = 8; + * optional bool DAFHJJEDMOF = 8; * @return this */ - public PlayerDisplaySettings clearIDFLCNJJLDO() { + public PlayerDisplaySettings clearDAFHJJEDMOF() { bitField0_ &= ~0x00000008; - iDFLCNJJLDO = false; + dAFHJJEDMOF = false; return this; } /** - * optional bool IDFLCNJJLDO = 8; - * @return the iDFLCNJJLDO + * optional bool DAFHJJEDMOF = 8; + * @return the dAFHJJEDMOF */ - public boolean getIDFLCNJJLDO() { - return iDFLCNJJLDO; + public boolean getDAFHJJEDMOF() { + return dAFHJJEDMOF; } /** - * optional bool IDFLCNJJLDO = 8; - * @param value the iDFLCNJJLDO to set + * optional bool DAFHJJEDMOF = 8; + * @param value the dAFHJJEDMOF to set * @return this */ - public PlayerDisplaySettings setIDFLCNJJLDO(final boolean value) { + public PlayerDisplaySettings setDAFHJJEDMOF(final boolean value) { bitField0_ |= 0x00000008; - iDFLCNJJLDO = value; + dAFHJJEDMOF = value; return this; } /** - * optional bool FEEELLEAEPC = 12; - * @return whether the fEEELLEAEPC field is set + * optional bool KDAKDMCGFND = 11; + * @return whether the kDAKDMCGFND field is set */ - public boolean hasFEEELLEAEPC() { + public boolean hasKDAKDMCGFND() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool FEEELLEAEPC = 12; + * optional bool KDAKDMCGFND = 11; * @return this */ - public PlayerDisplaySettings clearFEEELLEAEPC() { + public PlayerDisplaySettings clearKDAKDMCGFND() { bitField0_ &= ~0x00000010; - fEEELLEAEPC = false; + kDAKDMCGFND = false; return this; } /** - * optional bool FEEELLEAEPC = 12; - * @return the fEEELLEAEPC + * optional bool KDAKDMCGFND = 11; + * @return the kDAKDMCGFND */ - public boolean getFEEELLEAEPC() { - return fEEELLEAEPC; + public boolean getKDAKDMCGFND() { + return kDAKDMCGFND; } /** - * optional bool FEEELLEAEPC = 12; - * @param value the fEEELLEAEPC to set + * optional bool KDAKDMCGFND = 11; + * @param value the kDAKDMCGFND to set * @return this */ - public PlayerDisplaySettings setFEEELLEAEPC(final boolean value) { + public PlayerDisplaySettings setKDAKDMCGFND(final boolean value) { bitField0_ |= 0x00000010; - fEEELLEAEPC = value; + kDAKDMCGFND = value; return this; } /** - * optional bool AOKKOOOODCN = 13; - * @return whether the aOKKOOOODCN field is set + * optional bool KEACGBKOFKF = 13; + * @return whether the kEACGBKOFKF field is set */ - public boolean hasAOKKOOOODCN() { + public boolean hasKEACGBKOFKF() { return (bitField0_ & 0x00000020) != 0; } /** - * optional bool AOKKOOOODCN = 13; + * optional bool KEACGBKOFKF = 13; * @return this */ - public PlayerDisplaySettings clearAOKKOOOODCN() { + public PlayerDisplaySettings clearKEACGBKOFKF() { bitField0_ &= ~0x00000020; - aOKKOOOODCN = false; + kEACGBKOFKF = false; return this; } /** - * optional bool AOKKOOOODCN = 13; - * @return the aOKKOOOODCN + * optional bool KEACGBKOFKF = 13; + * @return the kEACGBKOFKF */ - public boolean getAOKKOOOODCN() { - return aOKKOOOODCN; + public boolean getKEACGBKOFKF() { + return kEACGBKOFKF; } /** - * optional bool AOKKOOOODCN = 13; - * @param value the aOKKOOOODCN to set + * optional bool KEACGBKOFKF = 13; + * @param value the kEACGBKOFKF to set * @return this */ - public PlayerDisplaySettings setAOKKOOOODCN(final boolean value) { + public PlayerDisplaySettings setKEACGBKOFKF(final boolean value) { bitField0_ |= 0x00000020; - aOKKOOOODCN = value; + kEACGBKOFKF = value; return this; } @@ -311,12 +311,12 @@ public final class PlayerDisplaySettingsOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gLJHHOCLNFC = other.gLJHHOCLNFC; - lJEELNKPIFJ = other.lJEELNKPIFJ; - aMGBJCGCHLE = other.aMGBJCGCHLE; - iDFLCNJJLDO = other.iDFLCNJJLDO; - fEEELLEAEPC = other.fEEELLEAEPC; - aOKKOOOODCN = other.aOKKOOOODCN; + ePMCKMCDIGB = other.ePMCKMCDIGB; + dKLJGCEHPJL = other.dKLJGCEHPJL; + bPELFJGIJID = other.bPELFJGIJID; + dAFHJJEDMOF = other.dAFHJJEDMOF; + kDAKDMCGFND = other.kDAKDMCGFND; + kEACGBKOFKF = other.kEACGBKOFKF; } return this; } @@ -327,23 +327,23 @@ public final class PlayerDisplaySettingsOuterClass { return this; } cachedSize = -1; - if (other.hasGLJHHOCLNFC()) { - setGLJHHOCLNFCValue(other.gLJHHOCLNFC); + if (other.hasEPMCKMCDIGB()) { + setEPMCKMCDIGBValue(other.ePMCKMCDIGB); } - if (other.hasLJEELNKPIFJ()) { - setLJEELNKPIFJ(other.lJEELNKPIFJ); + if (other.hasDKLJGCEHPJL()) { + setDKLJGCEHPJL(other.dKLJGCEHPJL); } - if (other.hasAMGBJCGCHLE()) { - setAMGBJCGCHLE(other.aMGBJCGCHLE); + if (other.hasBPELFJGIJID()) { + setBPELFJGIJID(other.bPELFJGIJID); } - if (other.hasIDFLCNJJLDO()) { - setIDFLCNJJLDO(other.iDFLCNJJLDO); + if (other.hasDAFHJJEDMOF()) { + setDAFHJJEDMOF(other.dAFHJJEDMOF); } - if (other.hasFEEELLEAEPC()) { - setFEEELLEAEPC(other.fEEELLEAEPC); + if (other.hasKDAKDMCGFND()) { + setKDAKDMCGFND(other.kDAKDMCGFND); } - if (other.hasAOKKOOOODCN()) { - setAOKKOOOODCN(other.aOKKOOOODCN); + if (other.hasKEACGBKOFKF()) { + setKEACGBKOFKF(other.kEACGBKOFKF); } return this; } @@ -355,12 +355,12 @@ public final class PlayerDisplaySettingsOuterClass { } cachedSize = -1; bitField0_ = 0; - gLJHHOCLNFC = 0; - lJEELNKPIFJ = false; - aMGBJCGCHLE = false; - iDFLCNJJLDO = false; - fEEELLEAEPC = false; - aOKKOOOODCN = false; + ePMCKMCDIGB = 0; + dKLJGCEHPJL = false; + bPELFJGIJID = false; + dAFHJJEDMOF = false; + kDAKDMCGFND = false; + kEACGBKOFKF = false; return this; } @@ -384,39 +384,39 @@ public final class PlayerDisplaySettingsOuterClass { } PlayerDisplaySettings other = (PlayerDisplaySettings) o; return bitField0_ == other.bitField0_ - && (!hasGLJHHOCLNFC() || gLJHHOCLNFC == other.gLJHHOCLNFC) - && (!hasLJEELNKPIFJ() || lJEELNKPIFJ == other.lJEELNKPIFJ) - && (!hasAMGBJCGCHLE() || aMGBJCGCHLE == other.aMGBJCGCHLE) - && (!hasIDFLCNJJLDO() || iDFLCNJJLDO == other.iDFLCNJJLDO) - && (!hasFEEELLEAEPC() || fEEELLEAEPC == other.fEEELLEAEPC) - && (!hasAOKKOOOODCN() || aOKKOOOODCN == other.aOKKOOOODCN); + && (!hasEPMCKMCDIGB() || ePMCKMCDIGB == other.ePMCKMCDIGB) + && (!hasDKLJGCEHPJL() || dKLJGCEHPJL == other.dKLJGCEHPJL) + && (!hasBPELFJGIJID() || bPELFJGIJID == other.bPELFJGIJID) + && (!hasDAFHJJEDMOF() || dAFHJJEDMOF == other.dAFHJJEDMOF) + && (!hasKDAKDMCGFND() || kDAKDMCGFND == other.kDAKDMCGFND) + && (!hasKEACGBKOFKF() || kEACGBKOFKF == other.kEACGBKOFKF); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeEnumNoTag(gLJHHOCLNFC); + output.writeRawByte((byte) 120); + output.writeEnumNoTag(ePMCKMCDIGB); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); - output.writeBoolNoTag(lJEELNKPIFJ); + output.writeRawByte((byte) 40); + output.writeBoolNoTag(dKLJGCEHPJL); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeBoolNoTag(aMGBJCGCHLE); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(bPELFJGIJID); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); - output.writeBoolNoTag(iDFLCNJJLDO); + output.writeBoolNoTag(dAFHJJEDMOF); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeBoolNoTag(fEEELLEAEPC); + output.writeRawByte((byte) 88); + output.writeBoolNoTag(kDAKDMCGFND); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 104); - output.writeBoolNoTag(aOKKOOOODCN); + output.writeBoolNoTag(kEACGBKOFKF); } } @@ -424,7 +424,7 @@ public final class PlayerDisplaySettingsOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(gLJHHOCLNFC); + size += 1 + ProtoSink.computeEnumSizeNoTag(ePMCKMCDIGB); } if ((bitField0_ & 0x00000002) != 0) { size += 2; @@ -451,30 +451,30 @@ public final class PlayerDisplaySettingsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // gLJHHOCLNFC + case 120: { + // ePMCKMCDIGB final int value = input.readInt32(); if (DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(value) != null) { - gLJHHOCLNFC = value; + ePMCKMCDIGB = value; bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { - // lJEELNKPIFJ - lJEELNKPIFJ = input.readBool(); + case 40: { + // dKLJGCEHPJL + dKLJGCEHPJL = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 56) { break; } } - case 24: { - // aMGBJCGCHLE - aMGBJCGCHLE = input.readBool(); + case 56: { + // bPELFJGIJID + bPELFJGIJID = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 64) { @@ -482,17 +482,17 @@ public final class PlayerDisplaySettingsOuterClass { } } case 64: { - // iDFLCNJJLDO - iDFLCNJJLDO = input.readBool(); + // dAFHJJEDMOF + dAFHJJEDMOF = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // fEEELLEAEPC - fEEELLEAEPC = input.readBool(); + case 88: { + // kDAKDMCGFND + kDAKDMCGFND = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 104) { @@ -500,8 +500,8 @@ public final class PlayerDisplaySettingsOuterClass { } } case 104: { - // aOKKOOOODCN - aOKKOOOODCN = input.readBool(); + // kEACGBKOFKF + kEACGBKOFKF = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 0) { @@ -526,22 +526,22 @@ public final class PlayerDisplaySettingsOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeEnum(FieldNames.gLJHHOCLNFC, gLJHHOCLNFC, DisplayRecordTypeOuterClass.DisplayRecordType.converter()); + output.writeEnum(FieldNames.ePMCKMCDIGB, ePMCKMCDIGB, DisplayRecordTypeOuterClass.DisplayRecordType.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.lJEELNKPIFJ, lJEELNKPIFJ); + output.writeBool(FieldNames.dKLJGCEHPJL, dKLJGCEHPJL); } if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.aMGBJCGCHLE, aMGBJCGCHLE); + output.writeBool(FieldNames.bPELFJGIJID, bPELFJGIJID); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.iDFLCNJJLDO, iDFLCNJJLDO); + output.writeBool(FieldNames.dAFHJJEDMOF, dAFHJJEDMOF); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.fEEELLEAEPC, fEEELLEAEPC); + output.writeBool(FieldNames.kDAKDMCGFND, kDAKDMCGFND); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.aOKKOOOODCN, aOKKOOOODCN); + output.writeBool(FieldNames.kEACGBKOFKF, kEACGBKOFKF); } output.endObject(); } @@ -553,12 +553,12 @@ public final class PlayerDisplaySettingsOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1337672088: { - if (input.isAtField(FieldNames.gLJHHOCLNFC)) { + case 1204049952: { + if (input.isAtField(FieldNames.ePMCKMCDIGB)) { if (!input.trySkipNullValue()) { final DisplayRecordTypeOuterClass.DisplayRecordType value = input.readEnum(DisplayRecordTypeOuterClass.DisplayRecordType.converter()); if (value != null) { - gLJHHOCLNFC = value.getNumber(); + ePMCKMCDIGB = value.getNumber(); bitField0_ |= 0x00000001; } else { input.skipUnknownEnumValue(); @@ -569,10 +569,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case 83671720: { - if (input.isAtField(FieldNames.lJEELNKPIFJ)) { + case 1271460558: { + if (input.isAtField(FieldNames.dKLJGCEHPJL)) { if (!input.trySkipNullValue()) { - lJEELNKPIFJ = input.readBool(); + dKLJGCEHPJL = input.readBool(); bitField0_ |= 0x00000002; } } else { @@ -580,10 +580,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -266688539: { - if (input.isAtField(FieldNames.aMGBJCGCHLE)) { + case -2139467414: { + if (input.isAtField(FieldNames.bPELFJGIJID)) { if (!input.trySkipNullValue()) { - aMGBJCGCHLE = input.readBool(); + bPELFJGIJID = input.readBool(); bitField0_ |= 0x00000004; } } else { @@ -591,10 +591,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case 467257547: { - if (input.isAtField(FieldNames.iDFLCNJJLDO)) { + case 573593030: { + if (input.isAtField(FieldNames.dAFHJJEDMOF)) { if (!input.trySkipNullValue()) { - iDFLCNJJLDO = input.readBool(); + dAFHJJEDMOF = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -602,10 +602,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -1100204323: { - if (input.isAtField(FieldNames.fEEELLEAEPC)) { + case 725164556: { + if (input.isAtField(FieldNames.kDAKDMCGFND)) { if (!input.trySkipNullValue()) { - fEEELLEAEPC = input.readBool(); + kDAKDMCGFND = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -613,10 +613,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -300332511: { - if (input.isAtField(FieldNames.aOKKOOOODCN)) { + case 1826287046: { + if (input.isAtField(FieldNames.kEACGBKOFKF)) { if (!input.trySkipNullValue()) { - aOKKOOOODCN = input.readBool(); + kEACGBKOFKF = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -677,17 +677,17 @@ public final class PlayerDisplaySettingsOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gLJHHOCLNFC = FieldName.forField("GLJHHOCLNFC"); + static final FieldName ePMCKMCDIGB = FieldName.forField("EPMCKMCDIGB"); - static final FieldName lJEELNKPIFJ = FieldName.forField("LJEELNKPIFJ"); + static final FieldName dKLJGCEHPJL = FieldName.forField("DKLJGCEHPJL"); - static final FieldName aMGBJCGCHLE = FieldName.forField("AMGBJCGCHLE"); + static final FieldName bPELFJGIJID = FieldName.forField("BPELFJGIJID"); - static final FieldName iDFLCNJJLDO = FieldName.forField("IDFLCNJJLDO"); + static final FieldName dAFHJJEDMOF = FieldName.forField("DAFHJJEDMOF"); - static final FieldName fEEELLEAEPC = FieldName.forField("FEEELLEAEPC"); + static final FieldName kDAKDMCGFND = FieldName.forField("KDAKDMCGFND"); - static final FieldName aOKKOOOODCN = FieldName.forField("AOKKOOOODCN"); + static final FieldName kEACGBKOFKF = FieldName.forField("KEACGBKOFKF"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java index 2f49f7c..78b00b7 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java @@ -20,17 +20,17 @@ public final class PlayerGetTokenCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 platform_type = 1; + * optional uint32 platform_type = 15; */ private int platformType; /** - * optional string token = 9; + * optional string token = 1; */ private final Utf8String token = Utf8String.newEmptyInstance(); /** - * optional string account_uid = 13; + * optional string account_uid = 11; */ private final Utf8String accountUid = Utf8String.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 1; + * optional uint32 platform_type = 15; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -53,7 +53,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 1; + * optional uint32 platform_type = 15; * @return this */ public PlayerGetTokenCsReq clearPlatformType() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 1; + * optional uint32 platform_type = 15; * @return the platformType */ public int getPlatformType() { @@ -71,7 +71,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 1; + * optional uint32 platform_type = 15; * @param value the platformType to set * @return this */ @@ -82,7 +82,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @return whether the token field is set */ public boolean hasToken() { @@ -90,7 +90,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @return this */ public PlayerGetTokenCsReq clearToken() { @@ -100,7 +100,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @return the token */ public String getToken() { @@ -108,7 +108,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @return internal {@code Utf8String} representation of token for reading */ public Utf8String getTokenBytes() { @@ -116,7 +116,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @return internal {@code Utf8String} representation of token for modifications */ public Utf8String getMutableTokenBytes() { @@ -125,7 +125,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @param value the token to set * @return this */ @@ -136,7 +136,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string token = 9; + * optional string token = 1; * @param value the token to set * @return this */ @@ -147,7 +147,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @return whether the accountUid field is set */ public boolean hasAccountUid() { @@ -155,7 +155,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @return this */ public PlayerGetTokenCsReq clearAccountUid() { @@ -165,7 +165,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @return the accountUid */ public String getAccountUid() { @@ -173,7 +173,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @return internal {@code Utf8String} representation of accountUid for reading */ public Utf8String getAccountUidBytes() { @@ -181,7 +181,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @return internal {@code Utf8String} representation of accountUid for modifications */ public Utf8String getMutableAccountUidBytes() { @@ -190,7 +190,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @param value the accountUid to set * @return this */ @@ -201,7 +201,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional string account_uid = 13; + * optional string account_uid = 11; * @param value the accountUid to set * @return this */ @@ -284,15 +284,15 @@ public final class PlayerGetTokenCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(platformType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 10); output.writeStringNoTag(token); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeStringNoTag(accountUid); } } @@ -319,25 +319,25 @@ public final class PlayerGetTokenCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 120: { // platformType platformType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 10) { break; } } - case 74: { + case 10: { // token input.readString(token); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // accountUid input.readString(accountUid); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java index e80aa28..0dcdc7d 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java @@ -25,22 +25,22 @@ public final class PlayerGetTokenScRspOuterClass { private long secretKeySeed; /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; */ private int uid; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 5; */ private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance(); /** - * optional string msg = 8; + * optional string msg = 2; */ private final Utf8String msg = Utf8String.newEmptyInstance(); @@ -92,7 +92,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @return whether the uid field is set */ public boolean hasUid() { @@ -100,7 +100,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @return this */ public PlayerGetTokenScRsp clearUid() { @@ -110,7 +110,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @return the uid */ public int getUid() { @@ -118,7 +118,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 1; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -137,7 +137,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return this */ public PlayerGetTokenScRsp clearRetcode() { @@ -147,7 +147,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -155,7 +155,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -166,7 +166,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 5; * @return whether the blackInfo field is set */ public boolean hasBlackInfo() { @@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 5; * @return this */ public PlayerGetTokenScRsp clearBlackInfo() { @@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_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. @@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_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 @@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 2; + * optional .BlackInfo black_info = 5; * @param value the blackInfo to set * @return this */ @@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @return whether the msg field is set */ public boolean hasMsg() { @@ -231,7 +231,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @return this */ public PlayerGetTokenScRsp clearMsg() { @@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @return the msg */ public String getMsg() { @@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @return internal {@code Utf8String} representation of msg for reading */ public Utf8String getMsgBytes() { @@ -257,7 +257,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @return internal {@code Utf8String} representation of msg for modifications */ public Utf8String getMutableMsgBytes() { @@ -266,7 +266,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @param value the msg to set * @return this */ @@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 8; + * optional string msg = 2; * @param value the msg to set * @return this */ @@ -376,19 +376,19 @@ public final class PlayerGetTokenScRspOuterClass { output.writeUInt64NoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 42); output.writeMessageNoTag(blackInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 18); output.writeStringNoTag(msg); } } @@ -426,38 +426,38 @@ public final class PlayerGetTokenScRspOuterClass { secretKeySeed = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 8) { break; } } - case 24: { + case 8: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 32) { break; } } - case 96: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // blackInfo + input.readMessage(blackInfo); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // blackInfo - input.readMessage(blackInfo); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { // msg input.readString(msg); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java index 7dc9fd6..deef22c 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class PlayerHeartbeatCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 client_time_ms = 11; + * optional uint64 client_time_ms = 10; */ private long clientTimeMs; @@ -34,7 +34,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 11; + * optional uint64 client_time_ms = 10; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -42,7 +42,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 11; + * optional uint64 client_time_ms = 10; * @return this */ public PlayerHeartbeatCsReq clearClientTimeMs() { @@ -52,7 +52,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 11; + * optional uint64 client_time_ms = 10; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -60,7 +60,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 11; + * optional uint64 client_time_ms = 10; * @param value the clientTimeMs to set * @return this */ @@ -129,7 +129,7 @@ public final class PlayerHeartbeatCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt64NoTag(clientTimeMs); } } @@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 80: { // clientTimeMs clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java index 24b7213..ff33a1a 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java @@ -18,18 +18,18 @@ public final class PlayerHeartbeatScRspOuterClass { public static final class PlayerHeartbeatScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint64 server_time_ms = 3; - */ - private long serverTimeMs; - /** * optional uint64 client_time_ms = 11; */ private long clientTimeMs; /** - * optional uint32 retcode = 13; + * optional uint64 server_time_ms = 15; + */ + private long serverTimeMs; + + /** + * optional uint32 retcode = 1; */ private int retcode; @@ -43,49 +43,12 @@ public final class PlayerHeartbeatScRspOuterClass { return new PlayerHeartbeatScRsp(); } - /** - * optional uint64 server_time_ms = 3; - * @return whether the serverTimeMs field is set - */ - public boolean hasServerTimeMs() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint64 server_time_ms = 3; - * @return this - */ - public PlayerHeartbeatScRsp clearServerTimeMs() { - bitField0_ &= ~0x00000001; - serverTimeMs = 0L; - return this; - } - - /** - * optional uint64 server_time_ms = 3; - * @return the serverTimeMs - */ - public long getServerTimeMs() { - return serverTimeMs; - } - - /** - * optional uint64 server_time_ms = 3; - * @param value the serverTimeMs to set - * @return this - */ - public PlayerHeartbeatScRsp setServerTimeMs(final long value) { - bitField0_ |= 0x00000001; - serverTimeMs = value; - return this; - } - /** * optional uint64 client_time_ms = 11; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -93,7 +56,7 @@ public final class PlayerHeartbeatScRspOuterClass { * @return this */ public PlayerHeartbeatScRsp clearClientTimeMs() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientTimeMs = 0L; return this; } @@ -112,13 +75,50 @@ public final class PlayerHeartbeatScRspOuterClass { * @return this */ public PlayerHeartbeatScRsp setClientTimeMs(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientTimeMs = value; return this; } /** - * optional uint32 retcode = 13; + * optional uint64 server_time_ms = 15; + * @return whether the serverTimeMs field is set + */ + public boolean hasServerTimeMs() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 server_time_ms = 15; + * @return this + */ + public PlayerHeartbeatScRsp clearServerTimeMs() { + bitField0_ &= ~0x00000002; + serverTimeMs = 0L; + return this; + } + + /** + * optional uint64 server_time_ms = 15; + * @return the serverTimeMs + */ + public long getServerTimeMs() { + return serverTimeMs; + } + + /** + * optional uint64 server_time_ms = 15; + * @param value the serverTimeMs to set + * @return this + */ + public PlayerHeartbeatScRsp setServerTimeMs(final long value) { + bitField0_ |= 0x00000002; + serverTimeMs = value; + return this; + } + + /** + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +126,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return this */ public PlayerHeartbeatScRsp clearRetcode() { @@ -136,7 +136,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -144,7 +144,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -159,8 +159,8 @@ public final class PlayerHeartbeatScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - serverTimeMs = other.serverTimeMs; clientTimeMs = other.clientTimeMs; + serverTimeMs = other.serverTimeMs; retcode = other.retcode; } return this; @@ -172,12 +172,12 @@ public final class PlayerHeartbeatScRspOuterClass { return this; } cachedSize = -1; - if (other.hasServerTimeMs()) { - setServerTimeMs(other.serverTimeMs); - } if (other.hasClientTimeMs()) { setClientTimeMs(other.clientTimeMs); } + if (other.hasServerTimeMs()) { + setServerTimeMs(other.serverTimeMs); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -191,8 +191,8 @@ public final class PlayerHeartbeatScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - serverTimeMs = 0L; clientTimeMs = 0L; + serverTimeMs = 0L; retcode = 0; return this; } @@ -217,23 +217,23 @@ public final class PlayerHeartbeatScRspOuterClass { } PlayerHeartbeatScRsp other = (PlayerHeartbeatScRsp) o; return bitField0_ == other.bitField0_ - && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs) && (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs) + && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs) && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt64NoTag(serverTimeMs); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); output.writeUInt64NoTag(clientTimeMs); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt64NoTag(serverTimeMs); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } } @@ -242,10 +242,10 @@ public final class PlayerHeartbeatScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); @@ -260,25 +260,25 @@ public final class PlayerHeartbeatScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // serverTimeMs - serverTimeMs = input.readUInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } case 88: { // clientTimeMs clientTimeMs = input.readUInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { + // serverTimeMs + serverTimeMs = input.readUInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class PlayerHeartbeatScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); + output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); + output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -323,11 +323,11 @@ public final class PlayerHeartbeatScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1928739446: - case 1149956956: { - if (input.isAtField(FieldNames.serverTimeMs)) { + case -1414301442: + case 1123200996: { + if (input.isAtField(FieldNames.clientTimeMs)) { if (!input.trySkipNullValue()) { - serverTimeMs = input.readUInt64(); + clientTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class PlayerHeartbeatScRspOuterClass { } break; } - case -1414301442: - case 1123200996: { - if (input.isAtField(FieldNames.clientTimeMs)) { + case 1928739446: + case 1149956956: { + if (input.isAtField(FieldNames.serverTimeMs)) { if (!input.trySkipNullValue()) { - clientTimeMs = input.readUInt64(); + serverTimeMs = input.readUInt64(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class PlayerHeartbeatScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms"); - static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_time_ms"); + static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms"); + static final FieldName retcode = FieldName.forField("retcode"); } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java index e87bf6f..3ba2343 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java @@ -19,32 +19,32 @@ public final class PlayerLoginScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 server_timestamp_ms = 7; - */ - private long serverTimestampMs; - - /** - * optional uint64 login_random = 15; + * optional uint64 login_random = 2; */ private long loginRandom; /** - * optional uint32 stamina = 1; + * optional uint64 server_timestamp_ms = 14; */ - private int stamina; + private long serverTimestampMs; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional sint32 cur_timezone = 12; + * optional uint32 stamina = 13; + */ + private int stamina; + + /** + * optional sint32 cur_timezone = 3; */ private int curTimezone; /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_info = 11; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); @@ -59,62 +59,25 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 7; - * @return whether the serverTimestampMs field is set + * optional uint64 login_random = 2; + * @return whether the loginRandom field is set */ - public boolean hasServerTimestampMs() { + public boolean hasLoginRandom() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 server_timestamp_ms = 7; - * @return this - */ - public PlayerLoginScRsp clearServerTimestampMs() { - bitField0_ &= ~0x00000001; - serverTimestampMs = 0L; - return this; - } - - /** - * optional uint64 server_timestamp_ms = 7; - * @return the serverTimestampMs - */ - public long getServerTimestampMs() { - return serverTimestampMs; - } - - /** - * optional uint64 server_timestamp_ms = 7; - * @param value the serverTimestampMs to set - * @return this - */ - public PlayerLoginScRsp setServerTimestampMs(final long value) { - bitField0_ |= 0x00000001; - serverTimestampMs = value; - return this; - } - - /** - * optional uint64 login_random = 15; - * @return whether the loginRandom field is set - */ - public boolean hasLoginRandom() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint64 login_random = 15; + * optional uint64 login_random = 2; * @return this */ public PlayerLoginScRsp clearLoginRandom() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; loginRandom = 0L; return this; } /** - * optional uint64 login_random = 15; + * optional uint64 login_random = 2; * @return the loginRandom */ public long getLoginRandom() { @@ -122,73 +85,73 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 login_random = 15; + * optional uint64 login_random = 2; * @param value the loginRandom to set * @return this */ public PlayerLoginScRsp setLoginRandom(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; loginRandom = value; return this; } /** - * optional uint32 stamina = 1; - * @return whether the stamina field is set + * optional uint64 server_timestamp_ms = 14; + * @return whether the serverTimestampMs field is set */ - public boolean hasStamina() { + public boolean hasServerTimestampMs() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 server_timestamp_ms = 14; + * @return this + */ + public PlayerLoginScRsp clearServerTimestampMs() { + bitField0_ &= ~0x00000002; + serverTimestampMs = 0L; + return this; + } + + /** + * optional uint64 server_timestamp_ms = 14; + * @return the serverTimestampMs + */ + public long getServerTimestampMs() { + return serverTimestampMs; + } + + /** + * optional uint64 server_timestamp_ms = 14; + * @param value the serverTimestampMs to set + * @return this + */ + public PlayerLoginScRsp setServerTimestampMs(final long value) { + bitField0_ |= 0x00000002; + serverTimestampMs = value; + return this; + } + + /** + * optional uint32 retcode = 8; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 stamina = 1; - * @return this - */ - public PlayerLoginScRsp clearStamina() { - bitField0_ &= ~0x00000004; - stamina = 0; - return this; - } - - /** - * optional uint32 stamina = 1; - * @return the stamina - */ - public int getStamina() { - return stamina; - } - - /** - * optional uint32 stamina = 1; - * @param value the stamina to set - * @return this - */ - public PlayerLoginScRsp setStamina(final int value) { - bitField0_ |= 0x00000004; - stamina = value; - return this; - } - - /** - * optional uint32 retcode = 2; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return this */ public PlayerLoginScRsp clearRetcode() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; retcode = 0; return this; } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -196,18 +159,55 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ public PlayerLoginScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; retcode = value; return this; } /** - * optional sint32 cur_timezone = 12; + * optional uint32 stamina = 13; + * @return whether the stamina field is set + */ + public boolean hasStamina() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stamina = 13; + * @return this + */ + public PlayerLoginScRsp clearStamina() { + bitField0_ &= ~0x00000008; + stamina = 0; + return this; + } + + /** + * optional uint32 stamina = 13; + * @return the stamina + */ + public int getStamina() { + return stamina; + } + + /** + * optional uint32 stamina = 13; + * @param value the stamina to set + * @return this + */ + public PlayerLoginScRsp setStamina(final int value) { + bitField0_ |= 0x00000008; + stamina = value; + return this; + } + + /** + * optional sint32 cur_timezone = 3; * @return whether the curTimezone field is set */ public boolean hasCurTimezone() { @@ -215,7 +215,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 12; + * optional sint32 cur_timezone = 3; * @return this */ public PlayerLoginScRsp clearCurTimezone() { @@ -225,7 +225,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 12; + * optional sint32 cur_timezone = 3; * @return the curTimezone */ public int getCurTimezone() { @@ -233,7 +233,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 12; + * optional sint32 cur_timezone = 3; * @param value the curTimezone to set * @return this */ @@ -244,7 +244,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_info = 11; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -252,7 +252,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_info = 11; * @return this */ public PlayerLoginScRsp clearBasicInfo() { @@ -262,7 +262,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_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. @@ -276,7 +276,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_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 @@ -290,7 +290,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 9; + * optional .PlayerBasicInfo basic_info = 11; * @param value the basicInfo to set * @return this */ @@ -305,10 +305,10 @@ public final class PlayerLoginScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - serverTimestampMs = other.serverTimestampMs; loginRandom = other.loginRandom; - stamina = other.stamina; + serverTimestampMs = other.serverTimestampMs; retcode = other.retcode; + stamina = other.stamina; curTimezone = other.curTimezone; basicInfo.copyFrom(other.basicInfo); } @@ -321,18 +321,18 @@ public final class PlayerLoginScRspOuterClass { return this; } cachedSize = -1; - if (other.hasServerTimestampMs()) { - setServerTimestampMs(other.serverTimestampMs); - } if (other.hasLoginRandom()) { setLoginRandom(other.loginRandom); } - if (other.hasStamina()) { - setStamina(other.stamina); + if (other.hasServerTimestampMs()) { + setServerTimestampMs(other.serverTimestampMs); } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasStamina()) { + setStamina(other.stamina); + } if (other.hasCurTimezone()) { setCurTimezone(other.curTimezone); } @@ -349,10 +349,10 @@ public final class PlayerLoginScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - serverTimestampMs = 0L; loginRandom = 0L; - stamina = 0; + serverTimestampMs = 0L; retcode = 0; + stamina = 0; curTimezone = 0; basicInfo.clear(); return this; @@ -379,10 +379,10 @@ public final class PlayerLoginScRspOuterClass { } PlayerLoginScRsp other = (PlayerLoginScRsp) o; return bitField0_ == other.bitField0_ - && (!hasServerTimestampMs() || serverTimestampMs == other.serverTimestampMs) && (!hasLoginRandom() || loginRandom == other.loginRandom) - && (!hasStamina() || stamina == other.stamina) + && (!hasServerTimestampMs() || serverTimestampMs == other.serverTimestampMs) && (!hasRetcode() || retcode == other.retcode) + && (!hasStamina() || stamina == other.stamina) && (!hasCurTimezone() || curTimezone == other.curTimezone) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)); } @@ -390,27 +390,27 @@ public final class PlayerLoginScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt64NoTag(serverTimestampMs); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt64NoTag(loginRandom); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(stamina); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt64NoTag(serverTimestampMs); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(stamina); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeSInt32NoTag(curTimezone); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 90); output.writeMessageNoTag(basicInfo); } } @@ -419,16 +419,16 @@ public final class PlayerLoginScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimestampMs); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(loginRandom); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimestampMs); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(curTimezone); @@ -446,52 +446,52 @@ public final class PlayerLoginScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // serverTimestampMs - serverTimestampMs = input.readUInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 16: { // loginRandom loginRandom = input.readUInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // serverTimestampMs + serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 64) { break; } } - case 8: { - // stamina - stamina = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { + case 64: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { + case 104: { + // stamina + stamina = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // curTimezone curTimezone = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 74) { + if (tag != 90) { break; } } - case 74: { + case 90: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000020; @@ -518,16 +518,16 @@ public final class PlayerLoginScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.serverTimestampMs, serverTimestampMs); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt64(FieldNames.loginRandom, loginRandom); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt64(FieldNames.serverTimestampMs, serverTimestampMs); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.stamina, stamina); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stamina, stamina); } if ((bitField0_ & 0x00000010) != 0) { output.writeSInt32(FieldNames.curTimezone, curTimezone); @@ -545,11 +545,11 @@ public final class PlayerLoginScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1700420071: - case -1078785813: { - if (input.isAtField(FieldNames.serverTimestampMs)) { + case 1268567436: + case -201491879: { + if (input.isAtField(FieldNames.loginRandom)) { if (!input.trySkipNullValue()) { - serverTimestampMs = input.readUInt64(); + loginRandom = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -557,11 +557,11 @@ public final class PlayerLoginScRspOuterClass { } break; } - case 1268567436: - case -201491879: { - if (input.isAtField(FieldNames.loginRandom)) { + case -1700420071: + case -1078785813: { + if (input.isAtField(FieldNames.serverTimestampMs)) { if (!input.trySkipNullValue()) { - loginRandom = input.readUInt64(); + serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000002; } } else { @@ -569,21 +569,21 @@ public final class PlayerLoginScRspOuterClass { } break; } - case -1897344401: { - if (input.isAtField(FieldNames.stamina)) { - if (!input.trySkipNullValue()) { - stamina = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1897344401: { + if (input.isAtField(FieldNames.stamina)) { + if (!input.trySkipNullValue()) { + stamina = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -668,14 +668,14 @@ public final class PlayerLoginScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName serverTimestampMs = FieldName.forField("serverTimestampMs", "server_timestamp_ms"); - static final FieldName loginRandom = FieldName.forField("loginRandom", "login_random"); - static final FieldName stamina = FieldName.forField("stamina"); + static final FieldName serverTimestampMs = FieldName.forField("serverTimestampMs", "server_timestamp_ms"); static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName stamina = FieldName.forField("stamina"); + static final FieldName curTimezone = FieldName.forField("curTimezone", "cur_timezone"); static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java index 81a377c..d78e3f6 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java @@ -19,47 +19,47 @@ public final class PlayerRecordInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 LAAOICJFOPI = 1; + * optional uint32 CPIKKMDOKHA = 3; */ - private int lAAOICJFOPI; + private int cPIKKMDOKHA; /** - * optional uint32 PDHAFOAOMPB = 2; + * optional uint32 MGDIMDLPOGA = 4; */ - private int pDHAFOAOMPB; + private int mGDIMDLPOGA; /** - * optional uint32 DKDINDMGEJH = 5; + * optional uint32 DKPLJPHGDMB = 7; */ - private int dKDINDMGEJH; + private int dKPLJPHGDMB; /** - * optional uint32 BFGDPMKBHNB = 6; + * optional uint32 INMEAGINKPN = 8; */ - private int bFGDPMKBHNB; + private int iNMEAGINKPN; /** - * optional uint32 JJOHCDLEDMO = 11; + * optional uint32 BIOJHIBFELK = 10; */ - private int jJOHCDLEDMO; + private int bIOJHIBFELK; /** - * optional uint32 EEJCCFCIGDF = 12; + * optional uint32 MFMOAJONBBF = 12; */ - private int eEJCCFCIGDF; + private int mFMOAJONBBF; /** - * optional uint32 PNIAMOINNJF = 13; + * optional uint32 HNICFKBEKJO = 14; */ - private int pNIAMOINNJF; + private int hNICFKBEKJO; /** - * optional uint32 IPOCLBEJIAF = 14; + * optional uint32 OOIOMMKOIAE = 15; */ - private int iPOCLBEJIAF; + private int oOIOMMKOIAE; /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_info = 2; */ private final PlayerCollectionInfoOuterClass.PlayerCollectionInfo collectionInfo = PlayerCollectionInfoOuterClass.PlayerCollectionInfo.newInstance(); @@ -74,303 +74,303 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional uint32 LAAOICJFOPI = 1; - * @return whether the lAAOICJFOPI field is set + * optional uint32 CPIKKMDOKHA = 3; + * @return whether the cPIKKMDOKHA field is set */ - public boolean hasLAAOICJFOPI() { + public boolean hasCPIKKMDOKHA() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 LAAOICJFOPI = 1; + * optional uint32 CPIKKMDOKHA = 3; * @return this */ - public PlayerRecordInfo clearLAAOICJFOPI() { + public PlayerRecordInfo clearCPIKKMDOKHA() { bitField0_ &= ~0x00000001; - lAAOICJFOPI = 0; + cPIKKMDOKHA = 0; return this; } /** - * optional uint32 LAAOICJFOPI = 1; - * @return the lAAOICJFOPI + * optional uint32 CPIKKMDOKHA = 3; + * @return the cPIKKMDOKHA */ - public int getLAAOICJFOPI() { - return lAAOICJFOPI; + public int getCPIKKMDOKHA() { + return cPIKKMDOKHA; } /** - * optional uint32 LAAOICJFOPI = 1; - * @param value the lAAOICJFOPI to set + * optional uint32 CPIKKMDOKHA = 3; + * @param value the cPIKKMDOKHA to set * @return this */ - public PlayerRecordInfo setLAAOICJFOPI(final int value) { + public PlayerRecordInfo setCPIKKMDOKHA(final int value) { bitField0_ |= 0x00000001; - lAAOICJFOPI = value; + cPIKKMDOKHA = value; return this; } /** - * optional uint32 PDHAFOAOMPB = 2; - * @return whether the pDHAFOAOMPB field is set + * optional uint32 MGDIMDLPOGA = 4; + * @return whether the mGDIMDLPOGA field is set */ - public boolean hasPDHAFOAOMPB() { + public boolean hasMGDIMDLPOGA() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 PDHAFOAOMPB = 2; + * optional uint32 MGDIMDLPOGA = 4; * @return this */ - public PlayerRecordInfo clearPDHAFOAOMPB() { + public PlayerRecordInfo clearMGDIMDLPOGA() { bitField0_ &= ~0x00000002; - pDHAFOAOMPB = 0; + mGDIMDLPOGA = 0; return this; } /** - * optional uint32 PDHAFOAOMPB = 2; - * @return the pDHAFOAOMPB + * optional uint32 MGDIMDLPOGA = 4; + * @return the mGDIMDLPOGA */ - public int getPDHAFOAOMPB() { - return pDHAFOAOMPB; + public int getMGDIMDLPOGA() { + return mGDIMDLPOGA; } /** - * optional uint32 PDHAFOAOMPB = 2; - * @param value the pDHAFOAOMPB to set + * optional uint32 MGDIMDLPOGA = 4; + * @param value the mGDIMDLPOGA to set * @return this */ - public PlayerRecordInfo setPDHAFOAOMPB(final int value) { + public PlayerRecordInfo setMGDIMDLPOGA(final int value) { bitField0_ |= 0x00000002; - pDHAFOAOMPB = value; + mGDIMDLPOGA = value; return this; } /** - * optional uint32 DKDINDMGEJH = 5; - * @return whether the dKDINDMGEJH field is set + * optional uint32 DKPLJPHGDMB = 7; + * @return whether the dKPLJPHGDMB field is set */ - public boolean hasDKDINDMGEJH() { + public boolean hasDKPLJPHGDMB() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 DKDINDMGEJH = 5; + * optional uint32 DKPLJPHGDMB = 7; * @return this */ - public PlayerRecordInfo clearDKDINDMGEJH() { + public PlayerRecordInfo clearDKPLJPHGDMB() { bitField0_ &= ~0x00000004; - dKDINDMGEJH = 0; + dKPLJPHGDMB = 0; return this; } /** - * optional uint32 DKDINDMGEJH = 5; - * @return the dKDINDMGEJH + * optional uint32 DKPLJPHGDMB = 7; + * @return the dKPLJPHGDMB */ - public int getDKDINDMGEJH() { - return dKDINDMGEJH; + public int getDKPLJPHGDMB() { + return dKPLJPHGDMB; } /** - * optional uint32 DKDINDMGEJH = 5; - * @param value the dKDINDMGEJH to set + * optional uint32 DKPLJPHGDMB = 7; + * @param value the dKPLJPHGDMB to set * @return this */ - public PlayerRecordInfo setDKDINDMGEJH(final int value) { + public PlayerRecordInfo setDKPLJPHGDMB(final int value) { bitField0_ |= 0x00000004; - dKDINDMGEJH = value; + dKPLJPHGDMB = value; return this; } /** - * optional uint32 BFGDPMKBHNB = 6; - * @return whether the bFGDPMKBHNB field is set + * optional uint32 INMEAGINKPN = 8; + * @return whether the iNMEAGINKPN field is set */ - public boolean hasBFGDPMKBHNB() { + public boolean hasINMEAGINKPN() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 BFGDPMKBHNB = 6; + * optional uint32 INMEAGINKPN = 8; * @return this */ - public PlayerRecordInfo clearBFGDPMKBHNB() { + public PlayerRecordInfo clearINMEAGINKPN() { bitField0_ &= ~0x00000008; - bFGDPMKBHNB = 0; + iNMEAGINKPN = 0; return this; } /** - * optional uint32 BFGDPMKBHNB = 6; - * @return the bFGDPMKBHNB + * optional uint32 INMEAGINKPN = 8; + * @return the iNMEAGINKPN */ - public int getBFGDPMKBHNB() { - return bFGDPMKBHNB; + public int getINMEAGINKPN() { + return iNMEAGINKPN; } /** - * optional uint32 BFGDPMKBHNB = 6; - * @param value the bFGDPMKBHNB to set + * optional uint32 INMEAGINKPN = 8; + * @param value the iNMEAGINKPN to set * @return this */ - public PlayerRecordInfo setBFGDPMKBHNB(final int value) { + public PlayerRecordInfo setINMEAGINKPN(final int value) { bitField0_ |= 0x00000008; - bFGDPMKBHNB = value; + iNMEAGINKPN = value; return this; } /** - * optional uint32 JJOHCDLEDMO = 11; - * @return whether the jJOHCDLEDMO field is set + * optional uint32 BIOJHIBFELK = 10; + * @return whether the bIOJHIBFELK field is set */ - public boolean hasJJOHCDLEDMO() { + public boolean hasBIOJHIBFELK() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 JJOHCDLEDMO = 11; + * optional uint32 BIOJHIBFELK = 10; * @return this */ - public PlayerRecordInfo clearJJOHCDLEDMO() { + public PlayerRecordInfo clearBIOJHIBFELK() { bitField0_ &= ~0x00000010; - jJOHCDLEDMO = 0; + bIOJHIBFELK = 0; return this; } /** - * optional uint32 JJOHCDLEDMO = 11; - * @return the jJOHCDLEDMO + * optional uint32 BIOJHIBFELK = 10; + * @return the bIOJHIBFELK */ - public int getJJOHCDLEDMO() { - return jJOHCDLEDMO; + public int getBIOJHIBFELK() { + return bIOJHIBFELK; } /** - * optional uint32 JJOHCDLEDMO = 11; - * @param value the jJOHCDLEDMO to set + * optional uint32 BIOJHIBFELK = 10; + * @param value the bIOJHIBFELK to set * @return this */ - public PlayerRecordInfo setJJOHCDLEDMO(final int value) { + public PlayerRecordInfo setBIOJHIBFELK(final int value) { bitField0_ |= 0x00000010; - jJOHCDLEDMO = value; + bIOJHIBFELK = value; return this; } /** - * optional uint32 EEJCCFCIGDF = 12; - * @return whether the eEJCCFCIGDF field is set + * optional uint32 MFMOAJONBBF = 12; + * @return whether the mFMOAJONBBF field is set */ - public boolean hasEEJCCFCIGDF() { + public boolean hasMFMOAJONBBF() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 EEJCCFCIGDF = 12; + * optional uint32 MFMOAJONBBF = 12; * @return this */ - public PlayerRecordInfo clearEEJCCFCIGDF() { + public PlayerRecordInfo clearMFMOAJONBBF() { bitField0_ &= ~0x00000020; - eEJCCFCIGDF = 0; + mFMOAJONBBF = 0; return this; } /** - * optional uint32 EEJCCFCIGDF = 12; - * @return the eEJCCFCIGDF + * optional uint32 MFMOAJONBBF = 12; + * @return the mFMOAJONBBF */ - public int getEEJCCFCIGDF() { - return eEJCCFCIGDF; + public int getMFMOAJONBBF() { + return mFMOAJONBBF; } /** - * optional uint32 EEJCCFCIGDF = 12; - * @param value the eEJCCFCIGDF to set + * optional uint32 MFMOAJONBBF = 12; + * @param value the mFMOAJONBBF to set * @return this */ - public PlayerRecordInfo setEEJCCFCIGDF(final int value) { + public PlayerRecordInfo setMFMOAJONBBF(final int value) { bitField0_ |= 0x00000020; - eEJCCFCIGDF = value; + mFMOAJONBBF = value; return this; } /** - * optional uint32 PNIAMOINNJF = 13; - * @return whether the pNIAMOINNJF field is set + * optional uint32 HNICFKBEKJO = 14; + * @return whether the hNICFKBEKJO field is set */ - public boolean hasPNIAMOINNJF() { + public boolean hasHNICFKBEKJO() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 PNIAMOINNJF = 13; + * optional uint32 HNICFKBEKJO = 14; * @return this */ - public PlayerRecordInfo clearPNIAMOINNJF() { + public PlayerRecordInfo clearHNICFKBEKJO() { bitField0_ &= ~0x00000040; - pNIAMOINNJF = 0; + hNICFKBEKJO = 0; return this; } /** - * optional uint32 PNIAMOINNJF = 13; - * @return the pNIAMOINNJF + * optional uint32 HNICFKBEKJO = 14; + * @return the hNICFKBEKJO */ - public int getPNIAMOINNJF() { - return pNIAMOINNJF; + public int getHNICFKBEKJO() { + return hNICFKBEKJO; } /** - * optional uint32 PNIAMOINNJF = 13; - * @param value the pNIAMOINNJF to set + * optional uint32 HNICFKBEKJO = 14; + * @param value the hNICFKBEKJO to set * @return this */ - public PlayerRecordInfo setPNIAMOINNJF(final int value) { + public PlayerRecordInfo setHNICFKBEKJO(final int value) { bitField0_ |= 0x00000040; - pNIAMOINNJF = value; + hNICFKBEKJO = value; return this; } /** - * optional uint32 IPOCLBEJIAF = 14; - * @return whether the iPOCLBEJIAF field is set + * optional uint32 OOIOMMKOIAE = 15; + * @return whether the oOIOMMKOIAE field is set */ - public boolean hasIPOCLBEJIAF() { + public boolean hasOOIOMMKOIAE() { return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 IPOCLBEJIAF = 14; + * optional uint32 OOIOMMKOIAE = 15; * @return this */ - public PlayerRecordInfo clearIPOCLBEJIAF() { + public PlayerRecordInfo clearOOIOMMKOIAE() { bitField0_ &= ~0x00000080; - iPOCLBEJIAF = 0; + oOIOMMKOIAE = 0; return this; } /** - * optional uint32 IPOCLBEJIAF = 14; - * @return the iPOCLBEJIAF + * optional uint32 OOIOMMKOIAE = 15; + * @return the oOIOMMKOIAE */ - public int getIPOCLBEJIAF() { - return iPOCLBEJIAF; + public int getOOIOMMKOIAE() { + return oOIOMMKOIAE; } /** - * optional uint32 IPOCLBEJIAF = 14; - * @param value the iPOCLBEJIAF to set + * optional uint32 OOIOMMKOIAE = 15; + * @param value the oOIOMMKOIAE to set * @return this */ - public PlayerRecordInfo setIPOCLBEJIAF(final int value) { + public PlayerRecordInfo setOOIOMMKOIAE(final int value) { bitField0_ |= 0x00000080; - iPOCLBEJIAF = value; + oOIOMMKOIAE = value; return this; } /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_info = 2; * @return whether the collectionInfo field is set */ public boolean hasCollectionInfo() { @@ -378,7 +378,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_info = 2; * @return this */ public PlayerRecordInfo clearCollectionInfo() { @@ -388,7 +388,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_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. @@ -402,7 +402,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_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 @@ -416,7 +416,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 7; + * optional .PlayerCollectionInfo collection_info = 2; * @param value the collectionInfo to set * @return this */ @@ -432,14 +432,14 @@ public final class PlayerRecordInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lAAOICJFOPI = other.lAAOICJFOPI; - pDHAFOAOMPB = other.pDHAFOAOMPB; - dKDINDMGEJH = other.dKDINDMGEJH; - bFGDPMKBHNB = other.bFGDPMKBHNB; - jJOHCDLEDMO = other.jJOHCDLEDMO; - eEJCCFCIGDF = other.eEJCCFCIGDF; - pNIAMOINNJF = other.pNIAMOINNJF; - iPOCLBEJIAF = other.iPOCLBEJIAF; + cPIKKMDOKHA = other.cPIKKMDOKHA; + mGDIMDLPOGA = other.mGDIMDLPOGA; + dKPLJPHGDMB = other.dKPLJPHGDMB; + iNMEAGINKPN = other.iNMEAGINKPN; + bIOJHIBFELK = other.bIOJHIBFELK; + mFMOAJONBBF = other.mFMOAJONBBF; + hNICFKBEKJO = other.hNICFKBEKJO; + oOIOMMKOIAE = other.oOIOMMKOIAE; collectionInfo.copyFrom(other.collectionInfo); } return this; @@ -451,29 +451,29 @@ public final class PlayerRecordInfoOuterClass { return this; } cachedSize = -1; - if (other.hasLAAOICJFOPI()) { - setLAAOICJFOPI(other.lAAOICJFOPI); + if (other.hasCPIKKMDOKHA()) { + setCPIKKMDOKHA(other.cPIKKMDOKHA); } - if (other.hasPDHAFOAOMPB()) { - setPDHAFOAOMPB(other.pDHAFOAOMPB); + if (other.hasMGDIMDLPOGA()) { + setMGDIMDLPOGA(other.mGDIMDLPOGA); } - if (other.hasDKDINDMGEJH()) { - setDKDINDMGEJH(other.dKDINDMGEJH); + if (other.hasDKPLJPHGDMB()) { + setDKPLJPHGDMB(other.dKPLJPHGDMB); } - if (other.hasBFGDPMKBHNB()) { - setBFGDPMKBHNB(other.bFGDPMKBHNB); + if (other.hasINMEAGINKPN()) { + setINMEAGINKPN(other.iNMEAGINKPN); } - if (other.hasJJOHCDLEDMO()) { - setJJOHCDLEDMO(other.jJOHCDLEDMO); + if (other.hasBIOJHIBFELK()) { + setBIOJHIBFELK(other.bIOJHIBFELK); } - if (other.hasEEJCCFCIGDF()) { - setEEJCCFCIGDF(other.eEJCCFCIGDF); + if (other.hasMFMOAJONBBF()) { + setMFMOAJONBBF(other.mFMOAJONBBF); } - if (other.hasPNIAMOINNJF()) { - setPNIAMOINNJF(other.pNIAMOINNJF); + if (other.hasHNICFKBEKJO()) { + setHNICFKBEKJO(other.hNICFKBEKJO); } - if (other.hasIPOCLBEJIAF()) { - setIPOCLBEJIAF(other.iPOCLBEJIAF); + if (other.hasOOIOMMKOIAE()) { + setOOIOMMKOIAE(other.oOIOMMKOIAE); } if (other.hasCollectionInfo()) { getMutableCollectionInfo().mergeFrom(other.collectionInfo); @@ -488,14 +488,14 @@ public final class PlayerRecordInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - lAAOICJFOPI = 0; - pDHAFOAOMPB = 0; - dKDINDMGEJH = 0; - bFGDPMKBHNB = 0; - jJOHCDLEDMO = 0; - eEJCCFCIGDF = 0; - pNIAMOINNJF = 0; - iPOCLBEJIAF = 0; + cPIKKMDOKHA = 0; + mGDIMDLPOGA = 0; + dKPLJPHGDMB = 0; + iNMEAGINKPN = 0; + bIOJHIBFELK = 0; + mFMOAJONBBF = 0; + hNICFKBEKJO = 0; + oOIOMMKOIAE = 0; collectionInfo.clear(); return this; } @@ -521,53 +521,53 @@ public final class PlayerRecordInfoOuterClass { } PlayerRecordInfo other = (PlayerRecordInfo) o; return bitField0_ == other.bitField0_ - && (!hasLAAOICJFOPI() || lAAOICJFOPI == other.lAAOICJFOPI) - && (!hasPDHAFOAOMPB() || pDHAFOAOMPB == other.pDHAFOAOMPB) - && (!hasDKDINDMGEJH() || dKDINDMGEJH == other.dKDINDMGEJH) - && (!hasBFGDPMKBHNB() || bFGDPMKBHNB == other.bFGDPMKBHNB) - && (!hasJJOHCDLEDMO() || jJOHCDLEDMO == other.jJOHCDLEDMO) - && (!hasEEJCCFCIGDF() || eEJCCFCIGDF == other.eEJCCFCIGDF) - && (!hasPNIAMOINNJF() || pNIAMOINNJF == other.pNIAMOINNJF) - && (!hasIPOCLBEJIAF() || iPOCLBEJIAF == other.iPOCLBEJIAF) + && (!hasCPIKKMDOKHA() || cPIKKMDOKHA == other.cPIKKMDOKHA) + && (!hasMGDIMDLPOGA() || mGDIMDLPOGA == other.mGDIMDLPOGA) + && (!hasDKPLJPHGDMB() || dKPLJPHGDMB == other.dKPLJPHGDMB) + && (!hasINMEAGINKPN() || iNMEAGINKPN == other.iNMEAGINKPN) + && (!hasBIOJHIBFELK() || bIOJHIBFELK == other.bIOJHIBFELK) + && (!hasMFMOAJONBBF() || mFMOAJONBBF == other.mFMOAJONBBF) + && (!hasHNICFKBEKJO() || hNICFKBEKJO == other.hNICFKBEKJO) + && (!hasOOIOMMKOIAE() || oOIOMMKOIAE == other.oOIOMMKOIAE) && (!hasCollectionInfo() || collectionInfo.equals(other.collectionInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(lAAOICJFOPI); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(cPIKKMDOKHA); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(pDHAFOAOMPB); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(mGDIMDLPOGA); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(dKDINDMGEJH); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(dKPLJPHGDMB); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(bFGDPMKBHNB); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(iNMEAGINKPN); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(jJOHCDLEDMO); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(bIOJHIBFELK); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(eEJCCFCIGDF); + output.writeUInt32NoTag(mFMOAJONBBF); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(pNIAMOINNJF); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(hNICFKBEKJO); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(iPOCLBEJIAF); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(oOIOMMKOIAE); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeMessageNoTag(collectionInfo); } } @@ -576,28 +576,28 @@ public final class PlayerRecordInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lAAOICJFOPI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cPIKKMDOKHA); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pDHAFOAOMPB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mGDIMDLPOGA); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dKDINDMGEJH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dKPLJPHGDMB); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(bFGDPMKBHNB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(iNMEAGINKPN); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jJOHCDLEDMO); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bIOJHIBFELK); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eEJCCFCIGDF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mFMOAJONBBF); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pNIAMOINNJF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(hNICFKBEKJO); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iPOCLBEJIAF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oOIOMMKOIAE); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(collectionInfo); @@ -612,45 +612,45 @@ public final class PlayerRecordInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // lAAOICJFOPI - lAAOICJFOPI = input.readUInt32(); + case 24: { + // cPIKKMDOKHA + cPIKKMDOKHA = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { - // pDHAFOAOMPB - pDHAFOAOMPB = input.readUInt32(); + case 32: { + // mGDIMDLPOGA + mGDIMDLPOGA = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // dKDINDMGEJH - dKDINDMGEJH = input.readUInt32(); + case 56: { + // dKPLJPHGDMB + dKPLJPHGDMB = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { - // bFGDPMKBHNB - bFGDPMKBHNB = input.readUInt32(); + case 64: { + // iNMEAGINKPN + iNMEAGINKPN = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { - // jJOHCDLEDMO - jJOHCDLEDMO = input.readUInt32(); + case 80: { + // bIOJHIBFELK + bIOJHIBFELK = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 96) { @@ -658,33 +658,33 @@ public final class PlayerRecordInfoOuterClass { } } case 96: { - // eEJCCFCIGDF - eEJCCFCIGDF = input.readUInt32(); + // mFMOAJONBBF + mFMOAJONBBF = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // pNIAMOINNJF - pNIAMOINNJF = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); if (tag != 112) { break; } } case 112: { - // iPOCLBEJIAF - iPOCLBEJIAF = input.readUInt32(); - bitField0_ |= 0x00000080; + // hNICFKBEKJO + hNICFKBEKJO = input.readUInt32(); + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 58) { + if (tag != 120) { break; } } - case 58: { + case 120: { + // oOIOMMKOIAE + oOIOMMKOIAE = input.readUInt32(); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // collectionInfo input.readMessage(collectionInfo); bitField0_ |= 0x00000100; @@ -711,28 +711,28 @@ public final class PlayerRecordInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.lAAOICJFOPI, lAAOICJFOPI); + output.writeUInt32(FieldNames.cPIKKMDOKHA, cPIKKMDOKHA); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.pDHAFOAOMPB, pDHAFOAOMPB); + output.writeUInt32(FieldNames.mGDIMDLPOGA, mGDIMDLPOGA); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.dKDINDMGEJH, dKDINDMGEJH); + output.writeUInt32(FieldNames.dKPLJPHGDMB, dKPLJPHGDMB); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.bFGDPMKBHNB, bFGDPMKBHNB); + output.writeUInt32(FieldNames.iNMEAGINKPN, iNMEAGINKPN); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.jJOHCDLEDMO, jJOHCDLEDMO); + output.writeUInt32(FieldNames.bIOJHIBFELK, bIOJHIBFELK); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.eEJCCFCIGDF, eEJCCFCIGDF); + output.writeUInt32(FieldNames.mFMOAJONBBF, mFMOAJONBBF); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.pNIAMOINNJF, pNIAMOINNJF); + output.writeUInt32(FieldNames.hNICFKBEKJO, hNICFKBEKJO); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.iPOCLBEJIAF, iPOCLBEJIAF); + output.writeUInt32(FieldNames.oOIOMMKOIAE, oOIOMMKOIAE); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.collectionInfo, collectionInfo); @@ -747,10 +747,10 @@ public final class PlayerRecordInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2056730927: { - if (input.isAtField(FieldNames.lAAOICJFOPI)) { + case 201702600: { + if (input.isAtField(FieldNames.cPIKKMDOKHA)) { if (!input.trySkipNullValue()) { - lAAOICJFOPI = input.readUInt32(); + cPIKKMDOKHA = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -758,10 +758,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case 2145492571: { - if (input.isAtField(FieldNames.pDHAFOAOMPB)) { + case -332836433: { + if (input.isAtField(FieldNames.mGDIMDLPOGA)) { if (!input.trySkipNullValue()) { - pDHAFOAOMPB = input.readUInt32(); + mGDIMDLPOGA = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -769,10 +769,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -1238047833: { - if (input.isAtField(FieldNames.dKDINDMGEJH)) { + case 564682705: { + if (input.isAtField(FieldNames.dKPLJPHGDMB)) { if (!input.trySkipNullValue()) { - dKDINDMGEJH = input.readUInt32(); + dKPLJPHGDMB = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -780,10 +780,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -177381337: { - if (input.isAtField(FieldNames.bFGDPMKBHNB)) { + case 1738823617: { + if (input.isAtField(FieldNames.iNMEAGINKPN)) { if (!input.trySkipNullValue()) { - bFGDPMKBHNB = input.readUInt32(); + iNMEAGINKPN = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -791,10 +791,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -261903405: { - if (input.isAtField(FieldNames.jJOHCDLEDMO)) { + case 892464829: { + if (input.isAtField(FieldNames.bIOJHIBFELK)) { if (!input.trySkipNullValue()) { - jJOHCDLEDMO = input.readUInt32(); + bIOJHIBFELK = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -802,10 +802,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case 1487775335: { - if (input.isAtField(FieldNames.eEJCCFCIGDF)) { + case 757747171: { + if (input.isAtField(FieldNames.mFMOAJONBBF)) { if (!input.trySkipNullValue()) { - eEJCCFCIGDF = input.readUInt32(); + mFMOAJONBBF = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -813,10 +813,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case 297820685: { - if (input.isAtField(FieldNames.pNIAMOINNJF)) { + case -1059627672: { + if (input.isAtField(FieldNames.hNICFKBEKJO)) { if (!input.trySkipNullValue()) { - pNIAMOINNJF = input.readUInt32(); + hNICFKBEKJO = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -824,10 +824,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -434121192: { - if (input.isAtField(FieldNames.iPOCLBEJIAF)) { + case 472412899: { + if (input.isAtField(FieldNames.oOIOMMKOIAE)) { if (!input.trySkipNullValue()) { - iPOCLBEJIAF = input.readUInt32(); + oOIOMMKOIAE = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -900,21 +900,21 @@ public final class PlayerRecordInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName lAAOICJFOPI = FieldName.forField("LAAOICJFOPI"); + static final FieldName cPIKKMDOKHA = FieldName.forField("CPIKKMDOKHA"); - static final FieldName pDHAFOAOMPB = FieldName.forField("PDHAFOAOMPB"); + static final FieldName mGDIMDLPOGA = FieldName.forField("MGDIMDLPOGA"); - static final FieldName dKDINDMGEJH = FieldName.forField("DKDINDMGEJH"); + static final FieldName dKPLJPHGDMB = FieldName.forField("DKPLJPHGDMB"); - static final FieldName bFGDPMKBHNB = FieldName.forField("BFGDPMKBHNB"); + static final FieldName iNMEAGINKPN = FieldName.forField("INMEAGINKPN"); - static final FieldName jJOHCDLEDMO = FieldName.forField("JJOHCDLEDMO"); + static final FieldName bIOJHIBFELK = FieldName.forField("BIOJHIBFELK"); - static final FieldName eEJCCFCIGDF = FieldName.forField("EEJCCFCIGDF"); + static final FieldName mFMOAJONBBF = FieldName.forField("MFMOAJONBBF"); - static final FieldName pNIAMOINNJF = FieldName.forField("PNIAMOINNJF"); + static final FieldName hNICFKBEKJO = FieldName.forField("HNICFKBEKJO"); - static final FieldName iPOCLBEJIAF = FieldName.forField("IPOCLBEJIAF"); + static final FieldName oOIOMMKOIAE = FieldName.forField("OOIOMMKOIAE"); static final FieldName collectionInfo = FieldName.forField("collectionInfo", "collection_info"); } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java index 4c68af8..a9d396a 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerSyncScNotifyOuterClass.java @@ -21,60 +21,60 @@ public final class PlayerSyncScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 total_achievement_exp = 1725; + * optional uint32 total_achievement_exp = 552; */ private int totalAchievementExp; /** - * optional .PlayerBasicInfo basic_info = 4; - */ - private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); - - /** - * optional .AvatarSync avatar_sync = 5; + * optional .AvatarSync avatar_sync = 9; */ private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); /** - * optional .MissionSync mission_sync = 9; + * optional .PlayerBasicInfo basic_info = 11; + */ + private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); + + /** + * optional .MissionSync mission_sync = 12; */ private final MissionSyncOuterClass.MissionSync missionSync = MissionSyncOuterClass.MissionSync.newInstance(); /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; */ private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance(); /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_list = 4; */ private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_list = 14; */ private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 2; - */ - private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); - - /** - * repeated .Equipment equipment_list = 3; - */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); - - /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_list = 1; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 3; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + /** + * repeated .Equipment equipment_list = 6; + */ + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + */ + private final RepeatedMessage multiPathAvatarInfoList = RepeatedMessage.newEmptyInstance(MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo.getFactory()); + private PlayerSyncScNotify() { } @@ -86,7 +86,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1725; + * optional uint32 total_achievement_exp = 552; * @return whether the totalAchievementExp field is set */ public boolean hasTotalAchievementExp() { @@ -94,7 +94,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1725; + * optional uint32 total_achievement_exp = 552; * @return this */ public PlayerSyncScNotify clearTotalAchievementExp() { @@ -104,7 +104,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1725; + * optional uint32 total_achievement_exp = 552; * @return the totalAchievementExp */ public int getTotalAchievementExp() { @@ -112,7 +112,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1725; + * optional uint32 total_achievement_exp = 552; * @param value the totalAchievementExp to set * @return this */ @@ -123,82 +123,25 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 4; - * @return whether the basicInfo field is set + * optional .AvatarSync avatar_sync = 9; + * @return whether the avatarSync field is set */ - public boolean hasBasicInfo() { + public boolean hasAvatarSync() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .PlayerBasicInfo basic_info = 4; - * @return this - */ - public PlayerSyncScNotify clearBasicInfo() { - bitField0_ &= ~0x00000002; - basicInfo.clear(); - return this; - } - - /** - * optional .PlayerBasicInfo basic_info = 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 #getMutableBasicInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public PlayerBasicInfoOuterClass.PlayerBasicInfo getBasicInfo() { - return basicInfo; - } - - /** - * optional .PlayerBasicInfo basic_info = 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 PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { - bitField0_ |= 0x00000002; - return basicInfo; - } - - /** - * optional .PlayerBasicInfo basic_info = 4; - * @param value the basicInfo to set - * @return this - */ - public PlayerSyncScNotify setBasicInfo(final PlayerBasicInfoOuterClass.PlayerBasicInfo value) { - bitField0_ |= 0x00000002; - basicInfo.copyFrom(value); - return this; - } - - /** - * optional .AvatarSync avatar_sync = 5; - * @return whether the avatarSync field is set - */ - public boolean hasAvatarSync() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .AvatarSync avatar_sync = 5; + * optional .AvatarSync avatar_sync = 9; * @return this */ public PlayerSyncScNotify clearAvatarSync() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; avatarSync.clear(); return this; } /** - * optional .AvatarSync avatar_sync = 5; + * optional .AvatarSync avatar_sync = 9; * * 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. @@ -212,7 +155,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 5; + * optional .AvatarSync avatar_sync = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -221,23 +164,80 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return avatarSync; } /** - * optional .AvatarSync avatar_sync = 5; + * optional .AvatarSync avatar_sync = 9; * @param value the avatarSync to set * @return this */ public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; avatarSync.copyFrom(value); return this; } /** - * optional .MissionSync mission_sync = 9; + * optional .PlayerBasicInfo basic_info = 11; + * @return whether the basicInfo field is set + */ + public boolean hasBasicInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .PlayerBasicInfo basic_info = 11; + * @return this + */ + public PlayerSyncScNotify clearBasicInfo() { + bitField0_ &= ~0x00000004; + basicInfo.clear(); + return this; + } + + /** + * optional .PlayerBasicInfo basic_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 #getMutableBasicInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public PlayerBasicInfoOuterClass.PlayerBasicInfo getBasicInfo() { + return basicInfo; + } + + /** + * optional .PlayerBasicInfo basic_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { + bitField0_ |= 0x00000004; + return basicInfo; + } + + /** + * optional .PlayerBasicInfo basic_info = 11; + * @param value the basicInfo to set + * @return this + */ + public PlayerSyncScNotify setBasicInfo(final PlayerBasicInfoOuterClass.PlayerBasicInfo value) { + bitField0_ |= 0x00000004; + basicInfo.copyFrom(value); + return this; + } + + /** + * optional .MissionSync mission_sync = 12; * @return whether the missionSync field is set */ public boolean hasMissionSync() { @@ -245,7 +245,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 9; + * optional .MissionSync mission_sync = 12; * @return this */ public PlayerSyncScNotify clearMissionSync() { @@ -255,7 +255,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 9; + * optional .MissionSync mission_sync = 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. @@ -269,7 +269,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 9; + * optional .MissionSync mission_sync = 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 @@ -283,7 +283,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 9; + * optional .MissionSync mission_sync = 12; * @param value the missionSync to set * @return this */ @@ -294,7 +294,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; * @return whether the boardDataSync field is set */ public boolean hasBoardDataSync() { @@ -302,7 +302,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; * @return this */ public PlayerSyncScNotify clearBoardDataSync() { @@ -312,7 +312,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; * * 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. @@ -326,7 +326,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -340,7 +340,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1665; + * optional .BoardDataSync board_data_sync = 1569; * @param value the boardDataSync to set * @return this */ @@ -351,7 +351,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_list = 4; * @return whether the delEquipmentList field is set */ public boolean hasDelEquipmentList() { @@ -359,7 +359,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_list = 4; * @return this */ public PlayerSyncScNotify clearDelEquipmentList() { @@ -369,7 +369,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_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. @@ -383,7 +383,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_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 @@ -397,7 +397,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_list = 4; * @param value the delEquipmentList to add * @return this */ @@ -408,7 +408,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 1; + * repeated uint32 del_equipment_list = 4; * @param values the delEquipmentList to add * @return this */ @@ -419,7 +419,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_list = 14; * @return whether the delRelicList field is set */ public boolean hasDelRelicList() { @@ -427,7 +427,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_list = 14; * @return this */ public PlayerSyncScNotify clearDelRelicList() { @@ -437,7 +437,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_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. @@ -451,7 +451,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_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 @@ -465,7 +465,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_list = 14; * @param value the delRelicList to add * @return this */ @@ -476,7 +476,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 13; + * repeated uint32 del_relic_list = 14; * @param values the delRelicList to add * @return this */ @@ -487,164 +487,25 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 2; - * @return whether the basicTypeInfoList field is set + * repeated .Relic relic_list = 1; + * @return whether the relicList field is set */ - public boolean hasBasicTypeInfoList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 2; - * @return this - */ - public PlayerSyncScNotify clearBasicTypeInfoList() { - bitField0_ &= ~0x00000080; - basicTypeInfoList.clear(); - return this; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 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 #getMutableBasicTypeInfoList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBasicTypeInfoList() { - return basicTypeInfoList; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 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 RepeatedMessage getMutableBasicTypeInfoList( - ) { - bitField0_ |= 0x00000080; - return basicTypeInfoList; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 2; - * @param value the basicTypeInfoList to add - * @return this - */ - public PlayerSyncScNotify addBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { - bitField0_ |= 0x00000080; - basicTypeInfoList.add(value); - return this; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 2; - * @param values the basicTypeInfoList to add - * @return this - */ - public PlayerSyncScNotify addAllBasicTypeInfoList( - final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { - bitField0_ |= 0x00000080; - basicTypeInfoList.addAll(values); - return this; - } - - /** - * repeated .Equipment equipment_list = 3; - * @return whether the equipmentList field is set - */ - public boolean hasEquipmentList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .Equipment equipment_list = 3; - * @return this - */ - public PlayerSyncScNotify clearEquipmentList() { - bitField0_ &= ~0x00000100; - equipmentList.clear(); - return this; - } - - /** - * repeated .Equipment equipment_list = 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 #getMutableEquipmentList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipmentList() { - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 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 RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000100; - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 3; - * @param value the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000100; - equipmentList.add(value); - return this; - } - - /** - * repeated .Equipment equipment_list = 3; - * @param values the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000100; - equipmentList.addAll(values); - return this; - } - - /** - * repeated .Relic relic_list = 6; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_list = 1; * @return this */ public PlayerSyncScNotify clearRelicList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; relicList.clear(); return this; } /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_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. @@ -658,7 +519,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_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 @@ -667,52 +528,52 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return relicList; } /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_list = 1; * @param value the relicList to add * @return this */ public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; relicList.add(value); return this; } /** - * repeated .Relic relic_list = 6; + * repeated .Relic relic_list = 1; * @param values the relicList to add * @return this */ public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; relicList.addAll(values); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 3; * @return whether the materialList field is set */ public boolean hasMaterialList() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 3; * @return this */ public PlayerSyncScNotify clearMaterialList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000100; materialList.clear(); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 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. @@ -726,7 +587,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 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 @@ -735,48 +596,188 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMaterialList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000100; return materialList; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 3; * @param value the materialList to add * @return this */ public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000100; materialList.add(value); return this; } /** - * repeated .Material material_list = 14; + * repeated .Material material_list = 3; * @param values the materialList to add * @return this */ public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000100; materialList.addAll(values); return this; } + /** + * repeated .Equipment equipment_list = 6; + * @return whether the equipmentList field is set + */ + public boolean hasEquipmentList() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .Equipment equipment_list = 6; + * @return this + */ + public PlayerSyncScNotify clearEquipmentList() { + bitField0_ &= ~0x00000200; + equipmentList.clear(); + return this; + } + + /** + * repeated .Equipment equipment_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 #getMutableEquipmentList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getEquipmentList() { + return equipmentList; + } + + /** + * repeated .Equipment equipment_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 getMutableEquipmentList() { + bitField0_ |= 0x00000200; + return equipmentList; + } + + /** + * repeated .Equipment equipment_list = 6; + * @param value the equipmentList to add + * @return this + */ + public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { + bitField0_ |= 0x00000200; + equipmentList.add(value); + return this; + } + + /** + * repeated .Equipment equipment_list = 6; + * @param values the equipmentList to add + * @return this + */ + public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { + bitField0_ |= 0x00000200; + equipmentList.addAll(values); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * @return whether the multiPathAvatarInfoList field is set + */ + public boolean hasMultiPathAvatarInfoList() { + return (bitField0_ & 0x00000400) != 0; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * @return this + */ + public PlayerSyncScNotify clearMultiPathAvatarInfoList() { + bitField0_ &= ~0x00000400; + multiPathAvatarInfoList.clear(); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * + * 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 #getMutableMultiPathAvatarInfoList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMultiPathAvatarInfoList( + ) { + return multiPathAvatarInfoList; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * + * 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 getMutableMultiPathAvatarInfoList( + ) { + bitField0_ |= 0x00000400; + return multiPathAvatarInfoList; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * @param value the multiPathAvatarInfoList to add + * @return this + */ + public PlayerSyncScNotify addMultiPathAvatarInfoList( + final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo value) { + bitField0_ |= 0x00000400; + multiPathAvatarInfoList.add(value); + return this; + } + + /** + * repeated .MultiPathAvatarInfo multi_path_avatar_info_list = 1767; + * @param values the multiPathAvatarInfoList to add + * @return this + */ + public PlayerSyncScNotify addAllMultiPathAvatarInfoList( + final MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo... values) { + bitField0_ |= 0x00000400; + multiPathAvatarInfoList.addAll(values); + return this; + } + @Override public PlayerSyncScNotify copyFrom(final PlayerSyncScNotify other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; totalAchievementExp = other.totalAchievementExp; - basicInfo.copyFrom(other.basicInfo); avatarSync.copyFrom(other.avatarSync); + basicInfo.copyFrom(other.basicInfo); missionSync.copyFrom(other.missionSync); boardDataSync.copyFrom(other.boardDataSync); delEquipmentList.copyFrom(other.delEquipmentList); delRelicList.copyFrom(other.delRelicList); - basicTypeInfoList.copyFrom(other.basicTypeInfoList); - equipmentList.copyFrom(other.equipmentList); relicList.copyFrom(other.relicList); materialList.copyFrom(other.materialList); + equipmentList.copyFrom(other.equipmentList); + multiPathAvatarInfoList.copyFrom(other.multiPathAvatarInfoList); } return this; } @@ -790,12 +791,12 @@ public final class PlayerSyncScNotifyOuterClass { if (other.hasTotalAchievementExp()) { setTotalAchievementExp(other.totalAchievementExp); } - if (other.hasBasicInfo()) { - getMutableBasicInfo().mergeFrom(other.basicInfo); - } if (other.hasAvatarSync()) { getMutableAvatarSync().mergeFrom(other.avatarSync); } + if (other.hasBasicInfo()) { + getMutableBasicInfo().mergeFrom(other.basicInfo); + } if (other.hasMissionSync()) { getMutableMissionSync().mergeFrom(other.missionSync); } @@ -808,18 +809,18 @@ public final class PlayerSyncScNotifyOuterClass { if (other.hasDelRelicList()) { getMutableDelRelicList().addAll(other.delRelicList); } - if (other.hasBasicTypeInfoList()) { - getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); - } - if (other.hasEquipmentList()) { - getMutableEquipmentList().addAll(other.equipmentList); - } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } if (other.hasMaterialList()) { getMutableMaterialList().addAll(other.materialList); } + if (other.hasEquipmentList()) { + getMutableEquipmentList().addAll(other.equipmentList); + } + if (other.hasMultiPathAvatarInfoList()) { + getMutableMultiPathAvatarInfoList().addAll(other.multiPathAvatarInfoList); + } return this; } @@ -831,16 +832,16 @@ public final class PlayerSyncScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; totalAchievementExp = 0; - basicInfo.clear(); avatarSync.clear(); + basicInfo.clear(); missionSync.clear(); boardDataSync.clear(); delEquipmentList.clear(); delRelicList.clear(); - basicTypeInfoList.clear(); - equipmentList.clear(); relicList.clear(); materialList.clear(); + equipmentList.clear(); + multiPathAvatarInfoList.clear(); return this; } @@ -851,16 +852,16 @@ public final class PlayerSyncScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - basicInfo.clearQuick(); avatarSync.clearQuick(); + basicInfo.clearQuick(); missionSync.clearQuick(); boardDataSync.clearQuick(); delEquipmentList.clear(); delRelicList.clear(); - basicTypeInfoList.clearQuick(); - equipmentList.clearQuick(); relicList.clearQuick(); materialList.clearQuick(); + equipmentList.clearQuick(); + multiPathAvatarInfoList.clearQuick(); return this; } @@ -875,76 +876,76 @@ public final class PlayerSyncScNotifyOuterClass { PlayerSyncScNotify other = (PlayerSyncScNotify) o; return bitField0_ == other.bitField0_ && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) - && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) && (!hasAvatarSync() || avatarSync.equals(other.avatarSync)) + && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) && (!hasMissionSync() || missionSync.equals(other.missionSync)) && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync)) && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) - && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasMaterialList() || materialList.equals(other.materialList)); + && (!hasMaterialList() || materialList.equals(other.materialList)) + && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) + && (!hasMultiPathAvatarInfoList() || multiPathAvatarInfoList.equals(other.multiPathAvatarInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 27624); + output.writeRawLittleEndian16((short) 8896); output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(basicInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(avatarSync); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(basicInfo); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 98); output.writeMessageNoTag(missionSync); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 26762); + output.writeRawLittleEndian16((short) 25226); output.writeMessageNoTag(boardDataSync); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < delEquipmentList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(delEquipmentList.array()[i]); } } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < delRelicList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(delRelicList.array()[i]); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(basicTypeInfoList.get(i)); - } - } - if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(equipmentList.get(i)); - } - } - if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(relicList.get(i)); } } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 26); output.writeMessageNoTag(materialList.get(i)); } } + if ((bitField0_ & 0x00000200) != 0) { + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(equipmentList.get(i)); + } + } + if ((bitField0_ & 0x00000400) != 0) { + for (int i = 0; i < multiPathAvatarInfoList.length(); i++) { + output.writeRawLittleEndian16((short) 28346); + output.writeMessageNoTag(multiPathAvatarInfoList.get(i)); + } + } } @Override @@ -954,10 +955,10 @@ public final class PlayerSyncScNotifyOuterClass { size += 2 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); + size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(missionSync); @@ -972,17 +973,17 @@ public final class PlayerSyncScNotifyOuterClass { size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); - } - if ((bitField0_ & 0x00000100) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); - } - if ((bitField0_ & 0x00000200) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } + if ((bitField0_ & 0x00000200) != 0) { + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); + } + if ((bitField0_ & 0x00000400) != 0) { + size += (2 * multiPathAvatarInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(multiPathAvatarInfoList); + } return size; } @@ -993,96 +994,96 @@ public final class PlayerSyncScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 13800: { + case 4416: { // totalAchievementExp totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // basicInfo - input.readMessage(basicInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // avatarSync - input.readMessage(avatarSync); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 74) { break; } } case 74: { + // avatarSync + input.readMessage(avatarSync); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { + // basicInfo + input.readMessage(basicInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // missionSync input.readMessage(missionSync); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 13322) { + if (tag != 12554) { break; } } - case 13322: { + case 12554: { // boardDataSync input.readMessage(boardDataSync); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // delEquipmentList [packed=true] + input.readPackedUInt32(delEquipmentList, tag); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // delRelicList [packed=true] + input.readPackedUInt32(delRelicList, tag); + bitField0_ |= 0x00000040; + tag = input.readTag(); if (tag != 10) { break; } } case 10: { - // delEquipmentList [packed=true] - input.readPackedUInt32(delEquipmentList, tag); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // delRelicList [packed=true] - input.readPackedUInt32(delRelicList, tag); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // basicTypeInfoList - tag = input.readRepeatedMessage(basicTypeInfoList, tag); + // relicList + tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000080; if (tag != 26) { break; } } case 26: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000100; if (tag != 50) { break; } } case 50: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); bitField0_ |= 0x00000200; - if (tag != 114) { + if (tag != 14138) { break; } } - case 114: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); + case 14138: { + // multiPathAvatarInfoList + tag = input.readRepeatedMessage(multiPathAvatarInfoList, tag); bitField0_ |= 0x00000400; if (tag != 0) { break; @@ -1098,13 +1099,13 @@ public final class PlayerSyncScNotifyOuterClass { tag = input.readTag(); break; } - case 8: { + case 32: { // delEquipmentList [packed=false] tag = input.readRepeatedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000020; break; } - case 104: { + case 112: { // delRelicList [packed=false] tag = input.readRepeatedUInt32(delRelicList, tag); bitField0_ |= 0x00000040; @@ -1121,10 +1122,10 @@ public final class PlayerSyncScNotifyOuterClass { output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.basicInfo, basicInfo); + output.writeMessage(FieldNames.avatarSync, avatarSync); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.avatarSync, avatarSync); + output.writeMessage(FieldNames.basicInfo, basicInfo); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.missionSync, missionSync); @@ -1139,17 +1140,17 @@ public final class PlayerSyncScNotifyOuterClass { output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); - } - if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.materialList, materialList); } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRepeatedMessage(FieldNames.multiPathAvatarInfoList, multiPathAvatarInfoList); + } output.endObject(); } @@ -1172,11 +1173,11 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case -1699486212: - case -1124288993: { - if (input.isAtField(FieldNames.basicInfo)) { + case -403178604: + case 397279681: { + if (input.isAtField(FieldNames.avatarSync)) { if (!input.trySkipNullValue()) { - input.readMessage(basicInfo); + input.readMessage(avatarSync); bitField0_ |= 0x00000002; } } else { @@ -1184,11 +1185,11 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case -403178604: - case 397279681: { - if (input.isAtField(FieldNames.avatarSync)) { + case -1699486212: + case -1124288993: { + if (input.isAtField(FieldNames.basicInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(avatarSync); + input.readMessage(basicInfo); bitField0_ |= 0x00000004; } } else { @@ -1244,36 +1245,12 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case -344592620: - case -1315699973: { - if (input.isAtField(FieldNames.basicTypeInfoList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(basicTypeInfoList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } case 204814001: case 2071893482: { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1285,6 +1262,30 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(materialList); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(equipmentList); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1198530685: + case -2042493827: { + if (input.isAtField(FieldNames.multiPathAvatarInfoList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(multiPathAvatarInfoList); bitField0_ |= 0x00000400; } } else { @@ -1347,10 +1348,10 @@ public final class PlayerSyncScNotifyOuterClass { static class FieldNames { static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); - static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); - static final FieldName avatarSync = FieldName.forField("avatarSync", "avatar_sync"); + static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); + static final FieldName missionSync = FieldName.forField("missionSync", "mission_sync"); static final FieldName boardDataSync = FieldName.forField("boardDataSync", "board_data_sync"); @@ -1359,13 +1360,13 @@ public final class PlayerSyncScNotifyOuterClass { static final FieldName delRelicList = FieldName.forField("delRelicList", "del_relic_list"); - static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); - - static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); static final FieldName materialList = FieldName.forField("materialList", "material_list"); + + static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); + + static final FieldName multiPathAvatarInfoList = FieldName.forField("multiPathAvatarInfoList", "multi_path_avatar_info_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java index 7e3e095..c632c0a 100644 --- a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class PromoteAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 4; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -40,7 +40,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 11; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 11; * @return this */ public PromoteAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 11; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; + * optional uint32 base_avatar_id = 11; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 4; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -85,7 +85,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 4; * @return this */ public PromoteAvatarCsReq clearItemList() { @@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_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. @@ -109,7 +109,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_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 @@ -123,7 +123,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 4; * @param value the itemList to add * @return this */ @@ -134,7 +134,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 7; + * repeated .ItemCost item_list = 4; * @param values the itemList to add * @return this */ @@ -210,12 +210,12 @@ public final class PromoteAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 34); output.writeMessageNoTag(itemList.get(i)); } } @@ -240,16 +240,16 @@ public final class PromoteAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java index e0e6fdc..40f07bd 100644 --- a/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PromoteEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class PromoteEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 14; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return this */ public PromoteEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 10; + * optional uint32 equipment_unique_id = 13; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 14; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 14; * @return this */ public PromoteEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 12; + * optional .ItemCostList item_cost_list = 14; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class PromoteEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 114); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 104: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { + case 114: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java index 0ec25b8..8719b86 100644 --- a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java @@ -19,12 +19,12 @@ public final class PropAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 add_exp = 4; + * optional uint32 add_exp = 1; */ private int addExp; /** - * optional uint32 dialogue_group_id = 11; + * optional uint32 dialogue_group_id = 5; */ private int dialogueGroupId; @@ -44,7 +44,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 4; + * optional uint32 add_exp = 1; * @return whether the addExp field is set */ public boolean hasAddExp() { @@ -52,7 +52,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 4; + * optional uint32 add_exp = 1; * @return this */ public PropAeonInfo clearAddExp() { @@ -62,7 +62,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 4; + * optional uint32 add_exp = 1; * @return the addExp */ public int getAddExp() { @@ -70,7 +70,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 4; + * optional uint32 add_exp = 1; * @param value the addExp to set * @return this */ @@ -81,7 +81,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 11; + * optional uint32 dialogue_group_id = 5; * @return whether the dialogueGroupId field is set */ public boolean hasDialogueGroupId() { @@ -89,7 +89,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 11; + * optional uint32 dialogue_group_id = 5; * @return this */ public PropAeonInfo clearDialogueGroupId() { @@ -99,7 +99,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 11; + * optional uint32 dialogue_group_id = 5; * @return the dialogueGroupId */ public int getDialogueGroupId() { @@ -107,7 +107,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 11; + * optional uint32 dialogue_group_id = 5; * @param value the dialogueGroupId to set * @return this */ @@ -225,11 +225,11 @@ public final class PropAeonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(addExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { @@ -260,16 +260,16 @@ public final class PropAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // addExp addExp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 40) { break; } } - case 88: { + case 40: { // dialogueGroupId dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java index 1d28286..da9c9ee 100644 --- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java @@ -20,11 +20,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_info = 11; */ private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance(); @@ -51,11 +51,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_info = 11; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -64,11 +64,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_info = 11; * @return this */ public PropExtraInfo clearRogueInfo() { @@ -79,11 +79,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_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. @@ -98,11 +98,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_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 @@ -117,11 +117,11 @@ public final class PropExtraInfoOuterClass { /** * 
-     *  PropAeonInfo aeon_info = 5;
-     *  PropChessInfo chess_rogue_info = 4;
+     *  PropAeonInfo aeon_info = 9;
+     *  PropChessInfo chess_rogue_info = 8;
      *
* - * optional .PropRogueInfo rogue_info = 14; + * optional .PropRogueInfo rogue_info = 11; * @param value the rogueInfo to set * @return this */ @@ -191,7 +191,7 @@ public final class PropExtraInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueInfo); } } @@ -212,7 +212,7 @@ public final class PropExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 90: { // rogueInfo input.readMessage(rogueInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java index 338ddfa..9054e13 100644 --- a/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropRogueInfoOuterClass.java @@ -19,12 +19,12 @@ public final class PropRogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 3; + * optional uint32 site_id = 6; */ private int siteId; /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 8; */ private int roomId; @@ -39,7 +39,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 3; + * optional uint32 site_id = 6; * @return whether the siteId field is set */ public boolean hasSiteId() { @@ -47,7 +47,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 3; + * optional uint32 site_id = 6; * @return this */ public PropRogueInfo clearSiteId() { @@ -57,7 +57,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 3; + * optional uint32 site_id = 6; * @return the siteId */ public int getSiteId() { @@ -65,7 +65,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 3; + * optional uint32 site_id = 6; * @param value the siteId to set * @return this */ @@ -76,7 +76,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 8; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -84,7 +84,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 8; * @return this */ public PropRogueInfo clearRoomId() { @@ -94,7 +94,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 8; * @return the roomId */ public int getRoomId() { @@ -102,7 +102,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 12; + * optional uint32 room_id = 8; * @param value the roomId to set * @return this */ @@ -177,11 +177,11 @@ public final class PropRogueInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(roomId); } } @@ -205,16 +205,16 @@ public final class PropRogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 48: { // siteId siteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // roomId roomId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java index 1e7ce9f..33e9653 100644 --- a/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuestOuterClass.java @@ -19,22 +19,22 @@ public final class QuestOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 finish_time = 3; + * optional int64 finish_time = 4; */ private long finishTime; /** - * optional uint32 id = 1; - */ - private int id; - - /** - * optional uint32 progress = 9; + * optional uint32 progress = 6; */ private int progress; /** - * optional .QuestStatus status = 13; + * optional uint32 id = 15; + */ + private int id; + + /** + * optional .QuestStatus status = 8; */ private int status; @@ -49,7 +49,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 3; + * optional int64 finish_time = 4; * @return whether the finishTime field is set */ public boolean hasFinishTime() { @@ -57,7 +57,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 3; + * optional int64 finish_time = 4; * @return this */ public Quest clearFinishTime() { @@ -67,7 +67,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 3; + * optional int64 finish_time = 4; * @return the finishTime */ public long getFinishTime() { @@ -75,7 +75,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 3; + * optional int64 finish_time = 4; * @param value the finishTime to set * @return this */ @@ -86,62 +86,25 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 1; - * @return whether the id field is set + * optional uint32 progress = 6; + * @return whether the progress field is set */ - public boolean hasId() { + public boolean hasProgress() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 id = 1; - * @return this - */ - public Quest clearId() { - bitField0_ &= ~0x00000002; - id = 0; - return this; - } - - /** - * optional uint32 id = 1; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 1; - * @param value the id to set - * @return this - */ - public Quest setId(final int value) { - bitField0_ |= 0x00000002; - id = value; - return this; - } - - /** - * optional uint32 progress = 9; - * @return whether the progress field is set - */ - public boolean hasProgress() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 progress = 9; + * optional uint32 progress = 6; * @return this */ public Quest clearProgress() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; progress = 0; return this; } /** - * optional uint32 progress = 9; + * optional uint32 progress = 6; * @return the progress */ public int getProgress() { @@ -149,18 +112,55 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 9; + * optional uint32 progress = 6; * @param value the progress to set * @return this */ public Quest setProgress(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; progress = value; return this; } /** - * optional .QuestStatus status = 13; + * optional uint32 id = 15; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 id = 15; + * @return this + */ + public Quest clearId() { + bitField0_ &= ~0x00000004; + id = 0; + return this; + } + + /** + * optional uint32 id = 15; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 15; + * @param value the id to set + * @return this + */ + public Quest setId(final int value) { + bitField0_ |= 0x00000004; + id = value; + return this; + } + + /** + * optional .QuestStatus status = 8; * @return whether the status field is set */ public boolean hasStatus() { @@ -168,7 +168,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 8; * @return this */ public Quest clearStatus() { @@ -178,7 +178,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 8; * @return the status */ public QuestStatusOuterClass.QuestStatus getStatus() { @@ -211,7 +211,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 13; + * optional .QuestStatus status = 8; * @param value the status to set * @return this */ @@ -227,8 +227,8 @@ public final class QuestOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; finishTime = other.finishTime; - id = other.id; progress = other.progress; + id = other.id; status = other.status; } return this; @@ -243,12 +243,12 @@ public final class QuestOuterClass { if (other.hasFinishTime()) { setFinishTime(other.finishTime); } - if (other.hasId()) { - setId(other.id); - } if (other.hasProgress()) { setProgress(other.progress); } + if (other.hasId()) { + setId(other.id); + } if (other.hasStatus()) { setStatusValue(other.status); } @@ -263,8 +263,8 @@ public final class QuestOuterClass { cachedSize = -1; bitField0_ = 0; finishTime = 0L; - id = 0; progress = 0; + id = 0; status = 0; return this; } @@ -290,27 +290,27 @@ public final class QuestOuterClass { Quest other = (Quest) o; return bitField0_ == other.bitField0_ && (!hasFinishTime() || finishTime == other.finishTime) - && (!hasId() || id == other.id) && (!hasProgress() || progress == other.progress) + && (!hasId() || id == other.id) && (!hasStatus() || status == other.status); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeInt64NoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(progress); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeEnumNoTag(status); } } @@ -322,10 +322,10 @@ public final class QuestOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); @@ -340,34 +340,34 @@ public final class QuestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // finishTime finishTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 48) { break; } } - case 8: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 48: { // progress progress = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { // status final int value = input.readInt32(); if (QuestStatusOuterClass.QuestStatus.forNumber(value) != null) { @@ -400,10 +400,10 @@ public final class QuestOuterClass { output.writeInt64(FieldNames.finishTime, finishTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.progress, progress); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter()); @@ -430,10 +430,10 @@ public final class QuestOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case -1001078227: { + if (input.isAtField(FieldNames.progress)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + progress = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -441,10 +441,10 @@ public final class QuestOuterClass { } break; } - case -1001078227: { - if (input.isAtField(FieldNames.progress)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - progress = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -522,10 +522,10 @@ public final class QuestOuterClass { static class FieldNames { static final FieldName finishTime = FieldName.forField("finishTime", "finish_time"); - static final FieldName id = FieldName.forField("id"); - static final FieldName progress = FieldName.forField("progress"); + static final FieldName id = FieldName.forField("id"); + static final FieldName status = FieldName.forField("status"); } } diff --git a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java index 0d75d50..79db44e 100644 --- a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class QuitLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; */ private int baseAvatarId; /** - * optional uint32 index = 10; + * optional uint32 index = 8; */ private int index; @@ -34,17 +34,17 @@ public final class QuitLineupCsReqOuterClass { private int planeId; /** - * optional .AvatarType avatar_type = 6; - */ - private int avatarType; - - /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 4; */ private int extraLineupType; /** - * optional bool is_virtual = 14; + * optional .AvatarType avatar_type = 12; + */ + private int avatarType; + + /** + * optional bool is_virtual = 2; */ private boolean isVirtual; @@ -59,7 +59,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -67,7 +67,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return this */ public QuitLineupCsReq clearBaseAvatarId() { @@ -77,7 +77,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -85,7 +85,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 6; * @param value the baseAvatarId to set * @return this */ @@ -96,7 +96,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 8; * @return whether the index field is set */ public boolean hasIndex() { @@ -104,7 +104,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 8; * @return this */ public QuitLineupCsReq clearIndex() { @@ -114,7 +114,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 8; * @return the index */ public int getIndex() { @@ -122,7 +122,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 8; * @param value the index to set * @return this */ @@ -170,87 +170,25 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional .AvatarType avatar_type = 6; - * @return whether the avatarType field is set + * optional .ExtraLineupType extra_lineup_type = 4; + * @return whether the extraLineupType field is set */ - public boolean hasAvatarType() { + public boolean hasExtraLineupType() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .AvatarType avatar_type = 6; - * @return this - */ - public QuitLineupCsReq clearAvatarType() { - bitField0_ &= ~0x00000008; - 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 QuitLineupCsReq#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 QuitLineupCsReq#getAvatarType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public QuitLineupCsReq setAvatarTypeValue(final int value) { - bitField0_ |= 0x00000008; - avatarType = value; - return this; - } - - /** - * optional .AvatarType avatar_type = 6; - * @param value the avatarType to set - * @return this - */ - public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { - bitField0_ |= 0x00000008; - avatarType = value.getNumber(); - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; - * @return whether the extraLineupType field is set - */ - public boolean hasExtraLineupType() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 4; * @return this */ public QuitLineupCsReq clearExtraLineupType() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; extraLineupType = 0; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 4; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -277,25 +215,87 @@ public final class QuitLineupCsReqOuterClass { * @return this */ public QuitLineupCsReq setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; extraLineupType = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 4; * @param value the extraLineupType to set * @return this */ public QuitLineupCsReq setExtraLineupType( final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; extraLineupType = value.getNumber(); return this; } /** - * optional bool is_virtual = 14; + * optional .AvatarType avatar_type = 12; + * @return whether the avatarType field is set + */ + public boolean hasAvatarType() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .AvatarType avatar_type = 12; + * @return this + */ + public QuitLineupCsReq clearAvatarType() { + bitField0_ &= ~0x00000010; + avatarType = 0; + return this; + } + + /** + * optional .AvatarType avatar_type = 12; + * @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 QuitLineupCsReq#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 QuitLineupCsReq#getAvatarType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public QuitLineupCsReq setAvatarTypeValue(final int value) { + bitField0_ |= 0x00000010; + avatarType = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 12; + * @param value the avatarType to set + * @return this + */ + public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { + bitField0_ |= 0x00000010; + avatarType = value.getNumber(); + return this; + } + + /** + * optional bool is_virtual = 2; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -303,7 +303,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 2; * @return this */ public QuitLineupCsReq clearIsVirtual() { @@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 2; * @return the isVirtual */ public boolean getIsVirtual() { @@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 14; + * optional bool is_virtual = 2; * @param value the isVirtual to set * @return this */ @@ -339,8 +339,8 @@ public final class QuitLineupCsReqOuterClass { baseAvatarId = other.baseAvatarId; index = other.index; planeId = other.planeId; - avatarType = other.avatarType; extraLineupType = other.extraLineupType; + avatarType = other.avatarType; isVirtual = other.isVirtual; } return this; @@ -361,12 +361,12 @@ public final class QuitLineupCsReqOuterClass { if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasAvatarType()) { - setAvatarTypeValue(other.avatarType); - } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } + if (other.hasAvatarType()) { + setAvatarTypeValue(other.avatarType); + } if (other.hasIsVirtual()) { setIsVirtual(other.isVirtual); } @@ -383,8 +383,8 @@ public final class QuitLineupCsReqOuterClass { baseAvatarId = 0; index = 0; planeId = 0; - avatarType = 0; extraLineupType = 0; + avatarType = 0; isVirtual = false; return this; } @@ -412,19 +412,19 @@ public final class QuitLineupCsReqOuterClass { && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasIndex() || index == other.index) && (!hasPlaneId() || planeId == other.planeId) - && (!hasAvatarType() || avatarType == other.avatarType) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasAvatarType() || avatarType == other.avatarType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { @@ -432,15 +432,15 @@ public final class QuitLineupCsReqOuterClass { output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeEnumNoTag(avatarType); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeEnumNoTag(extraLineupType); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeEnumNoTag(avatarType); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isVirtual); } } @@ -458,10 +458,10 @@ public final class QuitLineupCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { size += 2; @@ -476,16 +476,16 @@ public final class QuitLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // index index = input.readUInt32(); bitField0_ |= 0x00000002; @@ -499,35 +499,35 @@ public final class QuitLineupCsReqOuterClass { planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { - // avatarType - final int value = input.readInt32(); - if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { - avatarType = value; - bitField0_ |= 0x00000008; - } - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 32: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { extraLineupType = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { + // avatarType + final int value = input.readInt32(); + if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { + avatarType = value; + bitField0_ |= 0x00000010; + } + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -563,10 +563,10 @@ public final class QuitLineupCsReqOuterClass { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.isVirtual, isVirtual); @@ -616,13 +616,13 @@ public final class QuitLineupCsReqOuterClass { } break; } - case -403148749: - case 397309536: { - if (input.isAtField(FieldNames.avatarType)) { + case -468135527: + case -1144475077: { + if (input.isAtField(FieldNames.extraLineupType)) { if (!input.trySkipNullValue()) { - final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); + final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); if (value != null) { - avatarType = value.getNumber(); + extraLineupType = value.getNumber(); bitField0_ |= 0x00000008; } else { input.skipUnknownEnumValue(); @@ -633,13 +633,13 @@ public final class QuitLineupCsReqOuterClass { } break; } - case -468135527: - case -1144475077: { - if (input.isAtField(FieldNames.extraLineupType)) { + case -403148749: + case 397309536: { + if (input.isAtField(FieldNames.avatarType)) { if (!input.trySkipNullValue()) { - final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); if (value != null) { - extraLineupType = value.getNumber(); + avatarType = value.getNumber(); bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); @@ -721,10 +721,10 @@ public final class QuitLineupCsReqOuterClass { static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java index 63bfcc1..1ce7d1e 100644 --- a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class RankUpEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 12; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 12; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 12; * @return this */ public RankUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 12; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 2; + * optional uint32 equipment_unique_id = 12; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @return this */ public RankUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 9; + * optional .ItemCostList item_cost_list = 4; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class RankUpEquipmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class RankUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 96: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java index 67d5311..56aa9cb 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 13; */ private int stageId; @@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 13; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -42,7 +42,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 13; * @return this */ public ReEnterLastElementStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 13; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 13; * @param value the stageId to set * @return this */ @@ -129,7 +129,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 104: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java index 3a76e2b..bd1bb24 100644 --- a/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReEnterLastElementStageScRspOuterClass.java @@ -19,17 +19,17 @@ public final class ReEnterLastElementStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 stage_id = 13; + * optional uint32 stage_id = 11; */ private int stageId; /** - * optional .SceneBattleInfo battle_info = 8; + * optional uint32 retcode = 15; + */ + private int retcode; + + /** + * optional .SceneBattleInfo battle_info = 7; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 stage_id = 11; + * @return whether the stageId field is set */ - public boolean hasRetcode() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public ReEnterLastElementStageScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 3; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 3; - * @param value the retcode to set - * @return this - */ - public ReEnterLastElementStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 stage_id = 13; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 13; + * optional uint32 stage_id = 11; * @return this */ public ReEnterLastElementStageScRsp clearStageId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; stageId = 0; return this; } /** - * optional uint32 stage_id = 13; + * optional uint32 stage_id = 11; * @return the stageId */ public int getStageId() { @@ -107,18 +70,55 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 13; + * optional uint32 stage_id = 11; * @param value the stageId to set * @return this */ public ReEnterLastElementStageScRsp setStageId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; stageId = value; return this; } /** - * optional .SceneBattleInfo battle_info = 8; + * optional uint32 retcode = 15; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 15; + * @return this + */ + public ReEnterLastElementStageScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 15; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 15; + * @param value the retcode to set + * @return this + */ + public ReEnterLastElementStageScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 7; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 8; + * optional .SceneBattleInfo battle_info = 7; * @return this */ public ReEnterLastElementStageScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 8; + * optional .SceneBattleInfo battle_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. @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 8; + * optional .SceneBattleInfo battle_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 @@ -164,7 +164,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 8; + * optional .SceneBattleInfo battle_info = 7; * @param value the battleInfo to set * @return this */ @@ -180,8 +180,8 @@ public final class ReEnterLastElementStageScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; stageId = other.stageId; + retcode = other.retcode; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public final class ReEnterLastElementStageScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasStageId()) { setStageId(other.stageId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public final class ReEnterLastElementStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; stageId = 0; + retcode = 0; battleInfo.clear(); return this; } @@ -239,23 +239,23 @@ public final class ReEnterLastElementStageScRspOuterClass { } ReEnterLastElementStageScRsp other = (ReEnterLastElementStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasStageId() || stageId == other.stageId) + && (!hasRetcode() || retcode == other.retcode) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); output.writeMessageNoTag(battleInfo); } } @@ -264,10 +264,10 @@ public final class ReEnterLastElementStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -282,25 +282,25 @@ public final class ReEnterLastElementStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 88: { // stageId stageId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 120) { break; } } - case 66: { + case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class ReEnterLastElementStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,10 +345,11 @@ public final class ReEnterLastElementStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +357,10 @@ public final class ReEnterLastElementStageScRspOuterClass { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -435,10 +435,10 @@ public final class ReEnterLastElementStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java index 6a9dde1..242a54a 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientCsReqOuterClass.java @@ -21,22 +21,22 @@ public final class RefreshTriggerByClientCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 trigger_entity_id = 9; + * optional uint32 trigger_entity_id = 4; */ private int triggerEntityId; /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 5; */ private final MotionInfoOuterClass.MotionInfo triggerMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_list = 7; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -51,7 +51,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 9; + * optional uint32 trigger_entity_id = 4; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -59,7 +59,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 9; + * optional uint32 trigger_entity_id = 4; * @return this */ public RefreshTriggerByClientCsReq clearTriggerEntityId() { @@ -69,7 +69,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 9; + * optional uint32 trigger_entity_id = 4; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -77,7 +77,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 9; + * optional uint32 trigger_entity_id = 4; * @param value the triggerEntityId to set * @return this */ @@ -88,7 +88,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 5; * @return whether the triggerMotion field is set */ public boolean hasTriggerMotion() { @@ -96,7 +96,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 5; * @return this */ public RefreshTriggerByClientCsReq clearTriggerMotion() { @@ -106,7 +106,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 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. @@ -120,7 +120,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 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 @@ -134,7 +134,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 10; + * optional .MotionInfo trigger_motion = 5; * @param value the triggerMotion to set * @return this */ @@ -146,7 +146,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -154,7 +154,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @return this */ public RefreshTriggerByClientCsReq clearTriggerName() { @@ -164,7 +164,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @return the triggerName */ public String getTriggerName() { @@ -172,7 +172,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -180,7 +180,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -189,7 +189,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @param value the triggerName to set * @return this */ @@ -200,7 +200,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 14; + * optional string trigger_name = 10; * @param value the triggerName to set * @return this */ @@ -211,7 +211,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_list = 7; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -219,7 +219,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_list = 7; * @return this */ public RefreshTriggerByClientCsReq clearTriggerTargetIdList() { @@ -229,7 +229,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_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. @@ -243,7 +243,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_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 @@ -257,7 +257,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_list = 7; * @param value the triggerTargetIdList to add * @return this */ @@ -268,7 +268,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 1; + * repeated uint32 trigger_target_id_list = 7; * @param values the triggerTargetIdList to add * @return this */ @@ -358,20 +358,20 @@ public final class RefreshTriggerByClientCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 42); output.writeMessageNoTag(triggerMotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -402,34 +402,34 @@ public final class RefreshTriggerByClientCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // triggerMotion + input.readMessage(triggerMotion); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // triggerMotion - input.readMessage(triggerMotion); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 10) { + if (tag != 58) { break; } } - case 10: { + case 58: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; @@ -448,7 +448,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 56: { // triggerTargetIdList [packed=false] tag = input.readRepeatedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java index 0b9fb38..4ca99c5 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java @@ -26,12 +26,12 @@ public final class RefreshTriggerByClientScNotifyOuterClass { private int triggerEntityId; /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 12; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -83,7 +83,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -91,7 +91,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @return this */ public RefreshTriggerByClientScNotify clearTriggerName() { @@ -101,7 +101,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @return the triggerName */ public String getTriggerName() { @@ -109,7 +109,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -117,7 +117,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -126,7 +126,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @param value the triggerName to set * @return this */ @@ -137,7 +137,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 11; * @param value the triggerName to set * @return this */ @@ -148,7 +148,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 12; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -156,7 +156,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 12; * @return this */ public RefreshTriggerByClientScNotify clearTriggerTargetIdList() { @@ -166,7 +166,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_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. @@ -180,7 +180,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_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 @@ -194,7 +194,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 12; * @param value the triggerTargetIdList to add * @return this */ @@ -205,7 +205,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 12; * @param values the triggerTargetIdList to add * @return this */ @@ -292,12 +292,12 @@ public final class RefreshTriggerByClientScNotifyOuterClass { output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 90); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -330,20 +330,20 @@ public final class RefreshTriggerByClientScNotifyOuterClass { triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 90) { break; } } - case 74: { + case 90: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { + case 98: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; @@ -362,7 +362,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { tag = input.readTag(); break; } - case 32: { + case 96: { // triggerTargetIdList [packed=false] tag = input.readRepeatedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java index cac9fa8..7b31315 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScRspOuterClass.java @@ -20,22 +20,22 @@ public final class RefreshTriggerByClientScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 3; */ private int triggerEntityId; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional bool refresh_trigger = 5; + * optional bool refresh_trigger = 2; */ private boolean refreshTrigger; /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); @@ -50,7 +50,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 3; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -58,7 +58,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 3; * @return this */ public RefreshTriggerByClientScRsp clearTriggerEntityId() { @@ -68,7 +68,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 3; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -76,7 +76,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 4; + * optional uint32 trigger_entity_id = 3; * @param value the triggerEntityId to set * @return this */ @@ -87,7 +87,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -95,7 +95,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 7; * @return this */ public RefreshTriggerByClientScRsp clearRetcode() { @@ -105,7 +105,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -113,7 +113,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -124,7 +124,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 5; + * optional bool refresh_trigger = 2; * @return whether the refreshTrigger field is set */ public boolean hasRefreshTrigger() { @@ -132,7 +132,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 5; + * optional bool refresh_trigger = 2; * @return this */ public RefreshTriggerByClientScRsp clearRefreshTrigger() { @@ -142,7 +142,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 5; + * optional bool refresh_trigger = 2; * @return the refreshTrigger */ public boolean getRefreshTrigger() { @@ -150,7 +150,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 5; + * optional bool refresh_trigger = 2; * @param value the refreshTrigger to set * @return this */ @@ -161,7 +161,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -169,7 +169,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @return this */ public RefreshTriggerByClientScRsp clearTriggerName() { @@ -179,7 +179,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @return the triggerName */ public String getTriggerName() { @@ -187,7 +187,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -195,7 +195,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -204,7 +204,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @param value the triggerName to set * @return this */ @@ -215,7 +215,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 11; + * optional string trigger_name = 13; * @param value the triggerName to set * @return this */ @@ -303,19 +303,19 @@ public final class RefreshTriggerByClientScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeBoolNoTag(refreshTrigger); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 106); output.writeStringNoTag(triggerName); } } @@ -345,34 +345,34 @@ public final class RefreshTriggerByClientScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { + case 16: { // refreshTrigger refreshTrigger = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 90) { + if (tag != 106) { break; } } - case 90: { + case 106: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java index 73d3b19..07ffd2c 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java @@ -19,15 +19,15 @@ public final class RelicArchiveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_id = 4; - */ - private int relicId; - - /** - * optional uint32 slot = 10; + * optional uint32 slot = 5; */ private int slot; + /** + * optional uint32 relic_id = 13; + */ + private int relicId; + private RelicArchive() { } @@ -39,62 +39,25 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 4; - * @return whether the relicId field is set + * optional uint32 slot = 5; + * @return whether the slot field is set */ - public boolean hasRelicId() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 relic_id = 4; - * @return this - */ - public RelicArchive clearRelicId() { - bitField0_ &= ~0x00000001; - relicId = 0; - return this; - } - - /** - * optional uint32 relic_id = 4; - * @return the relicId - */ - public int getRelicId() { - return relicId; - } - - /** - * optional uint32 relic_id = 4; - * @param value the relicId to set - * @return this - */ - public RelicArchive setRelicId(final int value) { - bitField0_ |= 0x00000001; - relicId = value; - return this; - } - - /** - * optional uint32 slot = 10; - * @return whether the slot field is set - */ - public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 slot = 10; + * optional uint32 slot = 5; * @return this */ public RelicArchive clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } /** - * optional uint32 slot = 10; + * optional uint32 slot = 5; * @return the slot */ public int getSlot() { @@ -102,23 +65,60 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 slot = 10; + * optional uint32 slot = 5; * @param value the slot to set * @return this */ public RelicArchive setSlot(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; slot = value; return this; } + /** + * optional uint32 relic_id = 13; + * @return whether the relicId field is set + */ + public boolean hasRelicId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 relic_id = 13; + * @return this + */ + public RelicArchive clearRelicId() { + bitField0_ &= ~0x00000002; + relicId = 0; + return this; + } + + /** + * optional uint32 relic_id = 13; + * @return the relicId + */ + public int getRelicId() { + return relicId; + } + + /** + * optional uint32 relic_id = 13; + * @param value the relicId to set + * @return this + */ + public RelicArchive setRelicId(final int value) { + bitField0_ |= 0x00000002; + relicId = value; + return this; + } + @Override public RelicArchive copyFrom(final RelicArchive other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - relicId = other.relicId; slot = other.slot; + relicId = other.relicId; } return this; } @@ -129,12 +129,12 @@ public final class RelicArchiveOuterClass { return this; } cachedSize = -1; - if (other.hasRelicId()) { - setRelicId(other.relicId); - } if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasRelicId()) { + setRelicId(other.relicId); + } return this; } @@ -145,8 +145,8 @@ public final class RelicArchiveOuterClass { } cachedSize = -1; bitField0_ = 0; - relicId = 0; slot = 0; + relicId = 0; return this; } @@ -170,19 +170,19 @@ public final class RelicArchiveOuterClass { } RelicArchive other = (RelicArchive) o; return bitField0_ == other.bitField0_ - && (!hasRelicId() || relicId == other.relicId) - && (!hasSlot() || slot == other.slot); + && (!hasSlot() || slot == other.slot) + && (!hasRelicId() || relicId == other.relicId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(relicId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(relicId); } } @@ -190,10 +190,10 @@ public final class RelicArchiveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicId); } return size; } @@ -205,18 +205,18 @@ public final class RelicArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // relicId - relicId = input.readUInt32(); + case 40: { + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // slot - slot = input.readUInt32(); + case 104: { + // relicId + relicId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RelicArchiveOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.relicId, relicId); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.relicId, relicId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class RelicArchiveOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1090714606: - case -547564185: { - if (input.isAtField(FieldNames.relicId)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - relicId = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class RelicArchiveOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 1090714606: + case -547564185: { + if (input.isAtField(FieldNames.relicId)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + relicId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class RelicArchiveOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName relicId = FieldName.forField("relicId", "relic_id"); - static final FieldName slot = FieldName.forField("slot"); + + static final FieldName relicId = FieldName.forField("relicId", "relic_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java new file mode 100644 index 0000000..a79decc --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendCsReqOuterClass.java @@ -0,0 +1,260 @@ +// 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 RelicAvatarRecommendCsReqOuterClass { + /** + * Protobuf type {@code RelicAvatarRecommendCsReq} + */ + public static final class RelicAvatarRecommendCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 set_id = 13; + */ + private int setId; + + private RelicAvatarRecommendCsReq() { + } + + /** + * @return a new empty instance of {@code RelicAvatarRecommendCsReq} + */ + public static RelicAvatarRecommendCsReq newInstance() { + return new RelicAvatarRecommendCsReq(); + } + + /** + * optional uint32 set_id = 13; + * @return whether the setId field is set + */ + public boolean hasSetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 set_id = 13; + * @return this + */ + public RelicAvatarRecommendCsReq clearSetId() { + bitField0_ &= ~0x00000001; + setId = 0; + return this; + } + + /** + * optional uint32 set_id = 13; + * @return the setId + */ + public int getSetId() { + return setId; + } + + /** + * optional uint32 set_id = 13; + * @param value the setId to set + * @return this + */ + public RelicAvatarRecommendCsReq setSetId(final int value) { + bitField0_ |= 0x00000001; + setId = value; + return this; + } + + @Override + public RelicAvatarRecommendCsReq copyFrom(final RelicAvatarRecommendCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + setId = other.setId; + } + return this; + } + + @Override + public RelicAvatarRecommendCsReq mergeFrom(final RelicAvatarRecommendCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSetId()) { + setSetId(other.setId); + } + return this; + } + + @Override + public RelicAvatarRecommendCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + setId = 0; + return this; + } + + @Override + public RelicAvatarRecommendCsReq 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 RelicAvatarRecommendCsReq)) { + return false; + } + RelicAvatarRecommendCsReq other = (RelicAvatarRecommendCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasSetId() || setId == other.setId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(setId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(setId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RelicAvatarRecommendCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 104: { + // setId + setId = input.readUInt32(); + bitField0_ |= 0x00000001; + 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.setId, setId); + } + output.endObject(); + } + + @Override + public RelicAvatarRecommendCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 109327645: + case -905788904: { + if (input.isAtField(FieldNames.setId)) { + if (!input.trySkipNullValue()) { + setId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RelicAvatarRecommendCsReq clone() { + return new RelicAvatarRecommendCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RelicAvatarRecommendCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendCsReq(), data).checkInitialized(); + } + + public static RelicAvatarRecommendCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendCsReq(), input).checkInitialized(); + } + + public static RelicAvatarRecommendCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating RelicAvatarRecommendCsReq messages + */ + public static MessageFactory getFactory() { + return RelicAvatarRecommendCsReqFactory.INSTANCE; + } + + private enum RelicAvatarRecommendCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public RelicAvatarRecommendCsReq create() { + return RelicAvatarRecommendCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName setId = FieldName.forField("setId", "set_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java new file mode 100644 index 0000000..ce214a6 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RelicAvatarRecommendScRspOuterClass.java @@ -0,0 +1,543 @@ +// 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; + +public final class RelicAvatarRecommendScRspOuterClass { + /** + * Protobuf type {@code RelicAvatarRecommendScRsp} + */ + public static final class RelicAvatarRecommendScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 set_id = 8; + */ + private int setId; + + /** + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional bool is_fetch_avatar_list = 1; + */ + private boolean isFetchAvatarList; + + /** + * repeated uint32 avatar_id_list = 10; + */ + private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); + + private RelicAvatarRecommendScRsp() { + } + + /** + * @return a new empty instance of {@code RelicAvatarRecommendScRsp} + */ + public static RelicAvatarRecommendScRsp newInstance() { + return new RelicAvatarRecommendScRsp(); + } + + /** + * optional uint32 set_id = 8; + * @return whether the setId field is set + */ + public boolean hasSetId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 set_id = 8; + * @return this + */ + public RelicAvatarRecommendScRsp clearSetId() { + bitField0_ &= ~0x00000001; + setId = 0; + return this; + } + + /** + * optional uint32 set_id = 8; + * @return the setId + */ + public int getSetId() { + return setId; + } + + /** + * optional uint32 set_id = 8; + * @param value the setId to set + * @return this + */ + public RelicAvatarRecommendScRsp setSetId(final int value) { + bitField0_ |= 0x00000001; + setId = value; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public RelicAvatarRecommendScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 12; + * @param value the retcode to set + * @return this + */ + public RelicAvatarRecommendScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional bool is_fetch_avatar_list = 1; + * @return whether the isFetchAvatarList field is set + */ + public boolean hasIsFetchAvatarList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bool is_fetch_avatar_list = 1; + * @return this + */ + public RelicAvatarRecommendScRsp clearIsFetchAvatarList() { + bitField0_ &= ~0x00000004; + isFetchAvatarList = false; + return this; + } + + /** + * optional bool is_fetch_avatar_list = 1; + * @return the isFetchAvatarList + */ + public boolean getIsFetchAvatarList() { + return isFetchAvatarList; + } + + /** + * optional bool is_fetch_avatar_list = 1; + * @param value the isFetchAvatarList to set + * @return this + */ + public RelicAvatarRecommendScRsp setIsFetchAvatarList(final boolean value) { + bitField0_ |= 0x00000004; + isFetchAvatarList = value; + return this; + } + + /** + * repeated uint32 avatar_id_list = 10; + * @return whether the avatarIdList field is set + */ + public boolean hasAvatarIdList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated uint32 avatar_id_list = 10; + * @return this + */ + public RelicAvatarRecommendScRsp clearAvatarIdList() { + bitField0_ &= ~0x00000008; + avatarIdList.clear(); + return this; + } + + /** + * repeated uint32 avatar_id_list = 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 #getMutableAvatarIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getAvatarIdList() { + return avatarIdList; + } + + /** + * repeated uint32 avatar_id_list = 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 RepeatedInt getMutableAvatarIdList() { + bitField0_ |= 0x00000008; + return avatarIdList; + } + + /** + * repeated uint32 avatar_id_list = 10; + * @param value the avatarIdList to add + * @return this + */ + public RelicAvatarRecommendScRsp addAvatarIdList(final int value) { + bitField0_ |= 0x00000008; + avatarIdList.add(value); + return this; + } + + /** + * repeated uint32 avatar_id_list = 10; + * @param values the avatarIdList to add + * @return this + */ + public RelicAvatarRecommendScRsp addAllAvatarIdList(final int... values) { + bitField0_ |= 0x00000008; + avatarIdList.addAll(values); + return this; + } + + @Override + public RelicAvatarRecommendScRsp copyFrom(final RelicAvatarRecommendScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + setId = other.setId; + retcode = other.retcode; + isFetchAvatarList = other.isFetchAvatarList; + avatarIdList.copyFrom(other.avatarIdList); + } + return this; + } + + @Override + public RelicAvatarRecommendScRsp mergeFrom(final RelicAvatarRecommendScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSetId()) { + setSetId(other.setId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasIsFetchAvatarList()) { + setIsFetchAvatarList(other.isFetchAvatarList); + } + if (other.hasAvatarIdList()) { + getMutableAvatarIdList().addAll(other.avatarIdList); + } + return this; + } + + @Override + public RelicAvatarRecommendScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + setId = 0; + retcode = 0; + isFetchAvatarList = false; + avatarIdList.clear(); + return this; + } + + @Override + public RelicAvatarRecommendScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + avatarIdList.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RelicAvatarRecommendScRsp)) { + return false; + } + RelicAvatarRecommendScRsp other = (RelicAvatarRecommendScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasSetId() || setId == other.setId) + && (!hasRetcode() || retcode == other.retcode) + && (!hasIsFetchAvatarList() || isFetchAvatarList == other.isFetchAvatarList) + && (!hasAvatarIdList() || avatarIdList.equals(other.avatarIdList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(setId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 8); + output.writeBoolNoTag(isFetchAvatarList); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < avatarIdList.length(); i++) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(avatarIdList.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(setId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * avatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(avatarIdList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RelicAvatarRecommendScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // setId + setId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { + // isFetchAvatarList + isFetchAvatarList = input.readBool(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // avatarIdList [packed=true] + input.readPackedUInt32(avatarIdList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 80: { + // avatarIdList [packed=false] + tag = input.readRepeatedUInt32(avatarIdList, tag); + bitField0_ |= 0x00000008; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.setId, setId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeBool(FieldNames.isFetchAvatarList, isFetchAvatarList); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.avatarIdList, avatarIdList); + } + output.endObject(); + } + + @Override + public RelicAvatarRecommendScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 109327645: + case -905788904: { + if (input.isAtField(FieldNames.setId)) { + if (!input.trySkipNullValue()) { + setId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 24331623: + case 1632335338: { + if (input.isAtField(FieldNames.isFetchAvatarList)) { + if (!input.trySkipNullValue()) { + isFetchAvatarList = input.readBool(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1214270702: + case 1824281692: { + if (input.isAtField(FieldNames.avatarIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(avatarIdList); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RelicAvatarRecommendScRsp clone() { + return new RelicAvatarRecommendScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RelicAvatarRecommendScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendScRsp(), data).checkInitialized(); + } + + public static RelicAvatarRecommendScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendScRsp(), input).checkInitialized(); + } + + public static RelicAvatarRecommendScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicAvatarRecommendScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating RelicAvatarRecommendScRsp messages + */ + public static MessageFactory getFactory() { + return RelicAvatarRecommendScRspFactory.INSTANCE; + } + + private enum RelicAvatarRecommendScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public RelicAvatarRecommendScRsp create() { + return RelicAvatarRecommendScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName setId = FieldName.forField("setId", "set_id"); + + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName isFetchAvatarList = FieldName.forField("isFetchAvatarList", "is_fetch_avatar_list"); + + static final FieldName avatarIdList = FieldName.forField("avatarIdList", "avatar_id_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java index 2bec9cd..ac05ce5 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java @@ -20,47 +20,47 @@ public final class RelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 main_affix_id = 1; + * optional uint32 main_affix_id = 5; */ private int mainAffixId; /** - * optional uint32 exp = 2; + * optional uint32 exp = 7; */ private int exp; /** - * optional uint32 unique_id = 3; + * optional uint32 unique_id = 9; */ private int uniqueId; /** - * optional uint32 tid = 6; - */ - private int tid; - - /** - * optional uint32 level = 9; - */ - private int level; - - /** - * optional uint32 equip_avatar_id = 15; + * optional uint32 equip_avatar_id = 10; */ private int equipAvatarId; /** - * optional bool is_discarded = 5; + * optional uint32 tid = 13; */ - private boolean isDiscarded; + private int tid; /** - * optional bool is_protected = 11; + * optional uint32 level = 15; + */ + private int level; + + /** + * optional bool is_protected = 8; */ private boolean isProtected; /** - * repeated .RelicAffix sub_affix_list = 14; + * optional bool is_discarded = 11; + */ + private boolean isDiscarded; + + /** + * repeated .RelicAffix sub_affix_list = 12; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -75,7 +75,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 1; + * optional uint32 main_affix_id = 5; * @return whether the mainAffixId field is set */ public boolean hasMainAffixId() { @@ -83,7 +83,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 1; + * optional uint32 main_affix_id = 5; * @return this */ public Relic clearMainAffixId() { @@ -93,7 +93,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 1; + * optional uint32 main_affix_id = 5; * @return the mainAffixId */ public int getMainAffixId() { @@ -101,7 +101,7 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 1; + * optional uint32 main_affix_id = 5; * @param value the mainAffixId to set * @return this */ @@ -112,7 +112,7 @@ public final class RelicOuterClass { } /** - * optional uint32 exp = 2; + * optional uint32 exp = 7; * @return whether the exp field is set */ public boolean hasExp() { @@ -120,7 +120,7 @@ public final class RelicOuterClass { } /** - * optional uint32 exp = 2; + * optional uint32 exp = 7; * @return this */ public Relic clearExp() { @@ -130,7 +130,7 @@ public final class RelicOuterClass { } /** - * optional uint32 exp = 2; + * optional uint32 exp = 7; * @return the exp */ public int getExp() { @@ -138,7 +138,7 @@ public final class RelicOuterClass { } /** - * optional uint32 exp = 2; + * optional uint32 exp = 7; * @param value the exp to set * @return this */ @@ -149,7 +149,7 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 3; + * optional uint32 unique_id = 9; * @return whether the uniqueId field is set */ public boolean hasUniqueId() { @@ -157,7 +157,7 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 3; + * optional uint32 unique_id = 9; * @return this */ public Relic clearUniqueId() { @@ -167,7 +167,7 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 3; + * optional uint32 unique_id = 9; * @return the uniqueId */ public int getUniqueId() { @@ -175,7 +175,7 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 3; + * optional uint32 unique_id = 9; * @param value the uniqueId to set * @return this */ @@ -186,99 +186,25 @@ public final class RelicOuterClass { } /** - * optional uint32 tid = 6; - * @return whether the tid field is set + * optional uint32 equip_avatar_id = 10; + * @return whether the equipAvatarId field is set */ - public boolean hasTid() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 tid = 6; - * @return this - */ - public Relic clearTid() { - bitField0_ &= ~0x00000008; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 6; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 6; - * @param value the tid to set - * @return this - */ - public Relic setTid(final int value) { - bitField0_ |= 0x00000008; - tid = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public Relic clearLevel() { - bitField0_ &= ~0x00000010; - level = 0; - return this; - } - - /** - * optional uint32 level = 9; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 9; - * @param value the level to set - * @return this - */ - public Relic setLevel(final int value) { - bitField0_ |= 0x00000010; - level = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 15; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 equip_avatar_id = 15; + * optional uint32 equip_avatar_id = 10; * @return this */ public Relic clearEquipAvatarId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000008; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 15; + * optional uint32 equip_avatar_id = 10; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -286,73 +212,110 @@ public final class RelicOuterClass { } /** - * optional uint32 equip_avatar_id = 15; + * optional uint32 equip_avatar_id = 10; * @param value the equipAvatarId to set * @return this */ public Relic setEquipAvatarId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; equipAvatarId = value; return this; } /** - * optional bool is_discarded = 5; - * @return whether the isDiscarded field is set + * optional uint32 tid = 13; + * @return whether the tid field is set */ - public boolean hasIsDiscarded() { + public boolean hasTid() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 tid = 13; + * @return this + */ + public Relic clearTid() { + bitField0_ &= ~0x00000010; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 13; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 13; + * @param value the tid to set + * @return this + */ + public Relic setTid(final int value) { + bitField0_ |= 0x00000010; + tid = value; + return this; + } + + /** + * optional uint32 level = 15; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 level = 15; + * @return this + */ + public Relic clearLevel() { + bitField0_ &= ~0x00000020; + level = 0; + return this; + } + + /** + * optional uint32 level = 15; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 15; + * @param value the level to set + * @return this + */ + public Relic setLevel(final int value) { + bitField0_ |= 0x00000020; + level = value; + return this; + } + + /** + * optional bool is_protected = 8; + * @return whether the isProtected field is set + */ + public boolean hasIsProtected() { return (bitField0_ & 0x00000040) != 0; } /** - * optional bool is_discarded = 5; - * @return this - */ - public Relic clearIsDiscarded() { - bitField0_ &= ~0x00000040; - isDiscarded = false; - return this; - } - - /** - * optional bool is_discarded = 5; - * @return the isDiscarded - */ - public boolean getIsDiscarded() { - return isDiscarded; - } - - /** - * optional bool is_discarded = 5; - * @param value the isDiscarded to set - * @return this - */ - public Relic setIsDiscarded(final boolean value) { - bitField0_ |= 0x00000040; - isDiscarded = value; - return this; - } - - /** - * optional bool is_protected = 11; - * @return whether the isProtected field is set - */ - public boolean hasIsProtected() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool is_protected = 11; + * optional bool is_protected = 8; * @return this */ public Relic clearIsProtected() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; isProtected = false; return this; } /** - * optional bool is_protected = 11; + * optional bool is_protected = 8; * @return the isProtected */ public boolean getIsProtected() { @@ -360,18 +323,55 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 11; + * optional bool is_protected = 8; * @param value the isProtected to set * @return this */ public Relic setIsProtected(final boolean value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; isProtected = value; return this; } /** - * repeated .RelicAffix sub_affix_list = 14; + * optional bool is_discarded = 11; + * @return whether the isDiscarded field is set + */ + public boolean hasIsDiscarded() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional bool is_discarded = 11; + * @return this + */ + public Relic clearIsDiscarded() { + bitField0_ &= ~0x00000080; + isDiscarded = false; + return this; + } + + /** + * optional bool is_discarded = 11; + * @return the isDiscarded + */ + public boolean getIsDiscarded() { + return isDiscarded; + } + + /** + * optional bool is_discarded = 11; + * @param value the isDiscarded to set + * @return this + */ + public Relic setIsDiscarded(final boolean value) { + bitField0_ |= 0x00000080; + isDiscarded = value; + return this; + } + + /** + * repeated .RelicAffix sub_affix_list = 12; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -379,7 +379,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 12; * @return this */ public Relic clearSubAffixList() { @@ -389,7 +389,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_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. @@ -403,7 +403,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_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 @@ -417,7 +417,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 12; * @param value the subAffixList to add * @return this */ @@ -428,7 +428,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 12; * @param values the subAffixList to add * @return this */ @@ -446,11 +446,11 @@ public final class RelicOuterClass { mainAffixId = other.mainAffixId; exp = other.exp; uniqueId = other.uniqueId; + equipAvatarId = other.equipAvatarId; tid = other.tid; level = other.level; - equipAvatarId = other.equipAvatarId; - isDiscarded = other.isDiscarded; isProtected = other.isProtected; + isDiscarded = other.isDiscarded; subAffixList.copyFrom(other.subAffixList); } return this; @@ -471,21 +471,21 @@ public final class RelicOuterClass { if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } + if (other.hasEquipAvatarId()) { + setEquipAvatarId(other.equipAvatarId); + } if (other.hasTid()) { setTid(other.tid); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); + if (other.hasIsProtected()) { + setIsProtected(other.isProtected); } if (other.hasIsDiscarded()) { setIsDiscarded(other.isDiscarded); } - if (other.hasIsProtected()) { - setIsProtected(other.isProtected); - } if (other.hasSubAffixList()) { getMutableSubAffixList().addAll(other.subAffixList); } @@ -502,11 +502,11 @@ public final class RelicOuterClass { mainAffixId = 0; exp = 0; uniqueId = 0; + equipAvatarId = 0; tid = 0; level = 0; - equipAvatarId = 0; - isDiscarded = false; isProtected = false; + isDiscarded = false; subAffixList.clear(); return this; } @@ -535,51 +535,51 @@ public final class RelicOuterClass { && (!hasMainAffixId() || mainAffixId == other.mainAffixId) && (!hasExp() || exp == other.exp) && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasTid() || tid == other.tid) && (!hasLevel() || level == other.level) - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) - && (!hasIsDiscarded() || isDiscarded == other.isDiscarded) && (!hasIsProtected() || isProtected == other.isProtected) + && (!hasIsDiscarded() || isDiscarded == other.isDiscarded) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(equipAvatarId); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 40); - output.writeBoolNoTag(isDiscarded); + output.writeRawByte((byte) 64); + output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 88); - output.writeBoolNoTag(isProtected); + output.writeBoolNoTag(isDiscarded); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 98); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -598,13 +598,13 @@ public final class RelicOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -625,45 +625,45 @@ public final class RelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // mainAffixId mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 56) { break; } } - case 16: { + case 56: { // exp exp = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // uniqueId - uniqueId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // level - level = input.readUInt32(); + // uniqueId + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // equipAvatarId + equipAvatarId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 120) { @@ -671,17 +671,17 @@ public final class RelicOuterClass { } } case 120: { - // equipAvatarId - equipAvatarId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { - // isDiscarded - isDiscarded = input.readBool(); + case 64: { + // isProtected + isProtected = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 88) { @@ -689,15 +689,15 @@ public final class RelicOuterClass { } } case 88: { - // isProtected - isProtected = input.readBool(); + // isDiscarded + isDiscarded = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 114) { + if (tag != 98) { break; } } - case 114: { + case 98: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000100; @@ -732,19 +732,19 @@ public final class RelicOuterClass { output.writeUInt32(FieldNames.uniqueId, uniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeBool(FieldNames.isDiscarded, isDiscarded); + output.writeBool(FieldNames.isProtected, isProtected); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.isProtected, isProtected); + output.writeBool(FieldNames.isDiscarded, isDiscarded); } if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); @@ -794,11 +794,23 @@ public final class RelicOuterClass { } break; } + case 169047204: + case 33057906: { + if (input.isAtField(FieldNames.equipAvatarId)) { + if (!input.trySkipNullValue()) { + equipAvatarId = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } case 114831: { if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { tid = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -809,18 +821,6 @@ public final class RelicOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { - if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -828,23 +828,23 @@ public final class RelicOuterClass { } break; } - case 1044162483: - case -1445363480: { - if (input.isAtField(FieldNames.isDiscarded)) { - if (!input.trySkipNullValue()) { - isDiscarded = input.readBool(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case 569879972: case -1919645991: { if (input.isAtField(FieldNames.isProtected)) { if (!input.trySkipNullValue()) { isProtected = input.readBool(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1044162483: + case -1445363480: { + if (input.isAtField(FieldNames.isDiscarded)) { + if (!input.trySkipNullValue()) { + isDiscarded = input.readBool(); bitField0_ |= 0x00000080; } } else { @@ -922,16 +922,16 @@ public final class RelicOuterClass { static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); + static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName tid = FieldName.forField("tid"); static final FieldName level = FieldName.forField("level"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); static final FieldName isDiscarded = FieldName.forField("isDiscarded", "is_discarded"); - static final FieldName isProtected = FieldName.forField("isProtected", "is_protected"); - static final FieldName subAffixList = FieldName.forField("subAffixList", "sub_affix_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java index fce738a..e20d4cb 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java @@ -19,12 +19,12 @@ public final class RelicParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 13; + * optional uint32 slot = 10; */ private int slot; /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 11; */ private int relicUniqueId; @@ -39,7 +39,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 13; + * optional uint32 slot = 10; * @return whether the slot field is set */ public boolean hasSlot() { @@ -47,7 +47,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 13; + * optional uint32 slot = 10; * @return this */ public RelicParam clearSlot() { @@ -57,7 +57,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 13; + * optional uint32 slot = 10; * @return the slot */ public int getSlot() { @@ -65,7 +65,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 slot = 13; + * optional uint32 slot = 10; * @param value the slot to set * @return this */ @@ -76,7 +76,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 11; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -84,7 +84,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 11; * @return this */ public RelicParam clearRelicUniqueId() { @@ -94,7 +94,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 11; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,7 +102,7 @@ public final class RelicParamOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 11; * @param value the relicUniqueId to set * @return this */ @@ -177,11 +177,11 @@ public final class RelicParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(relicUniqueId); } } @@ -205,16 +205,16 @@ public final class RelicParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 80: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java new file mode 100644 index 0000000..9608440 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RelicRecommendCsReqOuterClass.java @@ -0,0 +1,260 @@ +// 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 RelicRecommendCsReqOuterClass { + /** + * Protobuf type {@code RelicRecommendCsReq} + */ + public static final class RelicRecommendCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 avatar_id = 2; + */ + private int avatarId; + + private RelicRecommendCsReq() { + } + + /** + * @return a new empty instance of {@code RelicRecommendCsReq} + */ + public static RelicRecommendCsReq newInstance() { + return new RelicRecommendCsReq(); + } + + /** + * optional uint32 avatar_id = 2; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 avatar_id = 2; + * @return this + */ + public RelicRecommendCsReq clearAvatarId() { + bitField0_ &= ~0x00000001; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 2; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 2; + * @param value the avatarId to set + * @return this + */ + public RelicRecommendCsReq setAvatarId(final int value) { + bitField0_ |= 0x00000001; + avatarId = value; + return this; + } + + @Override + public RelicRecommendCsReq copyFrom(final RelicRecommendCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + avatarId = other.avatarId; + } + return this; + } + + @Override + public RelicRecommendCsReq mergeFrom(final RelicRecommendCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } + return this; + } + + @Override + public RelicRecommendCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + avatarId = 0; + return this; + } + + @Override + public RelicRecommendCsReq 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 RelicRecommendCsReq)) { + return false; + } + RelicRecommendCsReq other = (RelicRecommendCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasAvatarId() || avatarId == other.avatarId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(avatarId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RelicRecommendCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // avatarId + avatarId = input.readUInt32(); + bitField0_ |= 0x00000001; + 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.avatarId, avatarId); + } + output.endObject(); + } + + @Override + public RelicRecommendCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + avatarId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RelicRecommendCsReq clone() { + return new RelicRecommendCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RelicRecommendCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RelicRecommendCsReq(), data).checkInitialized(); + } + + public static RelicRecommendCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicRecommendCsReq(), input).checkInitialized(); + } + + public static RelicRecommendCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicRecommendCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating RelicRecommendCsReq messages + */ + public static MessageFactory getFactory() { + return RelicRecommendCsReqFactory.INSTANCE; + } + + private enum RelicRecommendCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public RelicRecommendCsReq create() { + return RelicRecommendCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java new file mode 100644 index 0000000..316c11f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RelicRecommendScRspOuterClass.java @@ -0,0 +1,340 @@ +// 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 RelicRecommendScRspOuterClass { + /** + * Protobuf type {@code RelicRecommendScRsp} + */ + public static final class RelicRecommendScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 6; + */ + private int retcode; + + /** + * optional uint32 avatar_id = 11; + */ + private int avatarId; + + private RelicRecommendScRsp() { + } + + /** + * @return a new empty instance of {@code RelicRecommendScRsp} + */ + public static RelicRecommendScRsp newInstance() { + return new RelicRecommendScRsp(); + } + + /** + * optional uint32 retcode = 6; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 6; + * @return this + */ + public RelicRecommendScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 6; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 6; + * @param value the retcode to set + * @return this + */ + public RelicRecommendScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional uint32 avatar_id = 11; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 11; + * @return this + */ + public RelicRecommendScRsp clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 11; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 11; + * @param value the avatarId to set + * @return this + */ + public RelicRecommendScRsp setAvatarId(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + + @Override + public RelicRecommendScRsp copyFrom(final RelicRecommendScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + avatarId = other.avatarId; + } + return this; + } + + @Override + public RelicRecommendScRsp mergeFrom(final RelicRecommendScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } + return this; + } + + @Override + public RelicRecommendScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + avatarId = 0; + return this; + } + + @Override + public RelicRecommendScRsp 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 RelicRecommendScRsp)) { + return false; + } + RelicRecommendScRsp other = (RelicRecommendScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasAvatarId() || avatarId == other.avatarId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(avatarId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RelicRecommendScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 48: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // avatarId + avatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + 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.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.avatarId, avatarId); + } + output.endObject(); + } + + @Override + public RelicRecommendScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + avatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RelicRecommendScRsp clone() { + return new RelicRecommendScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RelicRecommendScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RelicRecommendScRsp(), data).checkInitialized(); + } + + public static RelicRecommendScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicRecommendScRsp(), input).checkInitialized(); + } + + public static RelicRecommendScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RelicRecommendScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating RelicRecommendScRsp messages + */ + public static MessageFactory getFactory() { + return RelicRecommendScRspFactory.INSTANCE; + } + + private enum RelicRecommendScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public RelicRecommendScRsp create() { + return RelicRecommendScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java index c067e8b..bd6828a 100644 --- a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java @@ -20,32 +20,32 @@ public final class ReplaceLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 7; - */ - private int planeId; - - /** - * optional uint32 leader_slot = 12; - */ - private int leaderSlot; - - /** - * optional uint32 index = 15; + * optional uint32 index = 2; */ private int index; /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional uint32 plane_id = 3; + */ + private int planeId; + + /** + * optional uint32 leader_slot = 7; + */ + private int leaderSlot; + + /** + * optional .ExtraLineupType extra_lineup_type = 10; */ private int extraLineupType; /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 4; */ private boolean isVirtual; /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 14; */ private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory()); @@ -60,99 +60,25 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 7; - * @return whether the planeId field is set + * optional uint32 index = 2; + * @return whether the index field is set */ - public boolean hasPlaneId() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 7; - * @return this - */ - public ReplaceLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000001; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 7; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 7; - * @param value the planeId to set - * @return this - */ - public ReplaceLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000001; - planeId = value; - return this; - } - - /** - * optional uint32 leader_slot = 12; - * @return whether the leaderSlot field is set - */ - public boolean hasLeaderSlot() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 leader_slot = 12; - * @return this - */ - public ReplaceLineupCsReq clearLeaderSlot() { - bitField0_ &= ~0x00000002; - leaderSlot = 0; - return this; - } - - /** - * optional uint32 leader_slot = 12; - * @return the leaderSlot - */ - public int getLeaderSlot() { - return leaderSlot; - } - - /** - * optional uint32 leader_slot = 12; - * @param value the leaderSlot to set - * @return this - */ - public ReplaceLineupCsReq setLeaderSlot(final int value) { - bitField0_ |= 0x00000002; - leaderSlot = value; - return this; - } - - /** - * optional uint32 index = 15; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 index = 15; + * optional uint32 index = 2; * @return this */ public ReplaceLineupCsReq clearIndex() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 15; + * optional uint32 index = 2; * @return the index */ public int getIndex() { @@ -160,18 +86,92 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 index = 15; + * optional uint32 index = 2; * @param value the index to set * @return this */ public ReplaceLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; index = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional uint32 plane_id = 3; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 plane_id = 3; + * @return this + */ + public ReplaceLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000002; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 3; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 3; + * @param value the planeId to set + * @return this + */ + public ReplaceLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000002; + planeId = value; + return this; + } + + /** + * optional uint32 leader_slot = 7; + * @return whether the leaderSlot field is set + */ + public boolean hasLeaderSlot() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 leader_slot = 7; + * @return this + */ + public ReplaceLineupCsReq clearLeaderSlot() { + bitField0_ &= ~0x00000004; + leaderSlot = 0; + return this; + } + + /** + * optional uint32 leader_slot = 7; + * @return the leaderSlot + */ + public int getLeaderSlot() { + return leaderSlot; + } + + /** + * optional uint32 leader_slot = 7; + * @param value the leaderSlot to set + * @return this + */ + public ReplaceLineupCsReq setLeaderSlot(final int value) { + bitField0_ |= 0x00000004; + leaderSlot = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 10; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -179,7 +179,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional .ExtraLineupType extra_lineup_type = 10; * @return this */ public ReplaceLineupCsReq clearExtraLineupType() { @@ -189,7 +189,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional .ExtraLineupType extra_lineup_type = 10; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -222,7 +222,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional .ExtraLineupType extra_lineup_type = 10; * @param value the extraLineupType to set * @return this */ @@ -234,7 +234,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 4; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -242,7 +242,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 4; * @return this */ public ReplaceLineupCsReq clearIsVirtual() { @@ -252,7 +252,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 4; * @return the isVirtual */ public boolean getIsVirtual() { @@ -260,7 +260,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 4; * @param value the isVirtual to set * @return this */ @@ -271,7 +271,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 14; * @return whether the slots field is set */ public boolean hasSlots() { @@ -279,7 +279,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 14; * @return this */ public ReplaceLineupCsReq clearSlots() { @@ -289,7 +289,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 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. @@ -303,7 +303,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 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 @@ -317,7 +317,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 14; * @param value the slots to add * @return this */ @@ -328,7 +328,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 3; + * repeated .LineupSlotData slots = 14; * @param values the slots to add * @return this */ @@ -343,9 +343,9 @@ public final class ReplaceLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + index = other.index; planeId = other.planeId; leaderSlot = other.leaderSlot; - index = other.index; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; slots.copyFrom(other.slots); @@ -359,15 +359,15 @@ public final class ReplaceLineupCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasPlaneId()) { setPlaneId(other.planeId); } if (other.hasLeaderSlot()) { setLeaderSlot(other.leaderSlot); } - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -387,9 +387,9 @@ public final class ReplaceLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + index = 0; planeId = 0; leaderSlot = 0; - index = 0; extraLineupType = 0; isVirtual = false; slots.clear(); @@ -417,9 +417,9 @@ public final class ReplaceLineupCsReqOuterClass { } ReplaceLineupCsReq other = (ReplaceLineupCsReq) o; return bitField0_ == other.bitField0_ + && (!hasIndex() || index == other.index) && (!hasPlaneId() || planeId == other.planeId) && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) - && (!hasIndex() || index == other.index) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasSlots() || slots.equals(other.slots)); @@ -428,28 +428,28 @@ public final class ReplaceLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(leaderSlot); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(index); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(planeId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(leaderSlot); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < slots.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 114); output.writeMessageNoTag(slots.get(i)); } } @@ -459,13 +459,13 @@ public final class ReplaceLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -486,34 +486,34 @@ public final class ReplaceLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // leaderSlot - leaderSlot = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 16: { // index index = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 24) { break; } } - case 72: { + case 24: { + // planeId + planeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // leaderSlot + leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -521,20 +521,20 @@ public final class ReplaceLineupCsReqOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { + case 32: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 26) { + if (tag != 114) { break; } } - case 26: { + case 114: { // slots tag = input.readRepeatedMessage(slots, tag); bitField0_ |= 0x00000020; @@ -560,13 +560,13 @@ public final class ReplaceLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -587,12 +587,23 @@ public final class ReplaceLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { + if (!input.trySkipNullValue()) { + index = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -493896553: case 1869097438: { if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { planeId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -604,17 +615,6 @@ public final class ReplaceLineupCsReqOuterClass { if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { leaderSlot = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100346066: { - if (input.isAtField(FieldNames.index)) { - if (!input.trySkipNullValue()) { - index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -715,12 +715,12 @@ public final class ReplaceLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName index = FieldName.forField("index"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); - static final FieldName index = FieldName.forField("index"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); static final FieldName isVirtual = FieldName.forField("isVirtual", "is_virtual"); diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java index 8bc15c9..5b35ff6 100644 --- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 13; + * optional uint32 num = 6; */ private int num; @@ -34,7 +34,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 6; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 6; * @return this */ public ReserveStaminaExchangeCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 6; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 6; * @param value the num to set * @return this */ @@ -129,7 +129,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 48: { // num num = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java index 83a7f24..f22159c 100644 --- a/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ReserveStaminaExchangeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ReserveStaminaExchangeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 num = 14; + * optional uint32 num = 13; */ private int num; @@ -39,7 +39,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return this */ public ReserveStaminaExchangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return this */ public ReserveStaminaExchangeScRsp clearNum() { @@ -94,7 +94,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 13; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public final class ReserveStaminaExchangeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class ReserveStaminaExchangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { + case 104: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java index d23c7a9..a44c9e3 100644 --- a/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RevcMsgScNotifyOuterClass.java @@ -20,32 +20,32 @@ public final class RevcMsgScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 emote = 7; - */ - private int emote; - - /** - * optional uint32 to_uid = 11; - */ - private int toUid; - - /** - * optional uint32 from_uid = 15; + * optional uint32 from_uid = 4; */ private int fromUid; /** - * optional .ChatType chat_type = 4; + * optional uint32 to_uid = 7; + */ + private int toUid; + + /** + * optional uint32 emote = 8; + */ + private int emote; + + /** + * optional .ChatType chat_type = 6; */ private int chatType; /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 11; */ private int msgType; /** - * optional string text = 6; + * optional string text = 10; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -60,44 +60,44 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 7; - * @return whether the emote field is set + * optional uint32 from_uid = 4; + * @return whether the fromUid field is set */ - public boolean hasEmote() { + public boolean hasFromUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 emote = 7; + * optional uint32 from_uid = 4; * @return this */ - public RevcMsgScNotify clearEmote() { + public RevcMsgScNotify clearFromUid() { bitField0_ &= ~0x00000001; - emote = 0; + fromUid = 0; return this; } /** - * optional uint32 emote = 7; - * @return the emote + * optional uint32 from_uid = 4; + * @return the fromUid */ - public int getEmote() { - return emote; + public int getFromUid() { + return fromUid; } /** - * optional uint32 emote = 7; - * @param value the emote to set + * optional uint32 from_uid = 4; + * @param value the fromUid to set * @return this */ - public RevcMsgScNotify setEmote(final int value) { + public RevcMsgScNotify setFromUid(final int value) { bitField0_ |= 0x00000001; - emote = value; + fromUid = value; return this; } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 7; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -105,7 +105,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 7; * @return this */ public RevcMsgScNotify clearToUid() { @@ -115,7 +115,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 7; * @return the toUid */ public int getToUid() { @@ -123,7 +123,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 11; + * optional uint32 to_uid = 7; * @param value the toUid to set * @return this */ @@ -134,44 +134,44 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 15; - * @return whether the fromUid field is set + * optional uint32 emote = 8; + * @return whether the emote field is set */ - public boolean hasFromUid() { + public boolean hasEmote() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 from_uid = 15; + * optional uint32 emote = 8; * @return this */ - public RevcMsgScNotify clearFromUid() { + public RevcMsgScNotify clearEmote() { bitField0_ &= ~0x00000004; - fromUid = 0; + emote = 0; return this; } /** - * optional uint32 from_uid = 15; - * @return the fromUid + * optional uint32 emote = 8; + * @return the emote */ - public int getFromUid() { - return fromUid; + public int getEmote() { + return emote; } /** - * optional uint32 from_uid = 15; - * @param value the fromUid to set + * optional uint32 emote = 8; + * @param value the emote to set * @return this */ - public RevcMsgScNotify setFromUid(final int value) { + public RevcMsgScNotify setEmote(final int value) { bitField0_ |= 0x00000004; - fromUid = value; + emote = value; return this; } /** - * optional .ChatType chat_type = 4; + * optional .ChatType chat_type = 6; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -179,7 +179,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 4; + * optional .ChatType chat_type = 6; * @return this */ public RevcMsgScNotify clearChatType() { @@ -189,7 +189,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 4; + * optional .ChatType chat_type = 6; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -222,7 +222,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 4; + * optional .ChatType chat_type = 6; * @param value the chatType to set * @return this */ @@ -233,7 +233,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 11; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -241,7 +241,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 11; * @return this */ public RevcMsgScNotify clearMsgType() { @@ -251,7 +251,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 11; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -284,7 +284,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 8; + * optional .MsgType msg_type = 11; * @param value the msgType to set * @return this */ @@ -295,7 +295,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @return whether the text field is set */ public boolean hasText() { @@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @return this */ public RevcMsgScNotify clearText() { @@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @return the text */ public String getText() { @@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @param value the text to set * @return this */ @@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 6; + * optional string text = 10; * @param value the text to set * @return this */ @@ -364,9 +364,9 @@ public final class RevcMsgScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - emote = other.emote; - toUid = other.toUid; fromUid = other.fromUid; + toUid = other.toUid; + emote = other.emote; chatType = other.chatType; msgType = other.msgType; text.copyFrom(other.text); @@ -380,14 +380,14 @@ public final class RevcMsgScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasEmote()) { - setEmote(other.emote); + if (other.hasFromUid()) { + setFromUid(other.fromUid); } if (other.hasToUid()) { setToUid(other.toUid); } - if (other.hasFromUid()) { - setFromUid(other.fromUid); + if (other.hasEmote()) { + setEmote(other.emote); } if (other.hasChatType()) { setChatTypeValue(other.chatType); @@ -408,9 +408,9 @@ public final class RevcMsgScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - emote = 0; - toUid = 0; fromUid = 0; + toUid = 0; + emote = 0; chatType = 0; msgType = 0; text.clear(); @@ -438,9 +438,9 @@ public final class RevcMsgScNotifyOuterClass { } RevcMsgScNotify other = (RevcMsgScNotify) o; return bitField0_ == other.bitField0_ - && (!hasEmote() || emote == other.emote) - && (!hasToUid() || toUid == other.toUid) && (!hasFromUid() || fromUid == other.fromUid) + && (!hasToUid() || toUid == other.toUid) + && (!hasEmote() || emote == other.emote) && (!hasChatType() || chatType == other.chatType) && (!hasMsgType() || msgType == other.msgType) && (!hasText() || text.equals(other.text)); @@ -449,27 +449,27 @@ public final class RevcMsgScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(emote); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(fromUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(fromUid); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 48); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 82); output.writeStringNoTag(text); } } @@ -478,13 +478,13 @@ public final class RevcMsgScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fromUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); @@ -505,34 +505,34 @@ public final class RevcMsgScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // emote - emote = input.readUInt32(); + case 32: { + // fromUid + fromUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { + case 56: { // toUid toUid = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { - // fromUid - fromUid = input.readUInt32(); + case 64: { + // emote + emote = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 32) { + if (tag != 48) { break; } } - case 32: { + case 48: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { @@ -540,11 +540,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // msgType final int value = input.readInt32(); if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { @@ -552,11 +552,11 @@ public final class RevcMsgScNotifyOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 50) { + if (tag != 82) { break; } } - case 50: { + case 82: { // text input.readString(text); bitField0_ |= 0x00000020; @@ -583,13 +583,13 @@ public final class RevcMsgScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.emote, emote); + output.writeUInt32(FieldNames.fromUid, fromUid); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.fromUid, fromUid); + output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); @@ -610,10 +610,11 @@ public final class RevcMsgScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 96633208: { - if (input.isAtField(FieldNames.emote)) { + case -594338746: + case -1244322245: { + if (input.isAtField(FieldNames.fromUid)) { if (!input.trySkipNullValue()) { - emote = input.readUInt32(); + fromUid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -633,11 +634,10 @@ public final class RevcMsgScNotifyOuterClass { } break; } - case -594338746: - case -1244322245: { - if (input.isAtField(FieldNames.fromUid)) { + case 96633208: { + if (input.isAtField(FieldNames.emote)) { if (!input.trySkipNullValue()) { - fromUid = input.readUInt32(); + emote = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -743,11 +743,11 @@ public final class RevcMsgScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName emote = FieldName.forField("emote"); + static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); static final FieldName toUid = FieldName.forField("toUid", "to_uid"); - static final FieldName fromUid = FieldName.forField("fromUid", "from_uid"); + static final FieldName emote = FieldName.forField("emote"); static final FieldName chatType = FieldName.forField("chatType", "chat_type"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java index c9f64dc..2feeb7a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java @@ -19,12 +19,7 @@ public final class RogueActionOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - */ - private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); - - /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; + * optional .RogueBonusSelectInfo bonus_select_info = 240; */ private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance(); @@ -37,6 +32,11 @@ public final class RogueActionOuterClass { */ private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + */ + private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); + private RogueAction() { } @@ -53,115 +53,54 @@ public final class RogueActionOuterClass { public RogueAction clearAction() { if (hasAction()) { - clearBuffSelectInfo(); clearBonusSelectInfo(); clearMiracleSelectInfo(); + clearBuffSelectInfo(); } return this; } - private void clearActionOtherBuffSelectInfo() { - if ((((bitField0_ & 0x00000006)) != 0)) { - clearBonusSelectInfo(); - clearMiracleSelectInfo(); - } - } - private void clearActionOtherBonusSelectInfo() { - if ((((bitField0_ & 0x00000005)) != 0)) { - clearBuffSelectInfo(); + if ((((bitField0_ & 0x00000006)) != 0)) { clearMiracleSelectInfo(); + clearBuffSelectInfo(); } } private void clearActionOtherMiracleSelectInfo() { - if ((((bitField0_ & 0x00000003)) != 0)) { - clearBuffSelectInfo(); + if ((((bitField0_ & 0x00000005)) != 0)) { clearBonusSelectInfo(); + clearBuffSelectInfo(); + } + } + + private void clearActionOtherBuffSelectInfo() { + if ((((bitField0_ & 0x00000003)) != 0)) { + clearBonusSelectInfo(); + clearMiracleSelectInfo(); } } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - * @return whether the buffSelectInfo field is set + * optional .RogueBonusSelectInfo bonus_select_info = 240; + * @return whether the bonusSelectInfo field is set */ - public boolean hasBuffSelectInfo() { + public boolean hasBonusSelectInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - * @return this - */ - public RogueAction clearBuffSelectInfo() { - bitField0_ &= ~0x00000001; - buffSelectInfo.clear(); - return this; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - * - * 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 #getMutableBuffSelectInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getBuffSelectInfo() { - return buffSelectInfo; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - * - * 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 RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getMutableBuffSelectInfo( - ) { - clearActionOtherBuffSelectInfo(); - bitField0_ |= 0x00000001; - return buffSelectInfo; - } - - /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 216; - * @param value the buffSelectInfo to set - * @return this - */ - public RogueAction setBuffSelectInfo( - final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo value) { - clearActionOtherBuffSelectInfo(); - bitField0_ |= 0x00000001; - buffSelectInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; - * @return whether the bonusSelectInfo field is set - */ - public boolean hasBonusSelectInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; + * optional .RogueBonusSelectInfo bonus_select_info = 240; * @return this */ public RogueAction clearBonusSelectInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; bonusSelectInfo.clear(); return this; } /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; + * optional .RogueBonusSelectInfo bonus_select_info = 240; * * 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. @@ -175,7 +114,7 @@ public final class RogueActionOuterClass { } /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; + * optional .RogueBonusSelectInfo bonus_select_info = 240; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -185,19 +124,19 @@ public final class RogueActionOuterClass { */ public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getMutableBonusSelectInfo() { clearActionOtherBonusSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return bonusSelectInfo; } /** - * optional .RogueBonusSelectInfo bonus_select_info = 388; + * optional .RogueBonusSelectInfo bonus_select_info = 240; * @param value the bonusSelectInfo to set * @return this */ public RogueAction setBonusSelectInfo( final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo value) { clearActionOtherBonusSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; bonusSelectInfo.copyFrom(value); return this; } @@ -211,7 +150,7 @@ public final class RogueActionOuterClass { * @return whether the miracleSelectInfo field is set */ public boolean hasMiracleSelectInfo() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -223,7 +162,7 @@ public final class RogueActionOuterClass { * @return this */ public RogueAction clearMiracleSelectInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; miracleSelectInfo.clear(); return this; } @@ -261,7 +200,7 @@ public final class RogueActionOuterClass { */ public RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo getMutableMiracleSelectInfo() { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return miracleSelectInfo; } @@ -277,19 +216,80 @@ public final class RogueActionOuterClass { public RogueAction setMiracleSelectInfo( final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo value) { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; miracleSelectInfo.copyFrom(value); return this; } + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * @return whether the buffSelectInfo field is set + */ + public boolean hasBuffSelectInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * @return this + */ + public RogueAction clearBuffSelectInfo() { + bitField0_ &= ~0x00000004; + buffSelectInfo.clear(); + return this; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * + * 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 #getMutableBuffSelectInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getBuffSelectInfo() { + return buffSelectInfo; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * + * 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 RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo getMutableBuffSelectInfo( + ) { + clearActionOtherBuffSelectInfo(); + bitField0_ |= 0x00000004; + return buffSelectInfo; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 820; + * @param value the buffSelectInfo to set + * @return this + */ + public RogueAction setBuffSelectInfo( + final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo value) { + clearActionOtherBuffSelectInfo(); + bitField0_ |= 0x00000004; + buffSelectInfo.copyFrom(value); + return this; + } + @Override public RogueAction copyFrom(final RogueAction other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffSelectInfo.copyFrom(other.buffSelectInfo); bonusSelectInfo.copyFrom(other.bonusSelectInfo); miracleSelectInfo.copyFrom(other.miracleSelectInfo); + buffSelectInfo.copyFrom(other.buffSelectInfo); } return this; } @@ -300,15 +300,15 @@ public final class RogueActionOuterClass { return this; } cachedSize = -1; - if (other.hasBuffSelectInfo()) { - getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); - } if (other.hasBonusSelectInfo()) { getMutableBonusSelectInfo().mergeFrom(other.bonusSelectInfo); } if (other.hasMiracleSelectInfo()) { getMutableMiracleSelectInfo().mergeFrom(other.miracleSelectInfo); } + if (other.hasBuffSelectInfo()) { + getMutableBuffSelectInfo().mergeFrom(other.buffSelectInfo); + } return this; } @@ -319,9 +319,9 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; - buffSelectInfo.clear(); bonusSelectInfo.clear(); miracleSelectInfo.clear(); + buffSelectInfo.clear(); return this; } @@ -332,9 +332,9 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; - buffSelectInfo.clearQuick(); bonusSelectInfo.clearQuick(); miracleSelectInfo.clearQuick(); + buffSelectInfo.clearQuick(); return this; } @@ -348,39 +348,39 @@ public final class RogueActionOuterClass { } RogueAction other = (RogueAction) o; return bitField0_ == other.bitField0_ - && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)) && (!hasBonusSelectInfo() || bonusSelectInfo.equals(other.bonusSelectInfo)) - && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)); + && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)) + && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 3522); - output.writeMessageNoTag(buffSelectInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 6306); + output.writeRawLittleEndian16((short) 3970); output.writeMessageNoTag(bonusSelectInfo); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawLittleEndian16((short) 8442); output.writeMessageNoTag(miracleSelectInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawLittleEndian16((short) 13218); + output.writeMessageNoTag(buffSelectInfo); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); - } - if ((bitField0_ & 0x00000002) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } + if ((bitField0_ & 0x00000004) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); + } return size; } @@ -391,21 +391,11 @@ public final class RogueActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 1730: { - // buffSelectInfo - clearActionOtherBuffSelectInfo(); - input.readMessage(buffSelectInfo); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 3106) { - break; - } - } - case 3106: { + case 1922: { // bonusSelectInfo clearActionOtherBonusSelectInfo(); input.readMessage(bonusSelectInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 4218) { break; @@ -415,6 +405,16 @@ public final class RogueActionOuterClass { // miracleSelectInfo clearActionOtherMiracleSelectInfo(); input.readMessage(miracleSelectInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 6562) { + break; + } + } + case 6562: { + // buffSelectInfo + clearActionOtherBuffSelectInfo(); + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -439,14 +439,14 @@ public final class RogueActionOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.bonusSelectInfo, bonusSelectInfo); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); + } output.endObject(); } @@ -457,26 +457,13 @@ public final class RogueActionOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -255242115: - case 1500540965: { - if (input.isAtField(FieldNames.buffSelectInfo)) { - if (!input.trySkipNullValue()) { - clearActionOtherBuffSelectInfo(); - input.readMessage(buffSelectInfo); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1283182921: case -1836716559: { if (input.isAtField(FieldNames.bonusSelectInfo)) { if (!input.trySkipNullValue()) { clearActionOtherBonusSelectInfo(); input.readMessage(bonusSelectInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -489,6 +476,19 @@ public final class RogueActionOuterClass { if (!input.trySkipNullValue()) { clearActionOtherMiracleSelectInfo(); input.readMessage(miracleSelectInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -255242115: + case 1500540965: { + if (input.isAtField(FieldNames.buffSelectInfo)) { + if (!input.trySkipNullValue()) { + clearActionOtherBuffSelectInfo(); + input.readMessage(buffSelectInfo); bitField0_ |= 0x00000004; } } else { @@ -548,11 +548,11 @@ public final class RogueActionOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); - static final FieldName bonusSelectInfo = FieldName.forField("bonusSelectInfo", "bonus_select_info"); static final FieldName miracleSelectInfo = FieldName.forField("miracleSelectInfo", "miracle_select_info"); + + static final FieldName buffSelectInfo = FieldName.forField("buffSelectInfo", "buff_select_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java index b6e184d..de64c07 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultDataOuterClass.java @@ -19,27 +19,31 @@ public final class RogueActionResultDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueVirtualItemData add_item_list = 11; - */ - private final RogueVirtualItemDataOuterClass.RogueVirtualItemData addItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); - - /** - * optional .RogueVirtualItemData remove_item_list = 14; + * optional .RogueVirtualItemData remove_item_list = 2; */ private final RogueVirtualItemDataOuterClass.RogueVirtualItemData removeItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); /** - * optional .RogueMiracleData add_miracle_list = 516; + * optional .RogueVirtualItemData add_item_list = 6; + */ + private final RogueVirtualItemDataOuterClass.RogueVirtualItemData addItemList = RogueVirtualItemDataOuterClass.RogueVirtualItemData.newInstance(); + + /** + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; */ private final RogueMiracleDataOuterClass.RogueMiracleData addMiracleList = RogueMiracleDataOuterClass.RogueMiracleData.newInstance(); /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; */ private final RogueBuffDataOuterClass.RogueBuffData removeBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance(); /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; */ private final RogueBuffDataOuterClass.RogueBuffData addBuffList = RogueBuffDataOuterClass.RogueBuffData.newInstance(); @@ -59,8 +63,8 @@ public final class RogueActionResultDataOuterClass { public RogueActionResultData clearResultAction() { if (hasResultAction()) { - clearAddItemList(); clearRemoveItemList(); + clearAddItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); @@ -68,18 +72,18 @@ public final class RogueActionResultDataOuterClass { return this; } - private void clearResultActionOtherAddItemList() { + private void clearResultActionOtherRemoveItemList() { if ((((bitField0_ & 0x0000001e)) != 0)) { - clearRemoveItemList(); + clearAddItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); } } - private void clearResultActionOtherRemoveItemList() { + private void clearResultActionOtherAddItemList() { if ((((bitField0_ & 0x0000001d)) != 0)) { - clearAddItemList(); + clearRemoveItemList(); clearAddMiracleList(); clearRemoveBuffList(); clearAddBuffList(); @@ -88,8 +92,8 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherAddMiracleList() { if ((((bitField0_ & 0x0000001b)) != 0)) { - clearAddItemList(); clearRemoveItemList(); + clearAddItemList(); clearRemoveBuffList(); clearAddBuffList(); } @@ -97,8 +101,8 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherRemoveBuffList() { if ((((bitField0_ & 0x00000017)) != 0)) { - clearAddItemList(); clearRemoveItemList(); + clearAddItemList(); clearAddMiracleList(); clearAddBuffList(); } @@ -106,93 +110,33 @@ public final class RogueActionResultDataOuterClass { private void clearResultActionOtherAddBuffList() { if ((((bitField0_ & 0x0000000f)) != 0)) { - clearAddItemList(); clearRemoveItemList(); + clearAddItemList(); clearAddMiracleList(); clearRemoveBuffList(); } } /** - * optional .RogueVirtualItemData add_item_list = 11; - * @return whether the addItemList field is set + * optional .RogueVirtualItemData remove_item_list = 2; + * @return whether the removeItemList field is set */ - public boolean hasAddItemList() { + public boolean hasRemoveItemList() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueVirtualItemData add_item_list = 11; - * @return this - */ - public RogueActionResultData clearAddItemList() { - bitField0_ &= ~0x00000001; - addItemList.clear(); - return this; - } - - /** - * optional .RogueVirtualItemData add_item_list = 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 #getMutableAddItemList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueVirtualItemDataOuterClass.RogueVirtualItemData getAddItemList() { - return addItemList; - } - - /** - * optional .RogueVirtualItemData add_item_list = 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableAddItemList() { - clearResultActionOtherAddItemList(); - bitField0_ |= 0x00000001; - return addItemList; - } - - /** - * optional .RogueVirtualItemData add_item_list = 11; - * @param value the addItemList to set - * @return this - */ - public RogueActionResultData setAddItemList( - final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { - clearResultActionOtherAddItemList(); - bitField0_ |= 0x00000001; - addItemList.copyFrom(value); - return this; - } - - /** - * optional .RogueVirtualItemData remove_item_list = 14; - * @return whether the removeItemList field is set - */ - public boolean hasRemoveItemList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueVirtualItemData remove_item_list = 14; + * optional .RogueVirtualItemData remove_item_list = 2; * @return this */ public RogueActionResultData clearRemoveItemList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; removeItemList.clear(); return this; } /** - * optional .RogueVirtualItemData remove_item_list = 14; + * optional .RogueVirtualItemData remove_item_list = 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. @@ -206,7 +150,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueVirtualItemData remove_item_list = 14; + * optional .RogueVirtualItemData remove_item_list = 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 @@ -216,25 +160,89 @@ public final class RogueActionResultDataOuterClass { */ public RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableRemoveItemList() { clearResultActionOtherRemoveItemList(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return removeItemList; } /** - * optional .RogueVirtualItemData remove_item_list = 14; + * optional .RogueVirtualItemData remove_item_list = 2; * @param value the removeItemList to set * @return this */ public RogueActionResultData setRemoveItemList( final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { clearResultActionOtherRemoveItemList(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; removeItemList.copyFrom(value); return this; } /** - * optional .RogueMiracleData add_miracle_list = 516; + * optional .RogueVirtualItemData add_item_list = 6; + * @return whether the addItemList field is set + */ + public boolean hasAddItemList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueVirtualItemData add_item_list = 6; + * @return this + */ + public RogueActionResultData clearAddItemList() { + bitField0_ &= ~0x00000002; + addItemList.clear(); + return this; + } + + /** + * optional .RogueVirtualItemData add_item_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 #getMutableAddItemList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueVirtualItemDataOuterClass.RogueVirtualItemData getAddItemList() { + return addItemList; + } + + /** + * optional .RogueVirtualItemData add_item_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 RogueVirtualItemDataOuterClass.RogueVirtualItemData getMutableAddItemList() { + clearResultActionOtherAddItemList(); + bitField0_ |= 0x00000002; + return addItemList; + } + + /** + * optional .RogueVirtualItemData add_item_list = 6; + * @param value the addItemList to set + * @return this + */ + public RogueActionResultData setAddItemList( + final RogueVirtualItemDataOuterClass.RogueVirtualItemData value) { + clearResultActionOtherAddItemList(); + bitField0_ |= 0x00000002; + addItemList.copyFrom(value); + return this; + } + + /** + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; * @return whether the addMiracleList field is set */ public boolean hasAddMiracleList() { @@ -242,7 +250,11 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueMiracleData add_miracle_list = 516; + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; * @return this */ public RogueActionResultData clearAddMiracleList() { @@ -252,7 +264,11 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueMiracleData add_miracle_list = 516; + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; * * 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. @@ -266,7 +282,11 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueMiracleData add_miracle_list = 516; + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -281,7 +301,11 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueMiracleData add_miracle_list = 516; + * 
+     *  1263, 217 or 265
+     *
+ * + * optional .RogueMiracleData add_miracle_list = 217; * @param value the addMiracleList to set * @return this */ @@ -294,7 +318,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; * @return whether the removeBuffList field is set */ public boolean hasRemoveBuffList() { @@ -302,7 +326,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; * @return this */ public RogueActionResultData clearRemoveBuffList() { @@ -312,7 +336,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; * * 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. @@ -326,7 +350,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -341,7 +365,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData remove_buff_list = 1574; + * optional .RogueBuffData remove_buff_list = 1544; * @param value the removeBuffList to set * @return this */ @@ -354,7 +378,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; * @return whether the addBuffList field is set */ public boolean hasAddBuffList() { @@ -362,7 +386,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; * @return this */ public RogueActionResultData clearAddBuffList() { @@ -372,7 +396,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; * * 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. @@ -386,7 +410,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -401,7 +425,7 @@ public final class RogueActionResultDataOuterClass { } /** - * optional .RogueBuffData add_buff_list = 1586; + * optional .RogueBuffData add_buff_list = 1884; * @param value the addBuffList to set * @return this */ @@ -417,8 +441,8 @@ public final class RogueActionResultDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - addItemList.copyFrom(other.addItemList); removeItemList.copyFrom(other.removeItemList); + addItemList.copyFrom(other.addItemList); addMiracleList.copyFrom(other.addMiracleList); removeBuffList.copyFrom(other.removeBuffList); addBuffList.copyFrom(other.addBuffList); @@ -432,12 +456,12 @@ public final class RogueActionResultDataOuterClass { return this; } cachedSize = -1; - if (other.hasAddItemList()) { - getMutableAddItemList().mergeFrom(other.addItemList); - } if (other.hasRemoveItemList()) { getMutableRemoveItemList().mergeFrom(other.removeItemList); } + if (other.hasAddItemList()) { + getMutableAddItemList().mergeFrom(other.addItemList); + } if (other.hasAddMiracleList()) { getMutableAddMiracleList().mergeFrom(other.addMiracleList); } @@ -457,8 +481,8 @@ public final class RogueActionResultDataOuterClass { } cachedSize = -1; bitField0_ = 0; - addItemList.clear(); removeItemList.clear(); + addItemList.clear(); addMiracleList.clear(); removeBuffList.clear(); addBuffList.clear(); @@ -472,8 +496,8 @@ public final class RogueActionResultDataOuterClass { } cachedSize = -1; bitField0_ = 0; - addItemList.clearQuick(); removeItemList.clearQuick(); + addItemList.clearQuick(); addMiracleList.clearQuick(); removeBuffList.clearQuick(); addBuffList.clearQuick(); @@ -490,8 +514,8 @@ public final class RogueActionResultDataOuterClass { } RogueActionResultData other = (RogueActionResultData) o; return bitField0_ == other.bitField0_ - && (!hasAddItemList() || addItemList.equals(other.addItemList)) && (!hasRemoveItemList() || removeItemList.equals(other.removeItemList)) + && (!hasAddItemList() || addItemList.equals(other.addItemList)) && (!hasAddMiracleList() || addMiracleList.equals(other.addMiracleList)) && (!hasRemoveBuffList() || removeBuffList.equals(other.removeBuffList)) && (!hasAddBuffList() || addBuffList.equals(other.addBuffList)); @@ -500,23 +524,23 @@ public final class RogueActionResultDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(addItemList); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 18); output.writeMessageNoTag(removeItemList); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(addItemList); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 8354); + output.writeRawLittleEndian16((short) 3530); output.writeMessageNoTag(addMiracleList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 25266); + output.writeRawLittleEndian16((short) 24770); output.writeMessageNoTag(removeBuffList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 25490); + output.writeRawLittleEndian16((short) 30178); output.writeMessageNoTag(addBuffList); } } @@ -525,10 +549,10 @@ public final class RogueActionResultDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(addItemList); + size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(removeItemList); + size += 1 + ProtoSink.computeMessageSizeNoTag(addItemList); } if ((bitField0_ & 0x00000004) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(addMiracleList); @@ -549,47 +573,47 @@ public final class RogueActionResultDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { - // addItemList - clearResultActionOtherAddItemList(); - input.readMessage(addItemList); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { + case 18: { // removeItemList clearResultActionOtherRemoveItemList(); input.readMessage(removeItemList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 4130) { + if (tag != 50) { break; } } - case 4130: { + case 50: { + // addItemList + clearResultActionOtherAddItemList(); + input.readMessage(addItemList); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 1738) { + break; + } + } + case 1738: { // addMiracleList clearResultActionOtherAddMiracleList(); input.readMessage(addMiracleList); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 12594) { + if (tag != 12354) { break; } } - case 12594: { + case 12354: { // removeBuffList clearResultActionOtherRemoveBuffList(); input.readMessage(removeBuffList); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 12690) { + if (tag != 15074) { break; } } - case 12690: { + case 15074: { // addBuffList clearResultActionOtherAddBuffList(); input.readMessage(addBuffList); @@ -617,10 +641,10 @@ public final class RogueActionResultDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.addItemList, addItemList); + output.writeMessage(FieldNames.removeItemList, removeItemList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.removeItemList, removeItemList); + output.writeMessage(FieldNames.addItemList, addItemList); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.addMiracleList, addMiracleList); @@ -641,12 +665,12 @@ public final class RogueActionResultDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 203000338: - case -1308770260: { - if (input.isAtField(FieldNames.addItemList)) { + case -417171723: + case -293666737: { + if (input.isAtField(FieldNames.removeItemList)) { if (!input.trySkipNullValue()) { - clearResultActionOtherAddItemList(); - input.readMessage(addItemList); + clearResultActionOtherRemoveItemList(); + input.readMessage(removeItemList); bitField0_ |= 0x00000001; } } else { @@ -654,12 +678,12 @@ public final class RogueActionResultDataOuterClass { } break; } - case -417171723: - case -293666737: { - if (input.isAtField(FieldNames.removeItemList)) { + case 203000338: + case -1308770260: { + if (input.isAtField(FieldNames.addItemList)) { if (!input.trySkipNullValue()) { - clearResultActionOtherRemoveItemList(); - input.readMessage(removeItemList); + clearResultActionOtherAddItemList(); + input.readMessage(addItemList); bitField0_ |= 0x00000002; } } else { @@ -759,10 +783,10 @@ public final class RogueActionResultDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName addItemList = FieldName.forField("addItemList", "add_item_list"); - static final FieldName removeItemList = FieldName.forField("removeItemList", "remove_item_list"); + static final FieldName addItemList = FieldName.forField("addItemList", "add_item_list"); + static final FieldName addMiracleList = FieldName.forField("addMiracleList", "add_miracle_list"); static final FieldName removeBuffList = FieldName.forField("removeBuffList", "remove_buff_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java index 91709e6..561da75 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionResultOuterClass.java @@ -19,12 +19,12 @@ public final class RogueActionResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueBuffSource source = 10; + * optional .RogueBuffSource source = 11; */ private int source; /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 4; */ private final RogueActionResultDataOuterClass.RogueActionResultData rogueAction = RogueActionResultDataOuterClass.RogueActionResultData.newInstance(); @@ -39,7 +39,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 10; + * optional .RogueBuffSource source = 11; * @return whether the source field is set */ public boolean hasSource() { @@ -47,7 +47,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 10; + * optional .RogueBuffSource source = 11; * @return this */ public RogueActionResult clearSource() { @@ -57,7 +57,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 10; + * optional .RogueBuffSource source = 11; * @return the source */ public RogueBuffSourceOuterClass.RogueBuffSource getSource() { @@ -90,7 +90,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueBuffSource source = 10; + * optional .RogueBuffSource source = 11; * @param value the source to set * @return this */ @@ -101,7 +101,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 4; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -109,7 +109,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 4; * @return this */ public RogueActionResult clearRogueAction() { @@ -119,7 +119,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 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. @@ -133,7 +133,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 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 @@ -147,7 +147,7 @@ public final class RogueActionResultOuterClass { } /** - * optional .RogueActionResultData rogue_action = 5; + * optional .RogueActionResultData rogue_action = 4; * @param value the rogueAction to set * @return this */ @@ -224,11 +224,11 @@ public final class RogueActionResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeEnumNoTag(source); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rogueAction); } } @@ -252,7 +252,7 @@ public final class RogueActionResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // source final int value = input.readInt32(); if (RogueBuffSourceOuterClass.RogueBuffSource.forNumber(value) != null) { @@ -260,11 +260,11 @@ public final class RogueActionResultOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 42) { + if (tag != 34) { break; } } - case 42: { + case 34: { // rogueAction input.readMessage(rogueAction); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index bc999f4..9b611eb 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java @@ -20,22 +20,22 @@ public final class RogueAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_aeon_enhance_num = 10; + * optional uint32 unlock_aeon_enhance_num = 9; */ private int unlockAeonEnhanceNum; /** - * optional uint32 unlock_aeon_num = 15; + * optional uint32 unlock_aeon_num = 10; */ private int unlockAeonNum; /** - * optional bool is_unlocked = 6; + * optional bool is_unlocked = 5; */ private boolean isUnlocked; /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_list = 7; */ private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance(); @@ -50,7 +50,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 10; + * optional uint32 unlock_aeon_enhance_num = 9; * @return whether the unlockAeonEnhanceNum field is set */ public boolean hasUnlockAeonEnhanceNum() { @@ -58,7 +58,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 10; + * optional uint32 unlock_aeon_enhance_num = 9; * @return this */ public RogueAeonInfo clearUnlockAeonEnhanceNum() { @@ -68,7 +68,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 10; + * optional uint32 unlock_aeon_enhance_num = 9; * @return the unlockAeonEnhanceNum */ public int getUnlockAeonEnhanceNum() { @@ -76,7 +76,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 10; + * optional uint32 unlock_aeon_enhance_num = 9; * @param value the unlockAeonEnhanceNum to set * @return this */ @@ -87,7 +87,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 15; + * optional uint32 unlock_aeon_num = 10; * @return whether the unlockAeonNum field is set */ public boolean hasUnlockAeonNum() { @@ -95,7 +95,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 15; + * optional uint32 unlock_aeon_num = 10; * @return this */ public RogueAeonInfo clearUnlockAeonNum() { @@ -105,7 +105,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 15; + * optional uint32 unlock_aeon_num = 10; * @return the unlockAeonNum */ public int getUnlockAeonNum() { @@ -113,7 +113,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 15; + * optional uint32 unlock_aeon_num = 10; * @param value the unlockAeonNum to set * @return this */ @@ -124,7 +124,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 6; + * optional bool is_unlocked = 5; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -132,7 +132,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 6; + * optional bool is_unlocked = 5; * @return this */ public RogueAeonInfo clearIsUnlocked() { @@ -142,7 +142,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 6; + * optional bool is_unlocked = 5; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -150,7 +150,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 6; + * optional bool is_unlocked = 5; * @param value the isUnlocked to set * @return this */ @@ -161,7 +161,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_list = 7; * @return whether the aeonIdList field is set */ public boolean hasAeonIdList() { @@ -169,7 +169,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_list = 7; * @return this */ public RogueAeonInfo clearAeonIdList() { @@ -179,7 +179,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_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. @@ -193,7 +193,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_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 @@ -207,7 +207,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_list = 7; * @param value the aeonIdList to add * @return this */ @@ -218,7 +218,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 3; + * repeated uint32 aeon_id_list = 7; * @param values the aeonIdList to add * @return this */ @@ -306,20 +306,20 @@ public final class RogueAeonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(unlockAeonNum); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isUnlocked); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < aeonIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(aeonIdList.array()[i]); } } @@ -350,34 +350,34 @@ public final class RogueAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // unlockAeonEnhanceNum unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { // unlockAeonNum unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { + case 40: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { + case 58: { // aeonIdList [packed=true] input.readPackedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -396,7 +396,7 @@ public final class RogueAeonInfoOuterClass { tag = input.readTag(); break; } - case 24: { + case 56: { // aeonIdList [packed=false] tag = input.readRepeatedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java index ddd3056..cec6081 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAeonOuterClass.java @@ -19,16 +19,17 @@ public final class RogueAeonOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 aeon_id = 15; + * optional uint32 aeon_id = 10; */ private int aeonId; /** - * 
-     * uint32 aeon_id = 7;  
-     *
- * - * optional bool is_unlock_enhance_buff = 12; + * optional uint32 unlock_aeon_enhance_num = 13; + */ + private int unlockAeonEnhanceNum; + + /** + * optional bool is_unlock_enhance_buff = 3; */ private boolean isUnlockEnhanceBuff; @@ -43,7 +44,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 15; + * optional uint32 aeon_id = 10; * @return whether the aeonId field is set */ public boolean hasAeonId() { @@ -51,7 +52,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 15; + * optional uint32 aeon_id = 10; * @return this */ public RogueAeon clearAeonId() { @@ -61,7 +62,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 15; + * optional uint32 aeon_id = 10; * @return the aeonId */ public int getAeonId() { @@ -69,7 +70,7 @@ public final class RogueAeonOuterClass { } /** - * optional uint32 aeon_id = 15; + * optional uint32 aeon_id = 10; * @param value the aeonId to set * @return this */ @@ -80,37 +81,62 @@ public final class RogueAeonOuterClass { } /** - * 
-     * uint32 aeon_id = 7;  
-     *
- * - * optional bool is_unlock_enhance_buff = 12; - * @return whether the isUnlockEnhanceBuff field is set + * optional uint32 unlock_aeon_enhance_num = 13; + * @return whether the unlockAeonEnhanceNum field is set */ - public boolean hasIsUnlockEnhanceBuff() { + public boolean hasUnlockAeonEnhanceNum() { return (bitField0_ & 0x00000002) != 0; } /** - * 
-     * uint32 aeon_id = 7;  
-     *
- * - * optional bool is_unlock_enhance_buff = 12; + * optional uint32 unlock_aeon_enhance_num = 13; + * @return this + */ + public RogueAeon clearUnlockAeonEnhanceNum() { + bitField0_ &= ~0x00000002; + unlockAeonEnhanceNum = 0; + return this; + } + + /** + * optional uint32 unlock_aeon_enhance_num = 13; + * @return the unlockAeonEnhanceNum + */ + public int getUnlockAeonEnhanceNum() { + return unlockAeonEnhanceNum; + } + + /** + * optional uint32 unlock_aeon_enhance_num = 13; + * @param value the unlockAeonEnhanceNum to set + * @return this + */ + public RogueAeon setUnlockAeonEnhanceNum(final int value) { + bitField0_ |= 0x00000002; + unlockAeonEnhanceNum = value; + return this; + } + + /** + * optional bool is_unlock_enhance_buff = 3; + * @return whether the isUnlockEnhanceBuff field is set + */ + public boolean hasIsUnlockEnhanceBuff() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bool is_unlock_enhance_buff = 3; * @return this */ public RogueAeon clearIsUnlockEnhanceBuff() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; isUnlockEnhanceBuff = false; return this; } /** - * 
-     * uint32 aeon_id = 7;  
-     *
- * - * optional bool is_unlock_enhance_buff = 12; + * optional bool is_unlock_enhance_buff = 3; * @return the isUnlockEnhanceBuff */ public boolean getIsUnlockEnhanceBuff() { @@ -118,16 +144,12 @@ public final class RogueAeonOuterClass { } /** - * 
-     * uint32 aeon_id = 7;  
-     *
- * - * optional bool is_unlock_enhance_buff = 12; + * optional bool is_unlock_enhance_buff = 3; * @param value the isUnlockEnhanceBuff to set * @return this */ public RogueAeon setIsUnlockEnhanceBuff(final boolean value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; isUnlockEnhanceBuff = value; return this; } @@ -138,6 +160,7 @@ public final class RogueAeonOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; aeonId = other.aeonId; + unlockAeonEnhanceNum = other.unlockAeonEnhanceNum; isUnlockEnhanceBuff = other.isUnlockEnhanceBuff; } return this; @@ -152,6 +175,9 @@ public final class RogueAeonOuterClass { if (other.hasAeonId()) { setAeonId(other.aeonId); } + if (other.hasUnlockAeonEnhanceNum()) { + setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum); + } if (other.hasIsUnlockEnhanceBuff()) { setIsUnlockEnhanceBuff(other.isUnlockEnhanceBuff); } @@ -166,6 +192,7 @@ public final class RogueAeonOuterClass { cachedSize = -1; bitField0_ = 0; aeonId = 0; + unlockAeonEnhanceNum = 0; isUnlockEnhanceBuff = false; return this; } @@ -191,17 +218,22 @@ public final class RogueAeonOuterClass { RogueAeon other = (RogueAeon) o; return bitField0_ == other.bitField0_ && (!hasAeonId() || aeonId == other.aeonId) + && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum) && (!hasIsUnlockEnhanceBuff() || isUnlockEnhanceBuff == other.isUnlockEnhanceBuff); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(unlockAeonEnhanceNum); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); output.writeBoolNoTag(isUnlockEnhanceBuff); } } @@ -213,6 +245,9 @@ public final class RogueAeonOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); } if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); + } + if ((bitField0_ & 0x00000004) != 0) { size += 2; } return size; @@ -225,19 +260,28 @@ public final class RogueAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 80: { // aeonId aeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { + case 104: { + // unlockAeonEnhanceNum + unlockAeonEnhanceNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { // isUnlockEnhanceBuff isUnlockEnhanceBuff = input.readBool(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -264,6 +308,9 @@ public final class RogueAeonOuterClass { output.writeUInt32(FieldNames.aeonId, aeonId); } if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isUnlockEnhanceBuff, isUnlockEnhanceBuff); } output.endObject(); @@ -288,12 +335,24 @@ public final class RogueAeonOuterClass { } break; } + case 1040991167: + case 7773396: { + if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { + if (!input.trySkipNullValue()) { + unlockAeonEnhanceNum = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -1006386637: case -118645302: { if (input.isAtField(FieldNames.isUnlockEnhanceBuff)) { if (!input.trySkipNullValue()) { isUnlockEnhanceBuff = input.readBool(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -354,6 +413,8 @@ public final class RogueAeonOuterClass { static class FieldNames { static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); + static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num"); + static final FieldName isUnlockEnhanceBuff = FieldName.forField("isUnlockEnhanceBuff", "is_unlock_enhance_buff"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java index e4b0e13..8dad0eb 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueAreaInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 11; */ private final RepeatedMessage rogueArea = RepeatedMessage.newEmptyInstance(RogueAreaOuterClass.RogueArea.getFactory()); @@ -35,7 +35,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 11; * @return whether the rogueArea field is set */ public boolean hasRogueArea() { @@ -43,7 +43,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 11; * @return this */ public RogueAreaInfo clearRogueArea() { @@ -53,7 +53,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 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. @@ -67,7 +67,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 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 @@ -81,7 +81,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 11; * @param value the rogueArea to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 2; + * repeated .RogueArea rogue_area = 11; * @param values the rogueArea to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueAreaInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < rogueArea.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 90); output.writeMessageNoTag(rogueArea.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueAreaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { + case 90: { // rogueArea tag = input.readRepeatedMessage(rogueArea, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java index e2ed65b..e4f4238 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java @@ -19,22 +19,7 @@ public final class RogueAreaOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_area_status = 1; - */ - private int rogueAreaStatus; - - /** - * optional uint32 map_id = 5; - */ - private int mapId; - - /** - * optional uint32 cur_reach_room_num = 6; - */ - private int curReachRoomNum; - - /** - * optional uint32 rogue_status = 8; + * optional uint32 rogue_status = 5; */ private int rogueStatus; @@ -44,7 +29,22 @@ public final class RogueAreaOuterClass { private int areaId; /** - * optional bool has_taken_rewards = 14; + * optional uint32 cur_reach_room_num = 10; + */ + private int curReachRoomNum; + + /** + * optional uint32 map_id = 13; + */ + private int mapId; + + /** + * optional uint32 rogue_area_status = 15; + */ + private int rogueAreaStatus; + + /** + * optional bool has_taken_rewards = 4; */ private boolean hasTakenRewards; @@ -59,136 +59,25 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 1; - * @return whether the rogueAreaStatus field is set + * optional uint32 rogue_status = 5; + * @return whether the rogueStatus field is set */ - public boolean hasRogueAreaStatus() { + public boolean hasRogueStatus() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 rogue_area_status = 1; - * @return this - */ - public RogueArea clearRogueAreaStatus() { - bitField0_ &= ~0x00000001; - rogueAreaStatus = 0; - return this; - } - - /** - * optional uint32 rogue_area_status = 1; - * @return the rogueAreaStatus - */ - public int getRogueAreaStatus() { - return rogueAreaStatus; - } - - /** - * optional uint32 rogue_area_status = 1; - * @param value the rogueAreaStatus to set - * @return this - */ - public RogueArea setRogueAreaStatus(final int value) { - bitField0_ |= 0x00000001; - rogueAreaStatus = value; - return this; - } - - /** - * optional uint32 map_id = 5; - * @return whether the mapId field is set - */ - public boolean hasMapId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_id = 5; - * @return this - */ - public RogueArea clearMapId() { - bitField0_ &= ~0x00000002; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 5; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 5; - * @param value the mapId to set - * @return this - */ - public RogueArea setMapId(final int value) { - bitField0_ |= 0x00000002; - mapId = value; - return this; - } - - /** - * optional uint32 cur_reach_room_num = 6; - * @return whether the curReachRoomNum field is set - */ - public boolean hasCurReachRoomNum() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_reach_room_num = 6; - * @return this - */ - public RogueArea clearCurReachRoomNum() { - bitField0_ &= ~0x00000004; - curReachRoomNum = 0; - return this; - } - - /** - * optional uint32 cur_reach_room_num = 6; - * @return the curReachRoomNum - */ - public int getCurReachRoomNum() { - return curReachRoomNum; - } - - /** - * optional uint32 cur_reach_room_num = 6; - * @param value the curReachRoomNum to set - * @return this - */ - public RogueArea setCurReachRoomNum(final int value) { - bitField0_ |= 0x00000004; - curReachRoomNum = value; - return this; - } - - /** - * optional uint32 rogue_status = 8; - * @return whether the rogueStatus field is set - */ - public boolean hasRogueStatus() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rogue_status = 8; + * optional uint32 rogue_status = 5; * @return this */ public RogueArea clearRogueStatus() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; rogueStatus = 0; return this; } /** - * optional uint32 rogue_status = 8; + * optional uint32 rogue_status = 5; * @return the rogueStatus */ public int getRogueStatus() { @@ -196,12 +85,12 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 8; + * optional uint32 rogue_status = 5; * @param value the rogueStatus to set * @return this */ public RogueArea setRogueStatus(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueStatus = value; return this; } @@ -211,7 +100,7 @@ public final class RogueAreaOuterClass { * @return whether the areaId field is set */ public boolean hasAreaId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -219,7 +108,7 @@ public final class RogueAreaOuterClass { * @return this */ public RogueArea clearAreaId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; areaId = 0; return this; } @@ -238,13 +127,124 @@ public final class RogueAreaOuterClass { * @return this */ public RogueArea setAreaId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; areaId = value; return this; } /** - * optional bool has_taken_rewards = 14; + * optional uint32 cur_reach_room_num = 10; + * @return whether the curReachRoomNum field is set + */ + public boolean hasCurReachRoomNum() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_reach_room_num = 10; + * @return this + */ + public RogueArea clearCurReachRoomNum() { + bitField0_ &= ~0x00000004; + curReachRoomNum = 0; + return this; + } + + /** + * optional uint32 cur_reach_room_num = 10; + * @return the curReachRoomNum + */ + public int getCurReachRoomNum() { + return curReachRoomNum; + } + + /** + * optional uint32 cur_reach_room_num = 10; + * @param value the curReachRoomNum to set + * @return this + */ + public RogueArea setCurReachRoomNum(final int value) { + bitField0_ |= 0x00000004; + curReachRoomNum = value; + return this; + } + + /** + * optional uint32 map_id = 13; + * @return whether the mapId field is set + */ + public boolean hasMapId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 map_id = 13; + * @return this + */ + public RogueArea clearMapId() { + bitField0_ &= ~0x00000008; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 13; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 13; + * @param value the mapId to set + * @return this + */ + public RogueArea setMapId(final int value) { + bitField0_ |= 0x00000008; + mapId = value; + return this; + } + + /** + * optional uint32 rogue_area_status = 15; + * @return whether the rogueAreaStatus field is set + */ + public boolean hasRogueAreaStatus() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 rogue_area_status = 15; + * @return this + */ + public RogueArea clearRogueAreaStatus() { + bitField0_ &= ~0x00000010; + rogueAreaStatus = 0; + return this; + } + + /** + * optional uint32 rogue_area_status = 15; + * @return the rogueAreaStatus + */ + public int getRogueAreaStatus() { + return rogueAreaStatus; + } + + /** + * optional uint32 rogue_area_status = 15; + * @param value the rogueAreaStatus to set + * @return this + */ + public RogueArea setRogueAreaStatus(final int value) { + bitField0_ |= 0x00000010; + rogueAreaStatus = value; + return this; + } + + /** + * optional bool has_taken_rewards = 4; * @return whether the hasTakenRewards field is set */ public boolean hasHasTakenRewards() { @@ -252,7 +252,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 14; + * optional bool has_taken_rewards = 4; * @return this */ public RogueArea clearHasTakenRewards() { @@ -262,7 +262,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 14; + * optional bool has_taken_rewards = 4; * @return the hasTakenRewards */ public boolean getHasTakenRewards() { @@ -270,7 +270,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 14; + * optional bool has_taken_rewards = 4; * @param value the hasTakenRewards to set * @return this */ @@ -285,11 +285,11 @@ public final class RogueAreaOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueAreaStatus = other.rogueAreaStatus; - mapId = other.mapId; - curReachRoomNum = other.curReachRoomNum; rogueStatus = other.rogueStatus; areaId = other.areaId; + curReachRoomNum = other.curReachRoomNum; + mapId = other.mapId; + rogueAreaStatus = other.rogueAreaStatus; hasTakenRewards = other.hasTakenRewards; } return this; @@ -301,21 +301,21 @@ public final class RogueAreaOuterClass { return this; } cachedSize = -1; - if (other.hasRogueAreaStatus()) { - setRogueAreaStatus(other.rogueAreaStatus); - } - if (other.hasMapId()) { - setMapId(other.mapId); - } - if (other.hasCurReachRoomNum()) { - setCurReachRoomNum(other.curReachRoomNum); - } if (other.hasRogueStatus()) { setRogueStatus(other.rogueStatus); } if (other.hasAreaId()) { setAreaId(other.areaId); } + if (other.hasCurReachRoomNum()) { + setCurReachRoomNum(other.curReachRoomNum); + } + if (other.hasMapId()) { + setMapId(other.mapId); + } + if (other.hasRogueAreaStatus()) { + setRogueAreaStatus(other.rogueAreaStatus); + } if (other.hasHasTakenRewards()) { setHasTakenRewards(other.hasTakenRewards); } @@ -329,11 +329,11 @@ public final class RogueAreaOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueAreaStatus = 0; - mapId = 0; - curReachRoomNum = 0; rogueStatus = 0; areaId = 0; + curReachRoomNum = 0; + mapId = 0; + rogueAreaStatus = 0; hasTakenRewards = false; return this; } @@ -358,38 +358,38 @@ public final class RogueAreaOuterClass { } RogueArea other = (RogueArea) o; return bitField0_ == other.bitField0_ - && (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus) - && (!hasMapId() || mapId == other.mapId) - && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum) && (!hasRogueStatus() || rogueStatus == other.rogueStatus) && (!hasAreaId() || areaId == other.areaId) + && (!hasCurReachRoomNum() || curReachRoomNum == other.curReachRoomNum) + && (!hasMapId() || mapId == other.mapId) + && (!hasRogueAreaStatus() || rogueAreaStatus == other.rogueAreaStatus) && (!hasHasTakenRewards() || hasTakenRewards == other.hasTakenRewards); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rogueAreaStatus); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(curReachRoomNum); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(rogueStatus); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 72); output.writeUInt32NoTag(areaId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curReachRoomNum); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(mapId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(rogueAreaStatus); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeBoolNoTag(hasTakenRewards); } } @@ -398,19 +398,19 @@ public final class RogueAreaOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueAreaStatus); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueAreaStatus); } if ((bitField0_ & 0x00000020) != 0) { size += 2; @@ -425,37 +425,10 @@ public final class RogueAreaOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // rogueAreaStatus - rogueAreaStatus = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // curReachRoomNum - curReachRoomNum = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // rogueStatus rogueStatus = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 72) { break; @@ -464,13 +437,40 @@ public final class RogueAreaOuterClass { case 72: { // areaId areaId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 80) { break; } } - case 112: { + case 80: { + // curReachRoomNum + curReachRoomNum = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // mapId + mapId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // rogueAreaStatus + rogueAreaStatus = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { // hasTakenRewards hasTakenRewards = input.readBool(); bitField0_ |= 0x00000020; @@ -497,19 +497,19 @@ public final class RogueAreaOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rogueAreaStatus, rogueAreaStatus); + output.writeUInt32(FieldNames.rogueStatus, rogueStatus); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapId, mapId); + output.writeUInt32(FieldNames.areaId, areaId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.rogueStatus, rogueStatus); + output.writeUInt32(FieldNames.mapId, mapId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.rogueAreaStatus, rogueAreaStatus); } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.hasTakenRewards, hasTakenRewards); @@ -524,11 +524,11 @@ public final class RogueAreaOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -731414439: - case -1961715457: { - if (input.isAtField(FieldNames.rogueAreaStatus)) { + case -836112788: + case 1898767863: { + if (input.isAtField(FieldNames.rogueStatus)) { if (!input.trySkipNullValue()) { - rogueAreaStatus = input.readUInt32(); + rogueStatus = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -536,11 +536,11 @@ public final class RogueAreaOuterClass { } break; } - case 103663511: - case -1081377058: { - if (input.isAtField(FieldNames.mapId)) { + case -1409553784: + case -746472947: { + if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { - mapId = input.readUInt32(); + areaId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -560,11 +560,11 @@ public final class RogueAreaOuterClass { } break; } - case -836112788: - case 1898767863: { - if (input.isAtField(FieldNames.rogueStatus)) { + case 103663511: + case -1081377058: { + if (input.isAtField(FieldNames.mapId)) { if (!input.trySkipNullValue()) { - rogueStatus = input.readUInt32(); + mapId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -572,11 +572,11 @@ public final class RogueAreaOuterClass { } break; } - case -1409553784: - case -746472947: { - if (input.isAtField(FieldNames.areaId)) { + case -731414439: + case -1961715457: { + if (input.isAtField(FieldNames.rogueAreaStatus)) { if (!input.trySkipNullValue()) { - areaId = input.readUInt32(); + rogueAreaStatus = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -648,16 +648,16 @@ public final class RogueAreaOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status"); - - static final FieldName mapId = FieldName.forField("mapId", "map_id"); - - static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num"); - static final FieldName rogueStatus = FieldName.forField("rogueStatus", "rogue_status"); static final FieldName areaId = FieldName.forField("areaId", "area_id"); + static final FieldName curReachRoomNum = FieldName.forField("curReachRoomNum", "cur_reach_room_num"); + + static final FieldName mapId = FieldName.forField("mapId", "map_id"); + + static final FieldName rogueAreaStatus = FieldName.forField("rogueAreaStatus", "rogue_area_status"); + static final FieldName hasTakenRewards = FieldName.forField("hasTakenRewards", "has_taken_rewards"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java index 49924cf..615f178 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAvatarInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueAvatarInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -43,7 +43,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * @return this */ public RogueAvatarInfo clearBaseAvatarIdList() { @@ -53,7 +53,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * * 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. @@ -67,7 +67,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * @param value the baseAvatarIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 9; * @param values the baseAvatarIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueAvatarInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueAvatarInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 74: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueAvatarInfoOuterClass { tag = input.readTag(); break; } - case 112: { + case 72: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java index 179f5be..5f128a7 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueBonusSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 4; */ private final RepeatedInt bonusInfo = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 4; * @return whether the bonusInfo field is set */ public boolean hasBonusInfo() { @@ -43,7 +43,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 4; * @return this */ public RogueBonusSelectInfo clearBonusInfo() { @@ -53,7 +53,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 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. @@ -67,7 +67,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 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 @@ -81,7 +81,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 4; * @param value the bonusInfo to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 13; + * repeated uint32 bonus_info = 4; * @param values the bonusInfo to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueBonusSelectInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < bonusInfo.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(bonusInfo.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueBonusSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 34: { // bonusInfo [packed=true] input.readPackedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueBonusSelectInfoOuterClass { tag = input.readTag(); break; } - case 104: { + case 32: { // bonusInfo [packed=false] tag = input.readRepeatedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java index 7a6f990..affc529 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBonusSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueBonusSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 bonus_id = 2; + * optional uint32 bonus_id = 14; */ private int bonusId; @@ -34,7 +34,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 2; + * optional uint32 bonus_id = 14; * @return whether the bonusId field is set */ public boolean hasBonusId() { @@ -42,7 +42,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 2; + * optional uint32 bonus_id = 14; * @return this */ public RogueBonusSelectResult clearBonusId() { @@ -52,7 +52,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 2; + * optional uint32 bonus_id = 14; * @return the bonusId */ public int getBonusId() { @@ -60,7 +60,7 @@ public final class RogueBonusSelectResultOuterClass { } /** - * optional uint32 bonus_id = 2; + * optional uint32 bonus_id = 14; * @param value the bonusId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueBonusSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(bonusId); } } @@ -150,7 +150,7 @@ public final class RogueBonusSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 112: { // bonusId bonusId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java index 13b95f6..6408b6b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffDataOuterClass.java @@ -19,12 +19,12 @@ public final class RogueBuffDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 5; + * optional uint32 level = 3; */ private int level; /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 7; */ private int buffId; @@ -39,7 +39,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return whether the level field is set */ public boolean hasLevel() { @@ -47,7 +47,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return this */ public RogueBuffData clearLevel() { @@ -57,7 +57,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @return the level */ public int getLevel() { @@ -65,7 +65,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 level = 5; + * optional uint32 level = 3; * @param value the level to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 7; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -84,7 +84,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 7; * @return this */ public RogueBuffData clearBuffId() { @@ -94,7 +94,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 7; * @return the buffId */ public int getBuffId() { @@ -102,7 +102,7 @@ public final class RogueBuffDataOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 7; * @param value the buffId to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueBuffDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(buffId); } } @@ -205,16 +205,16 @@ public final class RogueBuffDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 56) { break; } } - case 120: { + case 56: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java index 657515a..013256d 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java @@ -20,17 +20,17 @@ public final class RogueBuffEnhanceInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional float unk_float = 4; + * optional float unk_float = 3; */ private float unkFloat; /** - * optional uint32 buff_id = 14; + * optional uint32 buff_id = 12; */ private int buffId; /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 2; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -45,7 +45,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 4; + * optional float unk_float = 3; * @return whether the unkFloat field is set */ public boolean hasUnkFloat() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 4; + * optional float unk_float = 3; * @return this */ public RogueBuffEnhanceInfo clearUnkFloat() { @@ -63,7 +63,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 4; + * optional float unk_float = 3; * @return the unkFloat */ public float getUnkFloat() { @@ -71,7 +71,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 4; + * optional float unk_float = 3; * @param value the unkFloat to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 14; + * optional uint32 buff_id = 12; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -90,7 +90,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 14; + * optional uint32 buff_id = 12; * @return this */ public RogueBuffEnhanceInfo clearBuffId() { @@ -100,7 +100,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 14; + * optional uint32 buff_id = 12; * @return the buffId */ public int getBuffId() { @@ -108,7 +108,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 14; + * optional uint32 buff_id = 12; * @param value the buffId to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 2; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -127,7 +127,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 2; * @return this */ public RogueBuffEnhanceInfo clearItemCostList() { @@ -137,7 +137,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 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. @@ -151,7 +151,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 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 @@ -165,7 +165,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 1; + * optional .ItemCostList item_cost_list = 2; * @param value the itemCostList to set * @return this */ @@ -247,15 +247,15 @@ public final class RogueBuffEnhanceInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 37); + output.writeRawByte((byte) 29); output.writeFloatNoTag(unkFloat); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(itemCostList); } } @@ -282,25 +282,25 @@ public final class RogueBuffEnhanceInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 37: { + case 29: { // unkFloat unkFloat = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { + case 96: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java index 20a0821..249da54 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceShopInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_info = 7; */ private final RepeatedMessage buffInfo = RepeatedMessage.newEmptyInstance(RogueBuffEnhanceInfoOuterClass.RogueBuffEnhanceInfo.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_info = 7; * @return whether the buffInfo field is set */ public boolean hasBuffInfo() { @@ -43,7 +43,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_info = 7; * @return this */ public RogueBuffEnhanceShopInfo clearBuffInfo() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_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. @@ -67,7 +67,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_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 @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_info = 7; * @param value the buffInfo to add * @return this */ @@ -94,7 +94,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 6; + * repeated .RogueBuffEnhanceInfo buff_info = 7; * @param values the buffInfo to add * @return this */ @@ -166,7 +166,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < buffInfo.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 58); output.writeMessageNoTag(buffInfo.get(i)); } } @@ -188,7 +188,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 58: { // buffInfo tag = input.readRepeatedMessage(buffInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java index a8bcf30..b1700ab 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -43,7 +43,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * @return this */ public RogueBuffInfo clearMazeBuffList() { @@ -53,7 +53,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * * 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. @@ -67,7 +67,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * @param value the mazeBuffList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 1; + * repeated .RogueBuff maze_buff_list = 9; * @param values the mazeBuffList to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueBuffInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 74: { // mazeBuffList tag = input.readRepeatedMessage(mazeBuffList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java index e26fc4a..5c78c55 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java @@ -24,7 +24,7 @@ public final class RogueBuffOuterClass { private int buffId; /** - * optional uint32 level = 8; + * optional uint32 level = 15; */ private int level; @@ -76,7 +76,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @return whether the level field is set */ public boolean hasLevel() { @@ -84,7 +84,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @return this */ public RogueBuff clearLevel() { @@ -94,7 +94,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @return the level */ public int getLevel() { @@ -102,7 +102,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 15; * @param value the level to set * @return this */ @@ -181,7 +181,7 @@ public final class RogueBuffOuterClass { output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(level); } } @@ -210,11 +210,11 @@ public final class RogueBuffOuterClass { buffId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 120) { break; } } - case 64: { + case 120: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java index 8dae3d6..2fc81fb 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java @@ -19,15 +19,15 @@ public final class RogueCommonBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 3; - */ - private int buffId; - - /** - * optional uint32 buff_level = 5; + * optional uint32 buff_level = 3; */ private int buffLevel; + /** + * optional uint32 buff_id = 7; + */ + private int buffId; + private RogueCommonBuff() { } @@ -39,62 +39,25 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_id = 3; - * @return whether the buffId field is set + * optional uint32 buff_level = 3; + * @return whether the buffLevel field is set */ - public boolean hasBuffId() { + public boolean hasBuffLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 buff_id = 3; - * @return this - */ - public RogueCommonBuff clearBuffId() { - bitField0_ &= ~0x00000001; - buffId = 0; - return this; - } - - /** - * optional uint32 buff_id = 3; - * @return the buffId - */ - public int getBuffId() { - return buffId; - } - - /** - * optional uint32 buff_id = 3; - * @param value the buffId to set - * @return this - */ - public RogueCommonBuff setBuffId(final int value) { - bitField0_ |= 0x00000001; - buffId = value; - return this; - } - - /** - * optional uint32 buff_level = 5; - * @return whether the buffLevel field is set - */ - public boolean hasBuffLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 buff_level = 5; + * optional uint32 buff_level = 3; * @return this */ public RogueCommonBuff clearBuffLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; buffLevel = 0; return this; } /** - * optional uint32 buff_level = 5; + * optional uint32 buff_level = 3; * @return the buffLevel */ public int getBuffLevel() { @@ -102,23 +65,60 @@ public final class RogueCommonBuffOuterClass { } /** - * optional uint32 buff_level = 5; + * optional uint32 buff_level = 3; * @param value the buffLevel to set * @return this */ public RogueCommonBuff setBuffLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffLevel = value; return this; } + /** + * optional uint32 buff_id = 7; + * @return whether the buffId field is set + */ + public boolean hasBuffId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 buff_id = 7; + * @return this + */ + public RogueCommonBuff clearBuffId() { + bitField0_ &= ~0x00000002; + buffId = 0; + return this; + } + + /** + * optional uint32 buff_id = 7; + * @return the buffId + */ + public int getBuffId() { + return buffId; + } + + /** + * optional uint32 buff_id = 7; + * @param value the buffId to set + * @return this + */ + public RogueCommonBuff setBuffId(final int value) { + bitField0_ |= 0x00000002; + buffId = value; + return this; + } + @Override public RogueCommonBuff copyFrom(final RogueCommonBuff other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffId = other.buffId; buffLevel = other.buffLevel; + buffId = other.buffId; } return this; } @@ -129,12 +129,12 @@ public final class RogueCommonBuffOuterClass { return this; } cachedSize = -1; - if (other.hasBuffId()) { - setBuffId(other.buffId); - } if (other.hasBuffLevel()) { setBuffLevel(other.buffLevel); } + if (other.hasBuffId()) { + setBuffId(other.buffId); + } return this; } @@ -145,8 +145,8 @@ public final class RogueCommonBuffOuterClass { } cachedSize = -1; bitField0_ = 0; - buffId = 0; buffLevel = 0; + buffId = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueCommonBuffOuterClass { } RogueCommonBuff other = (RogueCommonBuff) o; return bitField0_ == other.bitField0_ - && (!hasBuffId() || buffId == other.buffId) - && (!hasBuffLevel() || buffLevel == other.buffLevel); + && (!hasBuffLevel() || buffLevel == other.buffLevel) + && (!hasBuffId() || buffId == other.buffId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(buffId); + output.writeUInt32NoTag(buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(buffLevel); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(buffId); } } @@ -190,10 +190,10 @@ public final class RogueCommonBuffOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } return size; } @@ -206,17 +206,17 @@ public final class RogueCommonBuffOuterClass { while (true) { switch (tag) { case 24: { - // buffId - buffId = input.readUInt32(); + // buffLevel + buffLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // buffLevel - buffLevel = input.readUInt32(); + case 56: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueCommonBuffOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.buffLevel, buffLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.buffLevel, buffLevel); + output.writeUInt32(FieldNames.buffId, buffId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueCommonBuffOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case 38049521: + case 1729463448: { + if (input.isAtField(FieldNames.buffLevel)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + buffLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueCommonBuffOuterClass { } break; } - case 38049521: - case 1729463448: { - if (input.isAtField(FieldNames.buffLevel)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - buffLevel = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueCommonBuffOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); - static final FieldName buffLevel = FieldName.forField("buffLevel", "buff_level"); + + static final FieldName buffId = FieldName.forField("buffId", "buff_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java index 0c6d509..b6fab7f 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java @@ -21,62 +21,67 @@ public final class RogueCommonBuffSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 roll_buff_free_count = 1; - */ - private int rollBuffFreeCount; - - /** - * optional uint32 roll_buff_times = 3; - */ - private int rollBuffTimes; - - /** - * optional uint32 roll_buff_max_times = 6; + * optional uint32 roll_buff_max_times = 1; */ private int rollBuffMaxTimes; /** - * optional uint32 source_cur_count = 7; + * optional uint32 source_cur_count = 2; */ private int sourceCurCount; /** - * optional uint32 source_total_count = 12; + * optional uint32 source_total_count = 3; */ private int sourceTotalCount; + /** + * optional uint32 roll_buff_times = 6; + */ + private int rollBuffTimes; + + /** + * optional uint32 roll_buff_free_count = 9; + */ + private int rollBuffFreeCount; + + /** + * optional uint32 certain_select_buff_id = 14; + */ + private int certainSelectBuffId; + /** * optional uint32 select_buff_source_hint = 15; */ private int selectBuffSourceHint; /** - * optional .RogueCommonBuffSelectSource source_type = 2; + * optional .RogueCommonBuffSelectSource source_type = 4; */ private int sourceType; /** - * optional bool can_roll = 14; + * optional bool can_roll = 7; */ private boolean canRoll; /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 12; */ private final ItemCostListOuterClass.ItemCostList rollBuffsCost = ItemCostListOuterClass.ItemCostList.newInstance(); /** - * repeated uint32 handbook_unlock_buff_id_list = 10; - */ - private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_list = 8; */ private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated uint32 handbook_unlock_buff_id_list = 13; + */ + private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .RogueCommonBuff maze_buff_list = 10; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueCommonBuffOuterClass.RogueCommonBuff.getFactory()); @@ -91,99 +96,25 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_free_count = 1; - * @return whether the rollBuffFreeCount field is set + * optional uint32 roll_buff_max_times = 1; + * @return whether the rollBuffMaxTimes field is set */ - public boolean hasRollBuffFreeCount() { + public boolean hasRollBuffMaxTimes() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 roll_buff_free_count = 1; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffFreeCount() { - bitField0_ &= ~0x00000001; - rollBuffFreeCount = 0; - return this; - } - - /** - * optional uint32 roll_buff_free_count = 1; - * @return the rollBuffFreeCount - */ - public int getRollBuffFreeCount() { - return rollBuffFreeCount; - } - - /** - * optional uint32 roll_buff_free_count = 1; - * @param value the rollBuffFreeCount to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) { - bitField0_ |= 0x00000001; - rollBuffFreeCount = value; - return this; - } - - /** - * optional uint32 roll_buff_times = 3; - * @return whether the rollBuffTimes field is set - */ - public boolean hasRollBuffTimes() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 roll_buff_times = 3; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffTimes() { - bitField0_ &= ~0x00000002; - rollBuffTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_times = 3; - * @return the rollBuffTimes - */ - public int getRollBuffTimes() { - return rollBuffTimes; - } - - /** - * optional uint32 roll_buff_times = 3; - * @param value the rollBuffTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { - bitField0_ |= 0x00000002; - rollBuffTimes = value; - return this; - } - - /** - * optional uint32 roll_buff_max_times = 6; - * @return whether the rollBuffMaxTimes field is set - */ - public boolean hasRollBuffMaxTimes() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 roll_buff_max_times = 6; + * optional uint32 roll_buff_max_times = 1; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; rollBuffMaxTimes = 0; return this; } /** - * optional uint32 roll_buff_max_times = 6; + * optional uint32 roll_buff_max_times = 1; * @return the rollBuffMaxTimes */ public int getRollBuffMaxTimes() { @@ -191,36 +122,36 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 6; + * optional uint32 roll_buff_max_times = 1; * @param value the rollBuffMaxTimes to set * @return this */ public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; rollBuffMaxTimes = value; return this; } /** - * optional uint32 source_cur_count = 7; + * optional uint32 source_cur_count = 2; * @return whether the sourceCurCount field is set */ public boolean hasSourceCurCount() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 source_cur_count = 7; + * optional uint32 source_cur_count = 2; * @return this */ public RogueCommonBuffSelectInfo clearSourceCurCount() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; sourceCurCount = 0; return this; } /** - * optional uint32 source_cur_count = 7; + * optional uint32 source_cur_count = 2; * @return the sourceCurCount */ public int getSourceCurCount() { @@ -228,36 +159,36 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 source_cur_count = 7; + * optional uint32 source_cur_count = 2; * @param value the sourceCurCount to set * @return this */ public RogueCommonBuffSelectInfo setSourceCurCount(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; sourceCurCount = value; return this; } /** - * optional uint32 source_total_count = 12; + * optional uint32 source_total_count = 3; * @return whether the sourceTotalCount field is set */ public boolean hasSourceTotalCount() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 source_total_count = 12; + * optional uint32 source_total_count = 3; * @return this */ public RogueCommonBuffSelectInfo clearSourceTotalCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; sourceTotalCount = 0; return this; } /** - * optional uint32 source_total_count = 12; + * optional uint32 source_total_count = 3; * @return the sourceTotalCount */ public int getSourceTotalCount() { @@ -265,22 +196,133 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 source_total_count = 12; + * optional uint32 source_total_count = 3; * @param value the sourceTotalCount to set * @return this */ public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; sourceTotalCount = value; return this; } + /** + * optional uint32 roll_buff_times = 6; + * @return whether the rollBuffTimes field is set + */ + public boolean hasRollBuffTimes() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 roll_buff_times = 6; + * @return this + */ + public RogueCommonBuffSelectInfo clearRollBuffTimes() { + bitField0_ &= ~0x00000008; + rollBuffTimes = 0; + return this; + } + + /** + * optional uint32 roll_buff_times = 6; + * @return the rollBuffTimes + */ + public int getRollBuffTimes() { + return rollBuffTimes; + } + + /** + * optional uint32 roll_buff_times = 6; + * @param value the rollBuffTimes to set + * @return this + */ + public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { + bitField0_ |= 0x00000008; + rollBuffTimes = value; + return this; + } + + /** + * optional uint32 roll_buff_free_count = 9; + * @return whether the rollBuffFreeCount field is set + */ + public boolean hasRollBuffFreeCount() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 roll_buff_free_count = 9; + * @return this + */ + public RogueCommonBuffSelectInfo clearRollBuffFreeCount() { + bitField0_ &= ~0x00000010; + rollBuffFreeCount = 0; + return this; + } + + /** + * optional uint32 roll_buff_free_count = 9; + * @return the rollBuffFreeCount + */ + public int getRollBuffFreeCount() { + return rollBuffFreeCount; + } + + /** + * optional uint32 roll_buff_free_count = 9; + * @param value the rollBuffFreeCount to set + * @return this + */ + public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) { + bitField0_ |= 0x00000010; + rollBuffFreeCount = value; + return this; + } + + /** + * optional uint32 certain_select_buff_id = 14; + * @return whether the certainSelectBuffId field is set + */ + public boolean hasCertainSelectBuffId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 certain_select_buff_id = 14; + * @return this + */ + public RogueCommonBuffSelectInfo clearCertainSelectBuffId() { + bitField0_ &= ~0x00000020; + certainSelectBuffId = 0; + return this; + } + + /** + * optional uint32 certain_select_buff_id = 14; + * @return the certainSelectBuffId + */ + public int getCertainSelectBuffId() { + return certainSelectBuffId; + } + + /** + * optional uint32 certain_select_buff_id = 14; + * @param value the certainSelectBuffId to set + * @return this + */ + public RogueCommonBuffSelectInfo setCertainSelectBuffId(final int value) { + bitField0_ |= 0x00000020; + certainSelectBuffId = value; + return this; + } + /** * optional uint32 select_buff_source_hint = 15; * @return whether the selectBuffSourceHint field is set */ public boolean hasSelectBuffSourceHint() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000040) != 0; } /** @@ -288,7 +330,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return this */ public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000040; selectBuffSourceHint = 0; return this; } @@ -307,31 +349,31 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return this */ public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; selectBuffSourceHint = value; return this; } /** - * optional .RogueCommonBuffSelectSource source_type = 2; + * optional .RogueCommonBuffSelectSource source_type = 4; * @return whether the sourceType field is set */ public boolean hasSourceType() { - return (bitField0_ & 0x00000040) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional .RogueCommonBuffSelectSource source_type = 2; + * optional .RogueCommonBuffSelectSource source_type = 4; * @return this */ public RogueCommonBuffSelectInfo clearSourceType() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000080; sourceType = 0; return this; } /** - * optional .RogueCommonBuffSelectSource source_type = 2; + * optional .RogueCommonBuffSelectSource source_type = 4; * @return the sourceType */ public RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource getSourceType() { @@ -358,43 +400,43 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return this */ public RogueCommonBuffSelectInfo setSourceTypeValue(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; sourceType = value; return this; } /** - * optional .RogueCommonBuffSelectSource source_type = 2; + * optional .RogueCommonBuffSelectSource source_type = 4; * @param value the sourceType to set * @return this */ public RogueCommonBuffSelectInfo setSourceType( final RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; sourceType = value.getNumber(); return this; } /** - * optional bool can_roll = 14; + * optional bool can_roll = 7; * @return whether the canRoll field is set */ public boolean hasCanRoll() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * optional bool can_roll = 14; + * optional bool can_roll = 7; * @return this */ public RogueCommonBuffSelectInfo clearCanRoll() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000100; canRoll = false; return this; } /** - * optional bool can_roll = 14; + * optional bool can_roll = 7; * @return the canRoll */ public boolean getCanRoll() { @@ -402,36 +444,36 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 14; + * optional bool can_roll = 7; * @param value the canRoll to set * @return this */ public RogueCommonBuffSelectInfo setCanRoll(final boolean value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; canRoll = value; return this; } /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 12; * @return whether the rollBuffsCost field is set */ public boolean hasRollBuffsCost() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000200) != 0; } /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 12; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffsCost() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; rollBuffsCost.clear(); return this; } /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 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. @@ -445,7 +487,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 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 @@ -454,92 +496,24 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return internal storage object for modifications */ public ItemCostListOuterClass.ItemCostList getMutableRollBuffsCost() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return rollBuffsCost; } /** - * optional .ItemCostList roll_buffs_cost = 4; + * optional .ItemCostList roll_buffs_cost = 12; * @param value the rollBuffsCost to set * @return this */ public RogueCommonBuffSelectInfo setRollBuffsCost( final ItemCostListOuterClass.ItemCostList value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; rollBuffsCost.copyFrom(value); return this; } /** - * repeated uint32 handbook_unlock_buff_id_list = 10; - * @return whether the handbookUnlockBuffIdList field is set - */ - public boolean hasHandbookUnlockBuffIdList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 10; - * @return this - */ - public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() { - bitField0_ &= ~0x00000200; - handbookUnlockBuffIdList.clear(); - return this; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 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 #getMutableHandbookUnlockBuffIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getHandbookUnlockBuffIdList() { - return handbookUnlockBuffIdList; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 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 RepeatedInt getMutableHandbookUnlockBuffIdList() { - bitField0_ |= 0x00000200; - return handbookUnlockBuffIdList; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 10; - * @param value the handbookUnlockBuffIdList to add - * @return this - */ - public RogueCommonBuffSelectInfo addHandbookUnlockBuffIdList(final int value) { - bitField0_ |= 0x00000200; - handbookUnlockBuffIdList.add(value); - return this; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 10; - * @param values the handbookUnlockBuffIdList to add - * @return this - */ - public RogueCommonBuffSelectInfo addAllHandbookUnlockBuffIdList(final int... values) { - bitField0_ |= 0x00000200; - handbookUnlockBuffIdList.addAll(values); - return this; - } - - /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_list = 8; * @return whether the firstBuffTypeList field is set */ public boolean hasFirstBuffTypeList() { @@ -547,7 +521,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_list = 8; * @return this */ public RogueCommonBuffSelectInfo clearFirstBuffTypeList() { @@ -557,7 +531,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_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. @@ -571,7 +545,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_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 @@ -585,7 +559,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_list = 8; * @param value the firstBuffTypeList to add * @return this */ @@ -596,7 +570,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 13; + * repeated uint32 first_buff_type_list = 8; * @param values the firstBuffTypeList to add * @return this */ @@ -607,25 +581,93 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 5; - * @return whether the mazeBuffList field is set + * repeated uint32 handbook_unlock_buff_id_list = 13; + * @return whether the handbookUnlockBuffIdList field is set */ - public boolean hasMazeBuffList() { + public boolean hasHandbookUnlockBuffIdList() { return (bitField0_ & 0x00000800) != 0; } /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated uint32 handbook_unlock_buff_id_list = 13; + * @return this + */ + public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() { + bitField0_ &= ~0x00000800; + handbookUnlockBuffIdList.clear(); + return this; + } + + /** + * repeated uint32 handbook_unlock_buff_id_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. + * + * Use {@link #getMutableHandbookUnlockBuffIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getHandbookUnlockBuffIdList() { + return handbookUnlockBuffIdList; + } + + /** + * repeated uint32 handbook_unlock_buff_id_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableHandbookUnlockBuffIdList() { + bitField0_ |= 0x00000800; + return handbookUnlockBuffIdList; + } + + /** + * repeated uint32 handbook_unlock_buff_id_list = 13; + * @param value the handbookUnlockBuffIdList to add + * @return this + */ + public RogueCommonBuffSelectInfo addHandbookUnlockBuffIdList(final int value) { + bitField0_ |= 0x00000800; + handbookUnlockBuffIdList.add(value); + return this; + } + + /** + * repeated uint32 handbook_unlock_buff_id_list = 13; + * @param values the handbookUnlockBuffIdList to add + * @return this + */ + public RogueCommonBuffSelectInfo addAllHandbookUnlockBuffIdList(final int... values) { + bitField0_ |= 0x00000800; + handbookUnlockBuffIdList.addAll(values); + return this; + } + + /** + * repeated .RogueCommonBuff maze_buff_list = 10; + * @return whether the mazeBuffList field is set + */ + public boolean hasMazeBuffList() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * repeated .RogueCommonBuff maze_buff_list = 10; * @return this */ public RogueCommonBuffSelectInfo clearMazeBuffList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00001000; mazeBuffList.clear(); return this; } /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated .RogueCommonBuff maze_buff_list = 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. @@ -639,7 +681,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated .RogueCommonBuff maze_buff_list = 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 @@ -648,30 +690,30 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazeBuffList() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; return mazeBuffList; } /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated .RogueCommonBuff maze_buff_list = 10; * @param value the mazeBuffList to add * @return this */ public RogueCommonBuffSelectInfo addMazeBuffList( final RogueCommonBuffOuterClass.RogueCommonBuff value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; mazeBuffList.add(value); return this; } /** - * repeated .RogueCommonBuff maze_buff_list = 5; + * repeated .RogueCommonBuff maze_buff_list = 10; * @param values the mazeBuffList to add * @return this */ public RogueCommonBuffSelectInfo addAllMazeBuffList( final RogueCommonBuffOuterClass.RogueCommonBuff... values) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; mazeBuffList.addAll(values); return this; } @@ -681,17 +723,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rollBuffFreeCount = other.rollBuffFreeCount; - rollBuffTimes = other.rollBuffTimes; rollBuffMaxTimes = other.rollBuffMaxTimes; sourceCurCount = other.sourceCurCount; sourceTotalCount = other.sourceTotalCount; + rollBuffTimes = other.rollBuffTimes; + rollBuffFreeCount = other.rollBuffFreeCount; + certainSelectBuffId = other.certainSelectBuffId; selectBuffSourceHint = other.selectBuffSourceHint; sourceType = other.sourceType; canRoll = other.canRoll; rollBuffsCost.copyFrom(other.rollBuffsCost); - handbookUnlockBuffIdList.copyFrom(other.handbookUnlockBuffIdList); firstBuffTypeList.copyFrom(other.firstBuffTypeList); + handbookUnlockBuffIdList.copyFrom(other.handbookUnlockBuffIdList); mazeBuffList.copyFrom(other.mazeBuffList); } return this; @@ -703,12 +746,6 @@ public final class RogueCommonBuffSelectInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRollBuffFreeCount()) { - setRollBuffFreeCount(other.rollBuffFreeCount); - } - if (other.hasRollBuffTimes()) { - setRollBuffTimes(other.rollBuffTimes); - } if (other.hasRollBuffMaxTimes()) { setRollBuffMaxTimes(other.rollBuffMaxTimes); } @@ -718,6 +755,15 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (other.hasSourceTotalCount()) { setSourceTotalCount(other.sourceTotalCount); } + if (other.hasRollBuffTimes()) { + setRollBuffTimes(other.rollBuffTimes); + } + if (other.hasRollBuffFreeCount()) { + setRollBuffFreeCount(other.rollBuffFreeCount); + } + if (other.hasCertainSelectBuffId()) { + setCertainSelectBuffId(other.certainSelectBuffId); + } if (other.hasSelectBuffSourceHint()) { setSelectBuffSourceHint(other.selectBuffSourceHint); } @@ -730,12 +776,12 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (other.hasRollBuffsCost()) { getMutableRollBuffsCost().mergeFrom(other.rollBuffsCost); } - if (other.hasHandbookUnlockBuffIdList()) { - getMutableHandbookUnlockBuffIdList().addAll(other.handbookUnlockBuffIdList); - } if (other.hasFirstBuffTypeList()) { getMutableFirstBuffTypeList().addAll(other.firstBuffTypeList); } + if (other.hasHandbookUnlockBuffIdList()) { + getMutableHandbookUnlockBuffIdList().addAll(other.handbookUnlockBuffIdList); + } if (other.hasMazeBuffList()) { getMutableMazeBuffList().addAll(other.mazeBuffList); } @@ -749,17 +795,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rollBuffFreeCount = 0; - rollBuffTimes = 0; rollBuffMaxTimes = 0; sourceCurCount = 0; sourceTotalCount = 0; + rollBuffTimes = 0; + rollBuffFreeCount = 0; + certainSelectBuffId = 0; selectBuffSourceHint = 0; sourceType = 0; canRoll = false; rollBuffsCost.clear(); - handbookUnlockBuffIdList.clear(); firstBuffTypeList.clear(); + handbookUnlockBuffIdList.clear(); mazeBuffList.clear(); return this; } @@ -772,8 +819,8 @@ public final class RogueCommonBuffSelectInfoOuterClass { cachedSize = -1; bitField0_ = 0; rollBuffsCost.clearQuick(); - handbookUnlockBuffIdList.clear(); firstBuffTypeList.clear(); + handbookUnlockBuffIdList.clear(); mazeBuffList.clearQuick(); return this; } @@ -788,17 +835,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { } RogueCommonBuffSelectInfo other = (RogueCommonBuffSelectInfo) o; return bitField0_ == other.bitField0_ - && (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount) - && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) + && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) + && (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount) + && (!hasCertainSelectBuffId() || certainSelectBuffId == other.certainSelectBuffId) && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint) && (!hasSourceType() || sourceType == other.sourceType) && (!hasCanRoll() || canRoll == other.canRoll) && (!hasRollBuffsCost() || rollBuffsCost.equals(other.rollBuffsCost)) - && (!hasHandbookUnlockBuffIdList() || handbookUnlockBuffIdList.equals(other.handbookUnlockBuffIdList)) && (!hasFirstBuffTypeList() || firstBuffTypeList.equals(other.firstBuffTypeList)) + && (!hasHandbookUnlockBuffIdList() || handbookUnlockBuffIdList.equals(other.handbookUnlockBuffIdList)) && (!hasMazeBuffList() || mazeBuffList.equals(other.mazeBuffList)); } @@ -806,55 +854,59 @@ public final class RogueCommonBuffSelectInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(rollBuffFreeCount); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(rollBuffTimes); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); output.writeUInt32NoTag(rollBuffMaxTimes); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); output.writeUInt32NoTag(sourceCurCount); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); output.writeUInt32NoTag(sourceTotalCount); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(rollBuffTimes); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(rollBuffFreeCount); + } if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(certainSelectBuffId); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(selectBuffSourceHint); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 16); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 32); output.writeEnumNoTag(sourceType); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 56); output.writeBoolNoTag(canRoll); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(rollBuffsCost); - } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); - } + output.writeRawByte((byte) 98); + output.writeMessageNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < firstBuffTypeList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(firstBuffTypeList.array()[i]); } } if ((bitField0_ & 0x00000800) != 0) { + for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); + } + } + if ((bitField0_ & 0x00001000) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 82); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -864,39 +916,42 @@ public final class RogueCommonBuffSelectInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceCurCount); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); + } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(certainSelectBuffId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000080) != 0) { - size += 2; + size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rollBuffsCost); + size += 2; } if ((bitField0_ & 0x00000200) != 0) { - size += (1 * handbookUnlockBuffIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(handbookUnlockBuffIdList); + size += 1 + ProtoSink.computeMessageSizeNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000400) != 0) { size += (1 * firstBuffTypeList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(firstBuffTypeList); } if ((bitField0_ & 0x00000800) != 0) { + size += (1 * handbookUnlockBuffIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(handbookUnlockBuffIdList); + } + if ((bitField0_ & 0x00001000) != 0) { size += (1 * mazeBuffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeBuffList); } return size; @@ -910,46 +965,55 @@ public final class RogueCommonBuffSelectInfoOuterClass { while (true) { switch (tag) { case 8: { - // rollBuffFreeCount - rollBuffFreeCount = input.readUInt32(); + // rollBuffMaxTimes + rollBuffMaxTimes = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // sourceCurCount + sourceCurCount = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 24) { break; } } case 24: { - // rollBuffTimes - rollBuffTimes = input.readUInt32(); - bitField0_ |= 0x00000002; + // sourceTotalCount + sourceTotalCount = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 48) { break; } } case 48: { - // rollBuffMaxTimes - rollBuffMaxTimes = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // sourceCurCount - sourceCurCount = input.readUInt32(); + // rollBuffTimes + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { - // sourceTotalCount - sourceTotalCount = input.readUInt32(); + case 72: { + // rollBuffFreeCount + rollBuffFreeCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // certainSelectBuffId + certainSelectBuffId = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 120) { break; } @@ -957,64 +1021,64 @@ public final class RogueCommonBuffSelectInfoOuterClass { case 120: { // selectBuffSourceHint selectBuffSourceHint = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 16) { + if (tag != 32) { break; } } - case 16: { + case 32: { // sourceType final int value = input.readInt32(); if (RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.forNumber(value) != null) { sourceType = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { + case 56: { // canRoll canRoll = input.readBool(); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // rollBuffsCost - input.readMessage(rollBuffsCost); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 82) { + if (tag != 98) { break; } } - case 82: { - // handbookUnlockBuffIdList [packed=true] - input.readPackedUInt32(handbookUnlockBuffIdList, tag); + case 98: { + // rollBuffsCost + input.readMessage(rollBuffsCost); bitField0_ |= 0x00000200; tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // firstBuffTypeList [packed=true] + input.readPackedUInt32(firstBuffTypeList, tag); + bitField0_ |= 0x00000400; + tag = input.readTag(); if (tag != 106) { break; } } case 106: { - // firstBuffTypeList [packed=true] - input.readPackedUInt32(firstBuffTypeList, tag); - bitField0_ |= 0x00000400; + // handbookUnlockBuffIdList [packed=true] + input.readPackedUInt32(handbookUnlockBuffIdList, tag); + bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 42) { + if (tag != 82) { break; } } - case 42: { + case 82: { // mazeBuffList tag = input.readRepeatedMessage(mazeBuffList, tag); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; if (tag != 0) { break; } @@ -1029,18 +1093,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { tag = input.readTag(); break; } - case 80: { - // handbookUnlockBuffIdList [packed=false] - tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); - bitField0_ |= 0x00000200; - break; - } - case 104: { + case 64: { // firstBuffTypeList [packed=false] tag = input.readRepeatedUInt32(firstBuffTypeList, tag); bitField0_ |= 0x00000400; break; } + case 104: { + // handbookUnlockBuffIdList [packed=false] + tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); + bitField0_ |= 0x00000800; + break; + } } } } @@ -1049,39 +1113,42 @@ public final class RogueCommonBuffSelectInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.sourceCurCount, sourceCurCount); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); + output.writeUInt32(FieldNames.certainSelectBuffId, certainSelectBuffId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); + output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); } if ((bitField0_ & 0x00000080) != 0) { - output.writeBool(FieldNames.canRoll, canRoll); + output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); } if ((bitField0_ & 0x00000100) != 0) { - output.writeMessage(FieldNames.rollBuffsCost, rollBuffsCost); + output.writeBool(FieldNames.canRoll, canRoll); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedUInt32(FieldNames.handbookUnlockBuffIdList, handbookUnlockBuffIdList); + output.writeMessage(FieldNames.rollBuffsCost, rollBuffsCost); } if ((bitField0_ & 0x00000400) != 0) { output.writeRepeatedUInt32(FieldNames.firstBuffTypeList, firstBuffTypeList); } if ((bitField0_ & 0x00000800) != 0) { + output.writeRepeatedUInt32(FieldNames.handbookUnlockBuffIdList, handbookUnlockBuffIdList); + } + if ((bitField0_ & 0x00001000) != 0) { output.writeRepeatedMessage(FieldNames.mazeBuffList, mazeBuffList); } output.endObject(); @@ -1094,36 +1161,12 @@ public final class RogueCommonBuffSelectInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -227537549: - case -710203098: { - if (input.isAtField(FieldNames.rollBuffFreeCount)) { - if (!input.trySkipNullValue()) { - rollBuffFreeCount = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -436216138: - case 2038334812: { - if (input.isAtField(FieldNames.rollBuffTimes)) { - if (!input.trySkipNullValue()) { - rollBuffTimes = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -564731182: case -792528959: { if (input.isAtField(FieldNames.rollBuffMaxTimes)) { if (!input.trySkipNullValue()) { rollBuffMaxTimes = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1135,7 +1178,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (input.isAtField(FieldNames.sourceCurCount)) { if (!input.trySkipNullValue()) { sourceCurCount = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1147,6 +1190,30 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (input.isAtField(FieldNames.sourceTotalCount)) { if (!input.trySkipNullValue()) { sourceTotalCount = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -436216138: + case 2038334812: { + if (input.isAtField(FieldNames.rollBuffTimes)) { + if (!input.trySkipNullValue()) { + rollBuffTimes = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -227537549: + case -710203098: { + if (input.isAtField(FieldNames.rollBuffFreeCount)) { + if (!input.trySkipNullValue()) { + rollBuffFreeCount = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1154,12 +1221,24 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } + case -888307028: + case -93239935: { + if (input.isAtField(FieldNames.certainSelectBuffId)) { + if (!input.trySkipNullValue()) { + certainSelectBuffId = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } case -1160450543: case -335538398: { if (input.isAtField(FieldNames.selectBuffSourceHint)) { if (!input.trySkipNullValue()) { selectBuffSourceHint = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1173,7 +1252,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { final RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource value = input.readEnum(RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); if (value != null) { sourceType = value.getNumber(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } else { input.skipUnknownEnumValue(); } @@ -1188,7 +1267,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (input.isAtField(FieldNames.canRoll)) { if (!input.trySkipNullValue()) { canRoll = input.readBool(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -1200,18 +1279,6 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (input.isAtField(FieldNames.rollBuffsCost)) { if (!input.trySkipNullValue()) { input.readMessage(rollBuffsCost); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } - case 620352744: - case 2008489866: { - if (input.isAtField(FieldNames.handbookUnlockBuffIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(handbookUnlockBuffIdList); bitField0_ |= 0x00000200; } } else { @@ -1231,12 +1298,24 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } + case 620352744: + case 2008489866: { + if (input.isAtField(FieldNames.handbookUnlockBuffIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(handbookUnlockBuffIdList); + bitField0_ |= 0x00000800; + } + } else { + input.skipUnknownField(); + } + break; + } case 1147228272: case -1634995062: { if (input.isAtField(FieldNames.mazeBuffList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazeBuffList); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -1296,16 +1375,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count"); - - static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); - static final FieldName rollBuffMaxTimes = FieldName.forField("rollBuffMaxTimes", "roll_buff_max_times"); static final FieldName sourceCurCount = FieldName.forField("sourceCurCount", "source_cur_count"); static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count"); + static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); + + static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count"); + + static final FieldName certainSelectBuffId = FieldName.forField("certainSelectBuffId", "certain_select_buff_id"); + static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); static final FieldName sourceType = FieldName.forField("sourceType", "source_type"); @@ -1314,10 +1395,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { static final FieldName rollBuffsCost = FieldName.forField("rollBuffsCost", "roll_buffs_cost"); - static final FieldName handbookUnlockBuffIdList = FieldName.forField("handbookUnlockBuffIdList", "handbook_unlock_buff_id_list"); - static final FieldName firstBuffTypeList = FieldName.forField("firstBuffTypeList", "first_buff_type_list"); + static final FieldName handbookUnlockBuffIdList = FieldName.forField("handbookUnlockBuffIdList", "handbook_unlock_buff_id_list"); + static final FieldName mazeBuffList = FieldName.forField("mazeBuffList", "maze_buff_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java index 72b79ca..7ccb6b7 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueCommonBuffSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return this */ public RogueCommonBuffSelectResult clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueCommonBuffSelectResultOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 4; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueCommonBuffSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueCommonBuffSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 32: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java index 72ba786..9538c4e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java @@ -19,12 +19,12 @@ public final class RogueCommonPendingActionOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unique_id = 4; + * optional uint32 unique_id = 5; */ private int uniqueId; /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 12; */ private final RogueActionOuterClass.RogueAction rogueAction = RogueActionOuterClass.RogueAction.newInstance(); @@ -39,7 +39,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 4; + * optional uint32 unique_id = 5; * @return whether the uniqueId field is set */ public boolean hasUniqueId() { @@ -47,7 +47,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 4; + * optional uint32 unique_id = 5; * @return this */ public RogueCommonPendingAction clearUniqueId() { @@ -57,7 +57,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 4; + * optional uint32 unique_id = 5; * @return the uniqueId */ public int getUniqueId() { @@ -65,7 +65,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 4; + * optional uint32 unique_id = 5; * @param value the uniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 12; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -84,7 +84,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 12; * @return this */ public RogueCommonPendingAction clearRogueAction() { @@ -94,7 +94,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 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. @@ -108,7 +108,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 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 @@ -122,7 +122,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 7; + * optional .RogueAction rogue_action = 12; * @param value the rogueAction to set * @return this */ @@ -198,11 +198,11 @@ public final class RogueCommonPendingActionOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueAction); } } @@ -226,16 +226,16 @@ public final class RogueCommonPendingActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // uniqueId uniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 98) { break; } } - case 58: { + case 98: { // rogueAction input.readMessage(rogueAction); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java index 1a7e6d8..65d57e6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java @@ -19,12 +19,12 @@ public final class RogueCurVirtualItemInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_talent_coin = 4; + * optional uint32 cur_talent_coin = 12; */ private int curTalentCoin; /** - * optional uint32 cur_rogue_coin = 12; + * optional uint32 cur_rogue_coin = 15; */ private int curRogueCoin; @@ -39,7 +39,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 4; + * optional uint32 cur_talent_coin = 12; * @return whether the curTalentCoin field is set */ public boolean hasCurTalentCoin() { @@ -47,7 +47,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 4; + * optional uint32 cur_talent_coin = 12; * @return this */ public RogueCurVirtualItemInfo clearCurTalentCoin() { @@ -57,7 +57,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 4; + * optional uint32 cur_talent_coin = 12; * @return the curTalentCoin */ public int getCurTalentCoin() { @@ -65,7 +65,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 4; + * optional uint32 cur_talent_coin = 12; * @param value the curTalentCoin to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 12; + * optional uint32 cur_rogue_coin = 15; * @return whether the curRogueCoin field is set */ public boolean hasCurRogueCoin() { @@ -84,7 +84,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 12; + * optional uint32 cur_rogue_coin = 15; * @return this */ public RogueCurVirtualItemInfo clearCurRogueCoin() { @@ -94,7 +94,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 12; + * optional uint32 cur_rogue_coin = 15; * @return the curRogueCoin */ public int getCurRogueCoin() { @@ -102,7 +102,7 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 12; + * optional uint32 cur_rogue_coin = 15; * @param value the curRogueCoin to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueCurVirtualItemInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(curTalentCoin); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(curRogueCoin); } } @@ -205,16 +205,16 @@ public final class RogueCurVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 96: { // curTalentCoin curTalentCoin = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { + case 120: { // curRogueCoin curRogueCoin = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java index 3454b90..c4a3660 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java @@ -19,44 +19,52 @@ public final class RogueCurrentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueStatus status = 13; + * 
+     *  PAOGLFPDNOA JGHAOFCGEMP = 3;
+     *
+ * + * optional .RogueStatus status = 12; */ private int status; /** - * optional .RogueCommonPendingAction pending_action = 2; - */ - private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); - - /** - * optional .RogueMapInfo room_map = 4; - */ - private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); - - /** - * optional .RogueBuffInfo rogue_buff_info = 5; - */ - private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); - - /** - * optional .RogueMiracleInfo rogue_miracle_info = 8; - */ - private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); - - /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; + * optional .RogueVirtualItemInfo rogue_virtual_item = 1; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItem = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; + * optional .RogueMiracleInfo rogue_miracle_info = 2; + */ + private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); + + /** + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 7; + */ + private final RogueMapInfoOuterClass.RogueMapInfo roomMap = RogueMapInfoOuterClass.RogueMapInfo.newInstance(); + + /** + * optional .RogueAeon rogue_aeon_info = 9; + */ + private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); + + /** + * optional .RogueAvatarInfo rogue_avatar_info = 10; */ private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance(); /** - * optional .RogueAeon rogue_aeon_info = 15; + * optional .RogueBuffInfo rogue_buff_info = 11; */ - private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); + private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); + + /** + * optional .RogueCommonPendingAction pending_action = 13; + */ + private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); private RogueCurrentInfo() { } @@ -69,7 +77,11 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 13; + * 
+     *  PAOGLFPDNOA JGHAOFCGEMP = 3;
+     *
+ * + * optional .RogueStatus status = 12; * @return whether the status field is set */ public boolean hasStatus() { @@ -77,7 +89,11 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 13; + * 
+     *  PAOGLFPDNOA JGHAOFCGEMP = 3;
+     *
+ * + * optional .RogueStatus status = 12; * @return this */ public RogueCurrentInfo clearStatus() { @@ -87,7 +103,11 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 13; + * 
+     *  PAOGLFPDNOA JGHAOFCGEMP = 3;
+     *
+ * + * optional .RogueStatus status = 12; * @return the status */ public RogueStatusOuterClass.RogueStatus getStatus() { @@ -120,7 +140,11 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 13; + * 
+     *  PAOGLFPDNOA JGHAOFCGEMP = 3;
+     *
+ * + * optional .RogueStatus status = 12; * @param value the status to set * @return this */ @@ -131,255 +155,25 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueCommonPendingAction pending_action = 2; - * @return whether the pendingAction field is set + * optional .RogueVirtualItemInfo rogue_virtual_item = 1; + * @return whether the rogueVirtualItem field is set */ - public boolean hasPendingAction() { + public boolean hasRogueVirtualItem() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueCommonPendingAction pending_action = 2; - * @return this - */ - public RogueCurrentInfo clearPendingAction() { - bitField0_ &= ~0x00000002; - pendingAction.clear(); - return this; - } - - /** - * optional .RogueCommonPendingAction pending_action = 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 #getMutablePendingAction()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() { - return pendingAction; - } - - /** - * optional .RogueCommonPendingAction pending_action = 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 RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { - bitField0_ |= 0x00000002; - return pendingAction; - } - - /** - * optional .RogueCommonPendingAction pending_action = 2; - * @param value the pendingAction to set - * @return this - */ - public RogueCurrentInfo setPendingAction( - final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { - bitField0_ |= 0x00000002; - pendingAction.copyFrom(value); - return this; - } - - /** - * optional .RogueMapInfo room_map = 4; - * @return whether the roomMap field is set - */ - public boolean hasRoomMap() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueMapInfo room_map = 4; - * @return this - */ - public RogueCurrentInfo clearRoomMap() { - bitField0_ &= ~0x00000004; - roomMap.clear(); - return this; - } - - /** - * optional .RogueMapInfo room_map = 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 #getMutableRoomMap()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() { - return roomMap; - } - - /** - * optional .RogueMapInfo room_map = 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 RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { - bitField0_ |= 0x00000004; - return roomMap; - } - - /** - * optional .RogueMapInfo room_map = 4; - * @param value the roomMap to set - * @return this - */ - public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { - bitField0_ |= 0x00000004; - roomMap.copyFrom(value); - return this; - } - - /** - * optional .RogueBuffInfo rogue_buff_info = 5; - * @return whether the rogueBuffInfo field is set - */ - public boolean hasRogueBuffInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueBuffInfo rogue_buff_info = 5; - * @return this - */ - public RogueCurrentInfo clearRogueBuffInfo() { - bitField0_ &= ~0x00000008; - rogueBuffInfo.clear(); - return this; - } - - /** - * optional .RogueBuffInfo rogue_buff_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 #getMutableRogueBuffInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueBuffInfoOuterClass.RogueBuffInfo getRogueBuffInfo() { - return rogueBuffInfo; - } - - /** - * optional .RogueBuffInfo rogue_buff_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() { - bitField0_ |= 0x00000008; - return rogueBuffInfo; - } - - /** - * optional .RogueBuffInfo rogue_buff_info = 5; - * @param value the rogueBuffInfo to set - * @return this - */ - public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) { - bitField0_ |= 0x00000008; - rogueBuffInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_info = 8; - * @return whether the rogueMiracleInfo field is set - */ - public boolean hasRogueMiracleInfo() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_info = 8; - * @return this - */ - public RogueCurrentInfo clearRogueMiracleInfo() { - bitField0_ &= ~0x00000010; - rogueMiracleInfo.clear(); - return this; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_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. - * - * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleInfoOuterClass.RogueMiracleInfo getRogueMiracleInfo() { - return rogueMiracleInfo; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() { - bitField0_ |= 0x00000010; - return rogueMiracleInfo; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_info = 8; - * @param value the rogueMiracleInfo to set - * @return this - */ - public RogueCurrentInfo setRogueMiracleInfo( - final RogueMiracleInfoOuterClass.RogueMiracleInfo value) { - bitField0_ |= 0x00000010; - rogueMiracleInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; - * @return whether the rogueVirtualItem field is set - */ - public boolean hasRogueVirtualItem() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; + * optional .RogueVirtualItemInfo rogue_virtual_item = 1; * @return this */ public RogueCurrentInfo clearRogueVirtualItem() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000002; rogueVirtualItem.clear(); return this; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; + * optional .RogueVirtualItemInfo rogue_virtual_item = 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. @@ -393,7 +187,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; + * optional .RogueVirtualItemInfo rogue_virtual_item = 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 @@ -402,56 +196,56 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItem() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; return rogueVirtualItem; } /** - * optional .RogueVirtualItemInfo rogue_virtual_item = 10; + * optional .RogueVirtualItemInfo rogue_virtual_item = 1; * @param value the rogueVirtualItem to set * @return this */ public RogueCurrentInfo setRogueVirtualItem( final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; rogueVirtualItem.copyFrom(value); return this; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; - * @return whether the rogueAvatarInfo field is set + * optional .RogueMiracleInfo rogue_miracle_info = 2; + * @return whether the rogueMiracleInfo field is set */ - public boolean hasRogueAvatarInfo() { - return (bitField0_ & 0x00000040) != 0; + public boolean hasRogueMiracleInfo() { + return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; + * optional .RogueMiracleInfo rogue_miracle_info = 2; * @return this */ - public RogueCurrentInfo clearRogueAvatarInfo() { - bitField0_ &= ~0x00000040; - rogueAvatarInfo.clear(); + public RogueCurrentInfo clearRogueMiracleInfo() { + bitField0_ &= ~0x00000004; + rogueMiracleInfo.clear(); return this; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; + * optional .RogueMiracleInfo 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 #getMutableRogueAvatarInfo()} if you want to modify it. + * Use {@link #getMutableRogueMiracleInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { - return rogueAvatarInfo; + public RogueMiracleInfoOuterClass.RogueMiracleInfo getRogueMiracleInfo() { + return rogueMiracleInfo; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; + * optional .RogueMiracleInfo 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 @@ -459,43 +253,120 @@ public final class RogueCurrentInfoOuterClass { * * @return internal storage object for modifications */ - public RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { - bitField0_ |= 0x00000040; - return rogueAvatarInfo; + public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() { + bitField0_ |= 0x00000004; + return rogueMiracleInfo; } /** - * optional .RogueAvatarInfo rogue_avatar_info = 11; - * @param value the rogueAvatarInfo to set + * optional .RogueMiracleInfo rogue_miracle_info = 2; + * @param value the rogueMiracleInfo to set * @return this */ - public RogueCurrentInfo setRogueAvatarInfo( - final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { - bitField0_ |= 0x00000040; - rogueAvatarInfo.copyFrom(value); + public RogueCurrentInfo setRogueMiracleInfo( + final RogueMiracleInfoOuterClass.RogueMiracleInfo value) { + bitField0_ |= 0x00000004; + rogueMiracleInfo.copyFrom(value); return this; } /** - * optional .RogueAeon rogue_aeon_info = 15; - * @return whether the rogueAeonInfo field is set + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 7; + * @return whether the roomMap field is set */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasRoomMap() { + return (bitField0_ & 0x00000008) != 0; } /** - * optional .RogueAeon rogue_aeon_info = 15; + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 7; + * @return this + */ + public RogueCurrentInfo clearRoomMap() { + bitField0_ &= ~0x00000008; + roomMap.clear(); + return this; + } + + /** + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 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 #getMutableRoomMap()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueMapInfoOuterClass.RogueMapInfo getRoomMap() { + return roomMap; + } + + /** + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 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 RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { + bitField0_ |= 0x00000008; + return roomMap; + } + + /** + * 
+     *  bool GPOIMNADJOH = 14;
+     *
+ * + * optional .RogueMapInfo room_map = 7; + * @param value the roomMap to set + * @return this + */ + public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { + bitField0_ |= 0x00000008; + roomMap.copyFrom(value); + return this; + } + + /** + * optional .RogueAeon rogue_aeon_info = 9; + * @return whether the rogueAeonInfo field is set + */ + public boolean hasRogueAeonInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueAeon rogue_aeon_info = 9; * @return this */ public RogueCurrentInfo clearRogueAeonInfo() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000010; rogueAeonInfo.clear(); return this; } /** - * optional .RogueAeon rogue_aeon_info = 15; + * optional .RogueAeon rogue_aeon_info = 9; * * 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. @@ -509,7 +380,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueAeon rogue_aeon_info = 15; + * optional .RogueAeon rogue_aeon_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -518,34 +389,207 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; return rogueAeonInfo; } /** - * optional .RogueAeon rogue_aeon_info = 15; + * optional .RogueAeon rogue_aeon_info = 9; * @param value the rogueAeonInfo to set * @return this */ public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; rogueAeonInfo.copyFrom(value); return this; } + /** + * optional .RogueAvatarInfo rogue_avatar_info = 10; + * @return whether the rogueAvatarInfo field is set + */ + public boolean hasRogueAvatarInfo() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_info = 10; + * @return this + */ + public RogueCurrentInfo clearRogueAvatarInfo() { + bitField0_ &= ~0x00000020; + rogueAvatarInfo.clear(); + return this; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_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 #getMutableRogueAvatarInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { + return rogueAvatarInfo; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_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 RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { + bitField0_ |= 0x00000020; + return rogueAvatarInfo; + } + + /** + * optional .RogueAvatarInfo rogue_avatar_info = 10; + * @param value the rogueAvatarInfo to set + * @return this + */ + public RogueCurrentInfo setRogueAvatarInfo( + final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { + bitField0_ |= 0x00000020; + rogueAvatarInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueBuffInfo rogue_buff_info = 11; + * @return whether the rogueBuffInfo field is set + */ + public boolean hasRogueBuffInfo() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .RogueBuffInfo rogue_buff_info = 11; + * @return this + */ + public RogueCurrentInfo clearRogueBuffInfo() { + bitField0_ &= ~0x00000040; + rogueBuffInfo.clear(); + return this; + } + + /** + * optional .RogueBuffInfo rogue_buff_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 #getMutableRogueBuffInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueBuffInfoOuterClass.RogueBuffInfo getRogueBuffInfo() { + return rogueBuffInfo; + } + + /** + * optional .RogueBuffInfo rogue_buff_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() { + bitField0_ |= 0x00000040; + return rogueBuffInfo; + } + + /** + * optional .RogueBuffInfo rogue_buff_info = 11; + * @param value the rogueBuffInfo to set + * @return this + */ + public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) { + bitField0_ |= 0x00000040; + rogueBuffInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueCommonPendingAction pending_action = 13; + * @return whether the pendingAction field is set + */ + public boolean hasPendingAction() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .RogueCommonPendingAction pending_action = 13; + * @return this + */ + public RogueCurrentInfo clearPendingAction() { + bitField0_ &= ~0x00000080; + pendingAction.clear(); + return this; + } + + /** + * optional .RogueCommonPendingAction pending_action = 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 #getMutablePendingAction()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getPendingAction() { + return pendingAction; + } + + /** + * optional .RogueCommonPendingAction pending_action = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { + bitField0_ |= 0x00000080; + return pendingAction; + } + + /** + * optional .RogueCommonPendingAction pending_action = 13; + * @param value the pendingAction to set + * @return this + */ + public RogueCurrentInfo setPendingAction( + final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { + bitField0_ |= 0x00000080; + pendingAction.copyFrom(value); + return this; + } + @Override public RogueCurrentInfo copyFrom(final RogueCurrentInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; status = other.status; - pendingAction.copyFrom(other.pendingAction); - roomMap.copyFrom(other.roomMap); - rogueBuffInfo.copyFrom(other.rogueBuffInfo); - rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); rogueVirtualItem.copyFrom(other.rogueVirtualItem); - rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); + roomMap.copyFrom(other.roomMap); rogueAeonInfo.copyFrom(other.rogueAeonInfo); + rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); + rogueBuffInfo.copyFrom(other.rogueBuffInfo); + pendingAction.copyFrom(other.pendingAction); } return this; } @@ -559,26 +603,26 @@ public final class RogueCurrentInfoOuterClass { if (other.hasStatus()) { setStatusValue(other.status); } - if (other.hasPendingAction()) { - getMutablePendingAction().mergeFrom(other.pendingAction); - } - if (other.hasRoomMap()) { - getMutableRoomMap().mergeFrom(other.roomMap); - } - if (other.hasRogueBuffInfo()) { - getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); + if (other.hasRogueVirtualItem()) { + getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); } if (other.hasRogueMiracleInfo()) { getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); } - if (other.hasRogueVirtualItem()) { - getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); + if (other.hasRoomMap()) { + getMutableRoomMap().mergeFrom(other.roomMap); + } + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } if (other.hasRogueAvatarInfo()) { getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo); } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); + if (other.hasRogueBuffInfo()) { + getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); + } + if (other.hasPendingAction()) { + getMutablePendingAction().mergeFrom(other.pendingAction); } return this; } @@ -591,13 +635,13 @@ public final class RogueCurrentInfoOuterClass { cachedSize = -1; bitField0_ = 0; status = 0; - pendingAction.clear(); - roomMap.clear(); - rogueBuffInfo.clear(); - rogueMiracleInfo.clear(); rogueVirtualItem.clear(); - rogueAvatarInfo.clear(); + rogueMiracleInfo.clear(); + roomMap.clear(); rogueAeonInfo.clear(); + rogueAvatarInfo.clear(); + rogueBuffInfo.clear(); + pendingAction.clear(); return this; } @@ -608,13 +652,13 @@ public final class RogueCurrentInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - pendingAction.clearQuick(); - roomMap.clearQuick(); - rogueBuffInfo.clearQuick(); - rogueMiracleInfo.clearQuick(); rogueVirtualItem.clearQuick(); - rogueAvatarInfo.clearQuick(); + rogueMiracleInfo.clearQuick(); + roomMap.clearQuick(); rogueAeonInfo.clearQuick(); + rogueAvatarInfo.clearQuick(); + rogueBuffInfo.clearQuick(); + pendingAction.clearQuick(); return this; } @@ -629,48 +673,48 @@ public final class RogueCurrentInfoOuterClass { RogueCurrentInfo other = (RogueCurrentInfo) o; return bitField0_ == other.bitField0_ && (!hasStatus() || status == other.status) - && (!hasPendingAction() || pendingAction.equals(other.pendingAction)) - && (!hasRoomMap() || roomMap.equals(other.roomMap)) - && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)) - && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) && (!hasRogueVirtualItem() || rogueVirtualItem.equals(other.rogueVirtualItem)) + && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) + && (!hasRoomMap() || roomMap.equals(other.roomMap)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)); + && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)) + && (!hasPendingAction() || pendingAction.equals(other.pendingAction)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(pendingAction); + output.writeRawByte((byte) 10); + output.writeMessageNoTag(rogueVirtualItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(roomMap); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(rogueBuffInfo); + output.writeRawByte((byte) 58); + output.writeMessageNoTag(roomMap); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(rogueMiracleInfo); + output.writeRawByte((byte) 74); + output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(rogueVirtualItem); + output.writeMessageNoTag(rogueAvatarInfo); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 90); - output.writeMessageNoTag(rogueAvatarInfo); + output.writeMessageNoTag(rogueBuffInfo); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(rogueAeonInfo); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(pendingAction); } } @@ -681,25 +725,25 @@ public final class RogueCurrentInfoOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItem); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + } + if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo); } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); + } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); } return size; } @@ -711,7 +755,7 @@ public final class RogueCurrentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 96: { // status final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { @@ -719,40 +763,40 @@ public final class RogueCurrentInfoOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // rogueVirtualItem + input.readMessage(rogueVirtualItem); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // pendingAction - input.readMessage(pendingAction); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // roomMap - input.readMessage(roomMap); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { - // rogueBuffInfo - input.readMessage(rogueBuffInfo); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { // rogueMiracleInfo input.readMessage(rogueMiracleInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // roomMap + input.readMessage(roomMap); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 82) { @@ -760,8 +804,8 @@ public final class RogueCurrentInfoOuterClass { } } case 82: { - // rogueVirtualItem - input.readMessage(rogueVirtualItem); + // rogueAvatarInfo + input.readMessage(rogueAvatarInfo); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 90) { @@ -769,17 +813,17 @@ public final class RogueCurrentInfoOuterClass { } } case 90: { - // rogueAvatarInfo - input.readMessage(rogueAvatarInfo); + // rogueBuffInfo + input.readMessage(rogueBuffInfo); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + case 106: { + // pendingAction + input.readMessage(pendingAction); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -807,25 +851,25 @@ public final class RogueCurrentInfoOuterClass { output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.pendingAction, pendingAction); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.roomMap, roomMap); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueVirtualItem, rogueVirtualItem); } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.roomMap, roomMap); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + output.writeMessage(FieldNames.pendingAction, pendingAction); } output.endObject(); } @@ -853,11 +897,11 @@ public final class RogueCurrentInfoOuterClass { } break; } - case -110680403: - case 1646545374: { - if (input.isAtField(FieldNames.pendingAction)) { + case 2090167940: + case -856063476: { + if (input.isAtField(FieldNames.rogueVirtualItem)) { if (!input.trySkipNullValue()) { - input.readMessage(pendingAction); + input.readMessage(rogueVirtualItem); bitField0_ |= 0x00000002; } } else { @@ -865,60 +909,24 @@ public final class RogueCurrentInfoOuterClass { } break; } - case 1379875457: - case -172986376: { - if (input.isAtField(FieldNames.roomMap)) { - if (!input.trySkipNullValue()) { - input.readMessage(roomMap); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1107898267: - case -694847243: { - if (input.isAtField(FieldNames.rogueBuffInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueBuffInfo); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -452511099: case 1925436929: { if (input.isAtField(FieldNames.rogueMiracleInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueMiracleInfo); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case 2090167940: - case -856063476: { - if (input.isAtField(FieldNames.rogueVirtualItem)) { + case 1379875457: + case -172986376: { + if (input.isAtField(FieldNames.roomMap)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueVirtualItem); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1966631135: - case 667955439: { - if (input.isAtField(FieldNames.rogueAvatarInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAvatarInfo); - bitField0_ |= 0x00000040; + input.readMessage(roomMap); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -930,6 +938,42 @@ public final class RogueCurrentInfoOuterClass { if (input.isAtField(FieldNames.rogueAeonInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueAeonInfo); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1966631135: + case 667955439: { + if (input.isAtField(FieldNames.rogueAvatarInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueAvatarInfo); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1107898267: + case -694847243: { + if (input.isAtField(FieldNames.rogueBuffInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueBuffInfo); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case -110680403: + case 1646545374: { + if (input.isAtField(FieldNames.pendingAction)) { + if (!input.trySkipNullValue()) { + input.readMessage(pendingAction); bitField0_ |= 0x00000080; } } else { @@ -992,19 +1036,19 @@ public final class RogueCurrentInfoOuterClass { static class FieldNames { static final FieldName status = FieldName.forField("status"); - static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); - - static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); - - static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); + static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); + static final FieldName roomMap = FieldName.forField("roomMap", "room_map"); + + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info"); - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); + static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); + + static final FieldName pendingAction = FieldName.forField("pendingAction", "pending_action"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java index 1a0616d..548d6e8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java @@ -20,27 +20,27 @@ public final class RogueDialogueEventParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional float ratio = 12; + * optional float ratio = 9; */ private float ratio; /** - * optional uint32 dialogue_event_id = 4; - */ - private int dialogueEventId; - - /** - * optional uint32 arg_id = 14; + * optional uint32 arg_id = 4; */ private int argId; /** - * optional sint32 int_value = 2; + * optional uint32 dialogue_event_id = 7; + */ + private int dialogueEventId; + + /** + * optional sint32 int_value = 5; */ private int intValue; /** - * optional bool is_valid = 3; + * optional bool is_valid = 12; */ private boolean isValid; @@ -55,7 +55,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 12; + * optional float ratio = 9; * @return whether the ratio field is set */ public boolean hasRatio() { @@ -63,7 +63,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 12; + * optional float ratio = 9; * @return this */ public RogueDialogueEventParam clearRatio() { @@ -73,7 +73,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 12; + * optional float ratio = 9; * @return the ratio */ public float getRatio() { @@ -81,7 +81,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 12; + * optional float ratio = 9; * @param value the ratio to set * @return this */ @@ -92,62 +92,25 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 4; - * @return whether the dialogueEventId field is set + * optional uint32 arg_id = 4; + * @return whether the argId field is set */ - public boolean hasDialogueEventId() { + public boolean hasArgId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 dialogue_event_id = 4; - * @return this - */ - public RogueDialogueEventParam clearDialogueEventId() { - bitField0_ &= ~0x00000002; - dialogueEventId = 0; - return this; - } - - /** - * optional uint32 dialogue_event_id = 4; - * @return the dialogueEventId - */ - public int getDialogueEventId() { - return dialogueEventId; - } - - /** - * optional uint32 dialogue_event_id = 4; - * @param value the dialogueEventId to set - * @return this - */ - public RogueDialogueEventParam setDialogueEventId(final int value) { - bitField0_ |= 0x00000002; - dialogueEventId = value; - return this; - } - - /** - * optional uint32 arg_id = 14; - * @return whether the argId field is set - */ - public boolean hasArgId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 arg_id = 14; + * optional uint32 arg_id = 4; * @return this */ public RogueDialogueEventParam clearArgId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; argId = 0; return this; } /** - * optional uint32 arg_id = 14; + * optional uint32 arg_id = 4; * @return the argId */ public int getArgId() { @@ -155,18 +118,55 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 arg_id = 14; + * optional uint32 arg_id = 4; * @param value the argId to set * @return this */ public RogueDialogueEventParam setArgId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; argId = value; return this; } /** - * optional sint32 int_value = 2; + * optional uint32 dialogue_event_id = 7; + * @return whether the dialogueEventId field is set + */ + public boolean hasDialogueEventId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @return this + */ + public RogueDialogueEventParam clearDialogueEventId() { + bitField0_ &= ~0x00000004; + dialogueEventId = 0; + return this; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @return the dialogueEventId + */ + public int getDialogueEventId() { + return dialogueEventId; + } + + /** + * optional uint32 dialogue_event_id = 7; + * @param value the dialogueEventId to set + * @return this + */ + public RogueDialogueEventParam setDialogueEventId(final int value) { + bitField0_ |= 0x00000004; + dialogueEventId = value; + return this; + } + + /** + * optional sint32 int_value = 5; * @return whether the intValue field is set */ public boolean hasIntValue() { @@ -174,7 +174,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 2; + * optional sint32 int_value = 5; * @return this */ public RogueDialogueEventParam clearIntValue() { @@ -184,7 +184,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 2; + * optional sint32 int_value = 5; * @return the intValue */ public int getIntValue() { @@ -192,7 +192,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 2; + * optional sint32 int_value = 5; * @param value the intValue to set * @return this */ @@ -203,7 +203,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 3; + * optional bool is_valid = 12; * @return whether the isValid field is set */ public boolean hasIsValid() { @@ -211,7 +211,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 3; + * optional bool is_valid = 12; * @return this */ public RogueDialogueEventParam clearIsValid() { @@ -221,7 +221,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 3; + * optional bool is_valid = 12; * @return the isValid */ public boolean getIsValid() { @@ -229,7 +229,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 3; + * optional bool is_valid = 12; * @param value the isValid to set * @return this */ @@ -245,8 +245,8 @@ public final class RogueDialogueEventParamOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; ratio = other.ratio; - dialogueEventId = other.dialogueEventId; argId = other.argId; + dialogueEventId = other.dialogueEventId; intValue = other.intValue; isValid = other.isValid; } @@ -262,12 +262,12 @@ public final class RogueDialogueEventParamOuterClass { if (other.hasRatio()) { setRatio(other.ratio); } - if (other.hasDialogueEventId()) { - setDialogueEventId(other.dialogueEventId); - } if (other.hasArgId()) { setArgId(other.argId); } + if (other.hasDialogueEventId()) { + setDialogueEventId(other.dialogueEventId); + } if (other.hasIntValue()) { setIntValue(other.intValue); } @@ -285,8 +285,8 @@ public final class RogueDialogueEventParamOuterClass { cachedSize = -1; bitField0_ = 0; ratio = 0F; - dialogueEventId = 0; argId = 0; + dialogueEventId = 0; intValue = 0; isValid = false; return this; @@ -313,8 +313,8 @@ public final class RogueDialogueEventParamOuterClass { RogueDialogueEventParam other = (RogueDialogueEventParam) o; return bitField0_ == other.bitField0_ && (!hasRatio() || ProtoUtil.isEqual(ratio, other.ratio)) - && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) && (!hasArgId() || argId == other.argId) + && (!hasDialogueEventId() || dialogueEventId == other.dialogueEventId) && (!hasIntValue() || intValue == other.intValue) && (!hasIsValid() || isValid == other.isValid); } @@ -322,23 +322,23 @@ public final class RogueDialogueEventParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 101); + output.writeRawByte((byte) 77); output.writeFloatNoTag(ratio); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(dialogueEventId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); output.writeUInt32NoTag(argId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(dialogueEventId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 40); output.writeSInt32NoTag(intValue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeBoolNoTag(isValid); } } @@ -350,10 +350,10 @@ public final class RogueDialogueEventParamOuterClass { size += 5; } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(argId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(argId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(intValue); @@ -371,7 +371,7 @@ public final class RogueDialogueEventParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 101: { + case 77: { // ratio ratio = input.readFloat(); bitField0_ |= 0x00000001; @@ -381,33 +381,33 @@ public final class RogueDialogueEventParamOuterClass { } } case 32: { - // dialogueEventId - dialogueEventId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // argId argId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 16) { + if (tag != 56) { break; } } - case 16: { + case 56: { + // dialogueEventId + dialogueEventId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // intValue intValue = input.readSInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // isValid isValid = input.readBool(); bitField0_ |= 0x00000010; @@ -437,10 +437,10 @@ public final class RogueDialogueEventParamOuterClass { output.writeFloat(FieldNames.ratio, ratio); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); + output.writeUInt32(FieldNames.argId, argId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.argId, argId); + output.writeUInt32(FieldNames.dialogueEventId, dialogueEventId); } if ((bitField0_ & 0x00000008) != 0) { output.writeSInt32(FieldNames.intValue, intValue); @@ -469,11 +469,11 @@ public final class RogueDialogueEventParamOuterClass { } break; } - case 88389725: - case 1671736167: { - if (input.isAtField(FieldNames.dialogueEventId)) { + case 93079057: + case -1409495132: { + if (input.isAtField(FieldNames.argId)) { if (!input.trySkipNullValue()) { - dialogueEventId = input.readUInt32(); + argId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -481,11 +481,11 @@ public final class RogueDialogueEventParamOuterClass { } break; } - case 93079057: - case -1409495132: { - if (input.isAtField(FieldNames.argId)) { + case 88389725: + case 1671736167: { + if (input.isAtField(FieldNames.dialogueEventId)) { if (!input.trySkipNullValue()) { - argId = input.readUInt32(); + dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -572,10 +572,10 @@ public final class RogueDialogueEventParamOuterClass { static class FieldNames { static final FieldName ratio = FieldName.forField("ratio"); - static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); - static final FieldName argId = FieldName.forField("argId", "arg_id"); + static final FieldName dialogueEventId = FieldName.forField("dialogueEventId", "dialogue_event_id"); + static final FieldName intValue = FieldName.forField("intValue", "int_value"); static final FieldName isValid = FieldName.forField("isValid", "is_valid"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java index 37f3716..e372767 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueFinishInfoOuterClass.java @@ -19,7 +19,7 @@ public final class RogueFinishInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 pass_room_count = 3; + * optional uint32 pass_room_count = 1; */ private int passRoomCount; @@ -29,7 +29,7 @@ public final class RogueFinishInfoOuterClass { private int totalScore; /** - * optional uint32 taken_score = 10; + * optional uint32 taken_score = 15; */ private int takenScore; @@ -40,40 +40,44 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  unfinished
+     *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1911; + * optional uint32 reach_room_count = 1818; */ private int reachRoomCount; /** + * 
+     *  could be 10?
+     *
+ * * optional bool is_win = 4; */ private boolean isWin; /** - * optional .RogueRecordInfo record_info = 5; + * 
+     *  may be 5
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 2; */ - private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance(); + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** * 
-     *  may be 14
+     *  may be 2
      *
* - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_info = 5; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); /** - * 
-     *  may be 7
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; + * optional .RogueRecordInfo record_info = 14; */ - private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo curScoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); + private final RogueRecordInfoOuterClass.RogueRecordInfo recordInfo = RogueRecordInfoOuterClass.RogueRecordInfo.newInstance(); private RogueFinishInfo() { } @@ -86,7 +90,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 3; + * optional uint32 pass_room_count = 1; * @return whether the passRoomCount field is set */ public boolean hasPassRoomCount() { @@ -94,7 +98,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 3; + * optional uint32 pass_room_count = 1; * @return this */ public RogueFinishInfo clearPassRoomCount() { @@ -104,7 +108,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 3; + * optional uint32 pass_room_count = 1; * @return the passRoomCount */ public int getPassRoomCount() { @@ -112,7 +116,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 pass_room_count = 3; + * optional uint32 pass_room_count = 1; * @param value the passRoomCount to set * @return this */ @@ -160,7 +164,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 10; + * optional uint32 taken_score = 15; * @return whether the takenScore field is set */ public boolean hasTakenScore() { @@ -168,7 +172,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 10; + * optional uint32 taken_score = 15; * @return this */ public RogueFinishInfo clearTakenScore() { @@ -178,7 +182,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 10; + * optional uint32 taken_score = 15; * @return the takenScore */ public int getTakenScore() { @@ -186,7 +190,7 @@ public final class RogueFinishInfoOuterClass { } /** - * optional uint32 taken_score = 10; + * optional uint32 taken_score = 15; * @param value the takenScore to set * @return this */ @@ -235,10 +239,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  unfinished
+     *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1911; + * optional uint32 reach_room_count = 1818; * @return whether the reachRoomCount field is set */ public boolean hasReachRoomCount() { @@ -247,10 +251,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  unfinished
+     *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1911; + * optional uint32 reach_room_count = 1818; * @return this */ public RogueFinishInfo clearReachRoomCount() { @@ -261,10 +265,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  unfinished
+     *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1911; + * optional uint32 reach_room_count = 1818; * @return the reachRoomCount */ public int getReachRoomCount() { @@ -273,10 +277,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  unfinished
+     *  unfinished, idk those
      *
* - * optional uint32 reach_room_count = 1911; + * optional uint32 reach_room_count = 1818; * @param value the reachRoomCount to set * @return this */ @@ -287,6 +291,10 @@ public final class RogueFinishInfoOuterClass { } /** + * 
+     *  could be 10?
+     *
+ * * optional bool is_win = 4; * @return whether the isWin field is set */ @@ -295,6 +303,10 @@ public final class RogueFinishInfoOuterClass { } /** + * 
+     *  could be 10?
+     *
+ * * optional bool is_win = 4; * @return this */ @@ -305,6 +317,10 @@ public final class RogueFinishInfoOuterClass { } /** + * 
+     *  could be 10?
+     *
+ * * optional bool is_win = 4; * @return the isWin */ @@ -313,6 +329,10 @@ public final class RogueFinishInfoOuterClass { } /** + * 
+     *  could be 10?
+     *
+ * * optional bool is_win = 4; * @param value the isWin to set * @return this @@ -324,172 +344,37 @@ public final class RogueFinishInfoOuterClass { } /** - * optional .RogueRecordInfo record_info = 5; - * @return whether the recordInfo field is set + * 
+     *  may be 5
+     *
+ * + * optional .RogueScoreRewardInfo cur_score_reward_info = 2; + * @return whether the curScoreRewardInfo field is set */ - public boolean hasRecordInfo() { + public boolean hasCurScoreRewardInfo() { return (bitField0_ & 0x00000040) != 0; } - /** - * optional .RogueRecordInfo record_info = 5; - * @return this - */ - public RogueFinishInfo clearRecordInfo() { - bitField0_ &= ~0x00000040; - recordInfo.clear(); - return this; - } - - /** - * optional .RogueRecordInfo record_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 #getMutableRecordInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueRecordInfoOuterClass.RogueRecordInfo getRecordInfo() { - return recordInfo; - } - - /** - * optional .RogueRecordInfo record_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() { - bitField0_ |= 0x00000040; - return recordInfo; - } - - /** - * optional .RogueRecordInfo record_info = 5; - * @param value the recordInfo to set - * @return this - */ - public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) { - bitField0_ |= 0x00000040; - recordInfo.copyFrom(value); - return this; - } - /** * 
-     *  may be 14
+     *  may be 5
      *
* - * optional .RogueScoreRewardInfo score_reward_info = 7; - * @return whether the scoreRewardInfo field is set - */ - public boolean hasScoreRewardInfo() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * 
-     *  may be 14
-     *
- * - * optional .RogueScoreRewardInfo score_reward_info = 7; - * @return this - */ - public RogueFinishInfo clearScoreRewardInfo() { - bitField0_ &= ~0x00000080; - scoreRewardInfo.clear(); - return this; - } - - /** - * 
-     *  may be 14
-     *
- * - * optional .RogueScoreRewardInfo score_reward_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 #getMutableScoreRewardInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() { - return scoreRewardInfo; - } - - /** - * 
-     *  may be 14
-     *
- * - * optional .RogueScoreRewardInfo score_reward_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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() { - bitField0_ |= 0x00000080; - return scoreRewardInfo; - } - - /** - * 
-     *  may be 14
-     *
- * - * optional .RogueScoreRewardInfo score_reward_info = 7; - * @param value the scoreRewardInfo to set - * @return this - */ - public RogueFinishInfo setScoreRewardInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000080; - scoreRewardInfo.copyFrom(value); - return this; - } - - /** - * 
-     *  may be 7
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; - * @return whether the curScoreRewardInfo field is set - */ - public boolean hasCurScoreRewardInfo() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * 
-     *  may be 7
-     *
- * - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; + * optional .RogueScoreRewardInfo cur_score_reward_info = 2; * @return this */ public RogueFinishInfo clearCurScoreRewardInfo() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; curScoreRewardInfo.clear(); return this; } /** * 
-     *  may be 7
+     *  may be 5
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; + * optional .RogueScoreRewardInfo cur_score_reward_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. @@ -504,10 +389,10 @@ public final class RogueFinishInfoOuterClass { /** * 
-     *  may be 7
+     *  may be 5
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; + * optional .RogueScoreRewardInfo cur_score_reward_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 @@ -516,26 +401,161 @@ public final class RogueFinishInfoOuterClass { * @return internal storage object for modifications */ public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableCurScoreRewardInfo() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; return curScoreRewardInfo; } /** * 
-     *  may be 7
+     *  may be 5
      *
* - * optional .RogueScoreRewardInfo cur_score_reward_info = 14; + * optional .RogueScoreRewardInfo cur_score_reward_info = 2; * @param value the curScoreRewardInfo to set * @return this */ public RogueFinishInfo setCurScoreRewardInfo( final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; curScoreRewardInfo.copyFrom(value); return this; } + /** + * 
+     *  may be 2
+     *
+ * + * optional .RogueScoreRewardInfo score_reward_info = 5; + * @return whether the scoreRewardInfo field is set + */ + public boolean hasScoreRewardInfo() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * 
+     *  may be 2
+     *
+ * + * optional .RogueScoreRewardInfo score_reward_info = 5; + * @return this + */ + public RogueFinishInfo clearScoreRewardInfo() { + bitField0_ &= ~0x00000080; + scoreRewardInfo.clear(); + return this; + } + + /** + * 
+     *  may be 2
+     *
+ * + * optional .RogueScoreRewardInfo score_reward_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 #getMutableScoreRewardInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getScoreRewardInfo() { + return scoreRewardInfo; + } + + /** + * 
+     *  may be 2
+     *
+ * + * optional .RogueScoreRewardInfo score_reward_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableScoreRewardInfo() { + bitField0_ |= 0x00000080; + return scoreRewardInfo; + } + + /** + * 
+     *  may be 2
+     *
+ * + * optional .RogueScoreRewardInfo score_reward_info = 5; + * @param value the scoreRewardInfo to set + * @return this + */ + public RogueFinishInfo setScoreRewardInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000080; + scoreRewardInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueRecordInfo record_info = 14; + * @return whether the recordInfo field is set + */ + public boolean hasRecordInfo() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional .RogueRecordInfo record_info = 14; + * @return this + */ + public RogueFinishInfo clearRecordInfo() { + bitField0_ &= ~0x00000100; + recordInfo.clear(); + return this; + } + + /** + * optional .RogueRecordInfo record_info = 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. + * + * 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 = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueRecordInfoOuterClass.RogueRecordInfo getMutableRecordInfo() { + bitField0_ |= 0x00000100; + return recordInfo; + } + + /** + * optional .RogueRecordInfo record_info = 14; + * @param value the recordInfo to set + * @return this + */ + public RogueFinishInfo setRecordInfo(final RogueRecordInfoOuterClass.RogueRecordInfo value) { + bitField0_ |= 0x00000100; + recordInfo.copyFrom(value); + return this; + } + @Override public RogueFinishInfo copyFrom(final RogueFinishInfo other) { cachedSize = other.cachedSize; @@ -547,9 +567,9 @@ public final class RogueFinishInfoOuterClass { areaId = other.areaId; reachRoomCount = other.reachRoomCount; isWin = other.isWin; - recordInfo.copyFrom(other.recordInfo); - scoreRewardInfo.copyFrom(other.scoreRewardInfo); curScoreRewardInfo.copyFrom(other.curScoreRewardInfo); + scoreRewardInfo.copyFrom(other.scoreRewardInfo); + recordInfo.copyFrom(other.recordInfo); } return this; } @@ -578,14 +598,14 @@ public final class RogueFinishInfoOuterClass { if (other.hasIsWin()) { setIsWin(other.isWin); } - if (other.hasRecordInfo()) { - getMutableRecordInfo().mergeFrom(other.recordInfo); + if (other.hasCurScoreRewardInfo()) { + getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo); } if (other.hasScoreRewardInfo()) { getMutableScoreRewardInfo().mergeFrom(other.scoreRewardInfo); } - if (other.hasCurScoreRewardInfo()) { - getMutableCurScoreRewardInfo().mergeFrom(other.curScoreRewardInfo); + if (other.hasRecordInfo()) { + getMutableRecordInfo().mergeFrom(other.recordInfo); } return this; } @@ -603,9 +623,9 @@ public final class RogueFinishInfoOuterClass { areaId = 0; reachRoomCount = 0; isWin = false; - recordInfo.clear(); - scoreRewardInfo.clear(); curScoreRewardInfo.clear(); + scoreRewardInfo.clear(); + recordInfo.clear(); return this; } @@ -616,9 +636,9 @@ public final class RogueFinishInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - recordInfo.clearQuick(); - scoreRewardInfo.clearQuick(); curScoreRewardInfo.clearQuick(); + scoreRewardInfo.clearQuick(); + recordInfo.clearQuick(); return this; } @@ -638,15 +658,15 @@ public final class RogueFinishInfoOuterClass { && (!hasAreaId() || areaId == other.areaId) && (!hasReachRoomCount() || reachRoomCount == other.reachRoomCount) && (!hasIsWin() || isWin == other.isWin) - && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)) + && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo)) && (!hasScoreRewardInfo() || scoreRewardInfo.equals(other.scoreRewardInfo)) - && (!hasCurScoreRewardInfo() || curScoreRewardInfo.equals(other.curScoreRewardInfo)); + && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(passRoomCount); } if ((bitField0_ & 0x00000002) != 0) { @@ -654,7 +674,7 @@ public final class RogueFinishInfoOuterClass { output.writeUInt32NoTag(totalScore); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(takenScore); } if ((bitField0_ & 0x00000008) != 0) { @@ -662,7 +682,7 @@ public final class RogueFinishInfoOuterClass { output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 30648); + output.writeRawLittleEndian16((short) 29136); output.writeUInt32NoTag(reachRoomCount); } if ((bitField0_ & 0x00000020) != 0) { @@ -670,16 +690,16 @@ public final class RogueFinishInfoOuterClass { output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(recordInfo); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(curScoreRewardInfo); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(scoreRewardInfo); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 114); - output.writeMessageNoTag(curScoreRewardInfo); + output.writeMessageNoTag(recordInfo); } } @@ -705,13 +725,13 @@ public final class RogueFinishInfoOuterClass { size += 2; } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scoreRewardInfo); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(curScoreRewardInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(recordInfo); } return size; } @@ -723,7 +743,7 @@ public final class RogueFinishInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 8: { // passRoomCount passRoomCount = input.readUInt32(); bitField0_ |= 0x00000001; @@ -737,11 +757,11 @@ public final class RogueFinishInfoOuterClass { totalScore = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { + case 120: { // takenScore takenScore = input.readUInt32(); bitField0_ |= 0x00000004; @@ -755,11 +775,11 @@ public final class RogueFinishInfoOuterClass { areaId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 15288) { + if (tag != 14544) { break; } } - case 15288: { + case 14544: { // reachRoomCount reachRoomCount = input.readUInt32(); bitField0_ |= 0x00000010; @@ -773,20 +793,20 @@ public final class RogueFinishInfoOuterClass { isWin = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // curScoreRewardInfo + input.readMessage(curScoreRewardInfo); + bitField0_ |= 0x00000040; + tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // recordInfo - input.readMessage(recordInfo); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { // scoreRewardInfo input.readMessage(scoreRewardInfo); bitField0_ |= 0x00000080; @@ -796,8 +816,8 @@ public final class RogueFinishInfoOuterClass { } } case 114: { - // curScoreRewardInfo - input.readMessage(curScoreRewardInfo); + // recordInfo + input.readMessage(recordInfo); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 0) { @@ -840,13 +860,13 @@ public final class RogueFinishInfoOuterClass { output.writeBool(FieldNames.isWin, isWin); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.recordInfo, recordInfo); + output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.scoreRewardInfo, scoreRewardInfo); } if ((bitField0_ & 0x00000100) != 0) { - output.writeMessage(FieldNames.curScoreRewardInfo, curScoreRewardInfo); + output.writeMessage(FieldNames.recordInfo, recordInfo); } output.endObject(); } @@ -930,11 +950,11 @@ public final class RogueFinishInfoOuterClass { } break; } - case 734573727: - case 1317125084: { - if (input.isAtField(FieldNames.recordInfo)) { + case 1101722191: + case 1894162770: { + if (input.isAtField(FieldNames.curScoreRewardInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(recordInfo); + input.readMessage(curScoreRewardInfo); bitField0_ |= 0x00000040; } } else { @@ -954,11 +974,11 @@ public final class RogueFinishInfoOuterClass { } break; } - case 1101722191: - case 1894162770: { - if (input.isAtField(FieldNames.curScoreRewardInfo)) { + case 734573727: + case 1317125084: { + if (input.isAtField(FieldNames.recordInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(curScoreRewardInfo); + input.readMessage(recordInfo); bitField0_ |= 0x00000100; } } else { @@ -1031,11 +1051,11 @@ public final class RogueFinishInfoOuterClass { static final FieldName isWin = FieldName.forField("isWin", "is_win"); - static final FieldName recordInfo = FieldName.forField("recordInfo", "record_info"); + static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info"); static final FieldName scoreRewardInfo = FieldName.forField("scoreRewardInfo", "score_reward_info"); - static final FieldName curScoreRewardInfo = FieldName.forField("curScoreRewardInfo", "cur_score_reward_info"); + 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 4f21479..085ae77 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java @@ -19,30 +19,30 @@ public final class RogueInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueAreaInfo rogue_area_info = 5; - */ - private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); - - /** - * optional .RogueSeasonInfo rogue_season_info = 7; - */ - private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - */ - private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; */ private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance(); /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 3; */ private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); + /** + * optional .RogueSeasonInfo rogue_season_info = 5; + */ + private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 10; + */ + private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); + + /** + * optional .RogueAreaInfo rogue_area_info = 12; + */ + private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); + private RogueInfoData() { } @@ -54,197 +54,25 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAreaInfo rogue_area_info = 5; - * @return whether the rogueAreaInfo field is set + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; + * @return whether the rogueVirtualItemInfo field is set */ - public boolean hasRogueAreaInfo() { + public boolean hasRogueVirtualItemInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueAreaInfo rogue_area_info = 5; - * @return this - */ - public RogueInfoData clearRogueAreaInfo() { - bitField0_ &= ~0x00000001; - rogueAreaInfo.clear(); - return this; - } - - /** - * optional .RogueAreaInfo rogue_area_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 #getMutableRogueAreaInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAreaInfoOuterClass.RogueAreaInfo getRogueAreaInfo() { - return rogueAreaInfo; - } - - /** - * optional .RogueAreaInfo rogue_area_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { - bitField0_ |= 0x00000001; - return rogueAreaInfo; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 5; - * @param value the rogueAreaInfo to set - * @return this - */ - public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { - bitField0_ |= 0x00000001; - rogueAreaInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 7; - * @return whether the rogueSeasonInfo field is set - */ - public boolean hasRogueSeasonInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 7; - * @return this - */ - public RogueInfoData clearRogueSeasonInfo() { - bitField0_ &= ~0x00000002; - rogueSeasonInfo.clear(); - return this; - } - - /** - * optional .RogueSeasonInfo rogue_season_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 #getMutableRogueSeasonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_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 RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { - bitField0_ |= 0x00000002; - return rogueSeasonInfo; - } - - /** - * optional .RogueSeasonInfo rogue_season_info = 7; - * @param value the rogueSeasonInfo to set - * @return this - */ - public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { - bitField0_ |= 0x00000002; - rogueSeasonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - * @return whether the rogueScoreInfo field is set - */ - public boolean hasRogueScoreInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - * @return this - */ - public RogueInfoData clearRogueScoreInfo() { - bitField0_ &= ~0x00000004; - rogueScoreInfo.clear(); - return this; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - * - * 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 #getMutableRogueScoreInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getRogueScoreInfo() { - return rogueScoreInfo; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - * - * 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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { - bitField0_ |= 0x00000004; - return rogueScoreInfo; - } - - /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; - * @param value the rogueScoreInfo to set - * @return this - */ - public RogueInfoData setRogueScoreInfo( - final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { - bitField0_ |= 0x00000004; - rogueScoreInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; - * @return whether the rogueVirtualItemInfo field is set - */ - public boolean hasRogueVirtualItemInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; * @return this */ public RogueInfoData clearRogueVirtualItemInfo() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; rogueVirtualItemInfo.clear(); return this; } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; + * optional .RogueCurVirtualItemInfo 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. @@ -258,7 +86,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; + * optional .RogueCurVirtualItemInfo 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 @@ -268,42 +96,42 @@ public final class RogueInfoDataOuterClass { */ public RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo getMutableRogueVirtualItemInfo( ) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; return rogueVirtualItemInfo; } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 2; * @param value the rogueVirtualItemInfo to set * @return this */ public RogueInfoData setRogueVirtualItemInfo( final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueVirtualItemInfo.copyFrom(value); return this; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 3; * @return whether the rogueAeonInfo field is set */ public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 3; * @return this */ public RogueInfoData clearRogueAeonInfo() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; rogueAeonInfo.clear(); return this; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_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. @@ -317,7 +145,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_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 @@ -326,31 +154,203 @@ public final class RogueInfoDataOuterClass { * @return internal storage object for modifications */ public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; return rogueAeonInfo; } /** - * optional .RogueAeonInfo rogue_aeon_info = 11; + * optional .RogueAeonInfo rogue_aeon_info = 3; * @param value the rogueAeonInfo to set * @return this */ public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; rogueAeonInfo.copyFrom(value); return this; } + /** + * optional .RogueSeasonInfo rogue_season_info = 5; + * @return whether the rogueSeasonInfo field is set + */ + public boolean hasRogueSeasonInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 5; + * @return this + */ + public RogueInfoData clearRogueSeasonInfo() { + bitField0_ &= ~0x00000004; + rogueSeasonInfo.clear(); + return this; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 #getMutableRogueSeasonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { + bitField0_ |= 0x00000004; + return rogueSeasonInfo; + } + + /** + * optional .RogueSeasonInfo rogue_season_info = 5; + * @param value the rogueSeasonInfo to set + * @return this + */ + public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { + bitField0_ |= 0x00000004; + rogueSeasonInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 10; + * @return whether the rogueScoreInfo field is set + */ + public boolean hasRogueScoreInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 10; + * @return this + */ + public RogueInfoData clearRogueScoreInfo() { + bitField0_ &= ~0x00000008; + rogueScoreInfo.clear(); + return this; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_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 #getMutableRogueScoreInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getRogueScoreInfo() { + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_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 RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo getMutableRogueScoreInfo() { + bitField0_ |= 0x00000008; + return rogueScoreInfo; + } + + /** + * optional .RogueScoreRewardInfo rogue_score_info = 10; + * @param value the rogueScoreInfo to set + * @return this + */ + public RogueInfoData setRogueScoreInfo( + final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo value) { + bitField0_ |= 0x00000008; + rogueScoreInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 12; + * @return whether the rogueAreaInfo field is set + */ + public boolean hasRogueAreaInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 12; + * @return this + */ + public RogueInfoData clearRogueAreaInfo() { + bitField0_ &= ~0x00000010; + rogueAreaInfo.clear(); + return this; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 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 #getMutableRogueAreaInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAreaInfoOuterClass.RogueAreaInfo getRogueAreaInfo() { + return rogueAreaInfo; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 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 RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { + bitField0_ |= 0x00000010; + return rogueAreaInfo; + } + + /** + * optional .RogueAreaInfo rogue_area_info = 12; + * @param value the rogueAreaInfo to set + * @return this + */ + public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { + bitField0_ |= 0x00000010; + rogueAreaInfo.copyFrom(value); + return this; + } + @Override public RogueInfoData copyFrom(final RogueInfoData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueAreaInfo.copyFrom(other.rogueAreaInfo); - rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); - rogueScoreInfo.copyFrom(other.rogueScoreInfo); rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); rogueAeonInfo.copyFrom(other.rogueAeonInfo); + rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); + rogueScoreInfo.copyFrom(other.rogueScoreInfo); + rogueAreaInfo.copyFrom(other.rogueAreaInfo); } return this; } @@ -361,8 +361,11 @@ public final class RogueInfoDataOuterClass { return this; } cachedSize = -1; - if (other.hasRogueAreaInfo()) { - getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); + if (other.hasRogueVirtualItemInfo()) { + getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); + } + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } if (other.hasRogueSeasonInfo()) { getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); @@ -370,11 +373,8 @@ public final class RogueInfoDataOuterClass { if (other.hasRogueScoreInfo()) { getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); } - if (other.hasRogueVirtualItemInfo()) { - getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); - } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); + if (other.hasRogueAreaInfo()) { + getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); } return this; } @@ -386,11 +386,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueAreaInfo.clear(); - rogueSeasonInfo.clear(); - rogueScoreInfo.clear(); rogueVirtualItemInfo.clear(); rogueAeonInfo.clear(); + rogueSeasonInfo.clear(); + rogueScoreInfo.clear(); + rogueAreaInfo.clear(); return this; } @@ -401,11 +401,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueAreaInfo.clearQuick(); - rogueSeasonInfo.clearQuick(); - rogueScoreInfo.clearQuick(); rogueVirtualItemInfo.clearQuick(); rogueAeonInfo.clearQuick(); + rogueSeasonInfo.clearQuick(); + rogueScoreInfo.clearQuick(); + rogueAreaInfo.clearQuick(); return this; } @@ -419,34 +419,34 @@ public final class RogueInfoDataOuterClass { } RogueInfoData other = (RogueInfoData) o; return bitField0_ == other.bitField0_ - && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)) + && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)) && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) - && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)); + && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(rogueAreaInfo); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(rogueVirtualItemInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(rogueSeasonInfo); + output.writeRawByte((byte) 26); + output.writeMessageNoTag(rogueAeonInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(rogueScoreInfo); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(rogueSeasonInfo); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(rogueVirtualItemInfo); + output.writeMessageNoTag(rogueScoreInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(rogueAeonInfo); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(rogueAreaInfo); } } @@ -454,20 +454,20 @@ public final class RogueInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); + } return size; } @@ -478,27 +478,27 @@ public final class RogueInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { - // rogueAreaInfo - input.readMessage(rogueAreaInfo); + case 18: { + // rogueVirtualItemInfo + input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 26) { break; } } - case 58: { - // rogueSeasonInfo - input.readMessage(rogueSeasonInfo); + case 26: { + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 42) { break; } } - case 74: { - // rogueScoreInfo - input.readMessage(rogueScoreInfo); + case 42: { + // rogueSeasonInfo + input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 82) { @@ -506,17 +506,17 @@ public final class RogueInfoDataOuterClass { } } case 82: { - // rogueVirtualItemInfo - input.readMessage(rogueVirtualItemInfo); + // rogueScoreInfo + input.readMessage(rogueScoreInfo); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 90) { + if (tag != 98) { break; } } - case 90: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + case 98: { + // rogueAreaInfo + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -541,20 +541,20 @@ public final class RogueInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); + } output.endObject(); } @@ -565,48 +565,12 @@ public final class RogueInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 964297429: - case -851505925: { - if (input.isAtField(FieldNames.rogueAreaInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAreaInfo); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1037341781: - case -588845659: { - if (input.isAtField(FieldNames.rogueSeasonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueSeasonInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2078217638: - case -208816704: { - if (input.isAtField(FieldNames.rogueScoreInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueScoreInfo); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 1066755410: case 1452147457: { if (input.isAtField(FieldNames.rogueVirtualItemInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueVirtualItemInfo); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -618,6 +582,42 @@ public final class RogueInfoDataOuterClass { if (input.isAtField(FieldNames.rogueAeonInfo)) { if (!input.trySkipNullValue()) { input.readMessage(rogueAeonInfo); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1037341781: + case -588845659: { + if (input.isAtField(FieldNames.rogueSeasonInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueSeasonInfo); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2078217638: + case -208816704: { + if (input.isAtField(FieldNames.rogueScoreInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 964297429: + case -851505925: { + if (input.isAtField(FieldNames.rogueAreaInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000010; } } else { @@ -677,15 +677,15 @@ public final class RogueInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info"); + static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); + + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); static final FieldName rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); static final FieldName rogueScoreInfo = FieldName.forField("rogueScoreInfo", "rogue_score_info"); - static final FieldName rogueVirtualItemInfo = FieldName.forField("rogueVirtualItemInfo", "rogue_virtual_item_info"); - - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); + static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java index 5efc45a..5f3a5a2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java @@ -19,15 +19,15 @@ public final class RogueInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCurrentInfo rogue_current_info = 363; - */ - private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); - - /** - * optional .RogueInfoData rogue_info_data = 470; + * optional .RogueInfoData rogue_info_data = 653; */ private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + */ + private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); + private RogueInfo() { } @@ -39,82 +39,25 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 363; - * @return whether the rogueCurrentInfo field is set + * optional .RogueInfoData rogue_info_data = 653; + * @return whether the rogueInfoData field is set */ - public boolean hasRogueCurrentInfo() { + public boolean hasRogueInfoData() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueCurrentInfo rogue_current_info = 363; - * @return this - */ - public RogueInfo clearRogueCurrentInfo() { - bitField0_ &= ~0x00000001; - rogueCurrentInfo.clear(); - return this; - } - - /** - * optional .RogueCurrentInfo rogue_current_info = 363; - * - * 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 #getMutableRogueCurrentInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueCurrentInfoOuterClass.RogueCurrentInfo getRogueCurrentInfo() { - return rogueCurrentInfo; - } - - /** - * optional .RogueCurrentInfo rogue_current_info = 363; - * - * 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 getMutableRogueCurrentInfo() { - bitField0_ |= 0x00000001; - return rogueCurrentInfo; - } - - /** - * optional .RogueCurrentInfo rogue_current_info = 363; - * @param value the rogueCurrentInfo to set - * @return this - */ - public RogueInfo setRogueCurrentInfo(final RogueCurrentInfoOuterClass.RogueCurrentInfo value) { - bitField0_ |= 0x00000001; - rogueCurrentInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueInfoData rogue_info_data = 470; - * @return whether the rogueInfoData field is set - */ - public boolean hasRogueInfoData() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueInfoData rogue_info_data = 470; + * optional .RogueInfoData rogue_info_data = 653; * @return this */ public RogueInfo clearRogueInfoData() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rogueInfoData.clear(); return this; } /** - * optional .RogueInfoData rogue_info_data = 470; + * optional .RogueInfoData rogue_info_data = 653; * * 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 +71,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 470; + * optional .RogueInfoData rogue_info_data = 653; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -137,28 +80,85 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RogueInfoDataOuterClass.RogueInfoData getMutableRogueInfoData() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return rogueInfoData; } /** - * optional .RogueInfoData rogue_info_data = 470; + * optional .RogueInfoData rogue_info_data = 653; * @param value the rogueInfoData to set * @return this */ public RogueInfo setRogueInfoData(final RogueInfoDataOuterClass.RogueInfoData value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; rogueInfoData.copyFrom(value); return this; } + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + * @return whether the rogueCurrentInfo field is set + */ + public boolean hasRogueCurrentInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + * @return this + */ + public RogueInfo clearRogueCurrentInfo() { + bitField0_ &= ~0x00000002; + rogueCurrentInfo.clear(); + return this; + } + + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + * + * 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 #getMutableRogueCurrentInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueCurrentInfoOuterClass.RogueCurrentInfo getRogueCurrentInfo() { + return rogueCurrentInfo; + } + + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + * + * 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 getMutableRogueCurrentInfo() { + bitField0_ |= 0x00000002; + return rogueCurrentInfo; + } + + /** + * optional .RogueCurrentInfo rogue_current_info = 1128; + * @param value the rogueCurrentInfo to set + * @return this + */ + public RogueInfo setRogueCurrentInfo(final RogueCurrentInfoOuterClass.RogueCurrentInfo value) { + bitField0_ |= 0x00000002; + rogueCurrentInfo.copyFrom(value); + return this; + } + @Override public RogueInfo copyFrom(final RogueInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueCurrentInfo.copyFrom(other.rogueCurrentInfo); rogueInfoData.copyFrom(other.rogueInfoData); + rogueCurrentInfo.copyFrom(other.rogueCurrentInfo); } return this; } @@ -169,12 +169,12 @@ public final class RogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRogueCurrentInfo()) { - getMutableRogueCurrentInfo().mergeFrom(other.rogueCurrentInfo); - } if (other.hasRogueInfoData()) { getMutableRogueInfoData().mergeFrom(other.rogueInfoData); } + if (other.hasRogueCurrentInfo()) { + getMutableRogueCurrentInfo().mergeFrom(other.rogueCurrentInfo); + } return this; } @@ -185,8 +185,8 @@ public final class RogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueCurrentInfo.clear(); rogueInfoData.clear(); + rogueCurrentInfo.clear(); return this; } @@ -197,8 +197,8 @@ public final class RogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueCurrentInfo.clearQuick(); rogueInfoData.clearQuick(); + rogueCurrentInfo.clearQuick(); return this; } @@ -212,19 +212,19 @@ public final class RogueInfoOuterClass { } RogueInfo other = (RogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasRogueCurrentInfo() || rogueCurrentInfo.equals(other.rogueCurrentInfo)) - && (!hasRogueInfoData() || rogueInfoData.equals(other.rogueInfoData)); + && (!hasRogueInfoData() || rogueInfoData.equals(other.rogueInfoData)) + && (!hasRogueCurrentInfo() || rogueCurrentInfo.equals(other.rogueCurrentInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 5850); - output.writeMessageNoTag(rogueCurrentInfo); + output.writeRawLittleEndian16((short) 10474); + output.writeMessageNoTag(rogueInfoData); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 7602); - output.writeMessageNoTag(rogueInfoData); + output.writeRawLittleEndian16((short) 18114); + output.writeMessageNoTag(rogueCurrentInfo); } } @@ -232,10 +232,10 @@ public final class RogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueCurrentInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueInfoData); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueInfoData); + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueCurrentInfo); } return size; } @@ -247,18 +247,18 @@ public final class RogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 2906: { - // rogueCurrentInfo - input.readMessage(rogueCurrentInfo); + case 5226: { + // rogueInfoData + input.readMessage(rogueInfoData); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 3762) { + if (tag != 9026) { break; } } - case 3762: { - // rogueInfoData - input.readMessage(rogueInfoData); + case 9026: { + // rogueCurrentInfo + input.readMessage(rogueCurrentInfo); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -283,10 +283,10 @@ public final class RogueInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueCurrentInfo, rogueCurrentInfo); + output.writeMessage(FieldNames.rogueInfoData, rogueInfoData); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueInfoData, rogueInfoData); + output.writeMessage(FieldNames.rogueCurrentInfo, rogueCurrentInfo); } output.endObject(); } @@ -298,11 +298,11 @@ public final class RogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -611905651: - case 1279173113: { - if (input.isAtField(FieldNames.rogueCurrentInfo)) { + case -1486739086: + case 480604278: { + if (input.isAtField(FieldNames.rogueInfoData)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueCurrentInfo); + input.readMessage(rogueInfoData); bitField0_ |= 0x00000001; } } else { @@ -310,11 +310,11 @@ public final class RogueInfoOuterClass { } break; } - case -1486739086: - case 480604278: { - if (input.isAtField(FieldNames.rogueInfoData)) { + case -611905651: + case 1279173113: { + if (input.isAtField(FieldNames.rogueCurrentInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueInfoData); + input.readMessage(rogueCurrentInfo); bitField0_ |= 0x00000002; } } else { @@ -374,9 +374,9 @@ public final class RogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueCurrentInfo = FieldName.forField("rogueCurrentInfo", "rogue_current_info"); - static final FieldName rogueInfoData = FieldName.forField("rogueInfoData", "rogue_info_data"); + + static final FieldName rogueCurrentInfo = FieldName.forField("rogueCurrentInfo", "rogue_current_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java index 87eacf6..022ea53 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMapInfoOuterClass.java @@ -20,27 +20,27 @@ public final class RogueMapInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_room_id = 1; - */ - private int curRoomId; - - /** - * optional uint32 map_id = 4; - */ - private int mapId; - - /** - * optional uint32 area_id = 8; + * optional uint32 area_id = 1; */ private int areaId; /** - * optional uint32 cur_site_id = 13; + * optional uint32 cur_site_id = 2; */ private int curSiteId; /** - * repeated .RogueRoom room_list = 15; + * optional uint32 map_id = 5; + */ + private int mapId; + + /** + * optional uint32 cur_room_id = 13; + */ + private int curRoomId; + + /** + * repeated .RogueRoom room_list = 4; */ private final RepeatedMessage roomList = RepeatedMessage.newEmptyInstance(RogueRoomOuterClass.RogueRoom.getFactory()); @@ -55,99 +55,25 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_room_id = 1; - * @return whether the curRoomId field is set + * optional uint32 area_id = 1; + * @return whether the areaId field is set */ - public boolean hasCurRoomId() { + public boolean hasAreaId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_room_id = 1; - * @return this - */ - public RogueMapInfo clearCurRoomId() { - bitField0_ &= ~0x00000001; - curRoomId = 0; - return this; - } - - /** - * optional uint32 cur_room_id = 1; - * @return the curRoomId - */ - public int getCurRoomId() { - return curRoomId; - } - - /** - * optional uint32 cur_room_id = 1; - * @param value the curRoomId to set - * @return this - */ - public RogueMapInfo setCurRoomId(final int value) { - bitField0_ |= 0x00000001; - curRoomId = value; - return this; - } - - /** - * optional uint32 map_id = 4; - * @return whether the mapId field is set - */ - public boolean hasMapId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 map_id = 4; - * @return this - */ - public RogueMapInfo clearMapId() { - bitField0_ &= ~0x00000002; - mapId = 0; - return this; - } - - /** - * optional uint32 map_id = 4; - * @return the mapId - */ - public int getMapId() { - return mapId; - } - - /** - * optional uint32 map_id = 4; - * @param value the mapId to set - * @return this - */ - public RogueMapInfo setMapId(final int value) { - bitField0_ |= 0x00000002; - mapId = value; - return this; - } - - /** - * optional uint32 area_id = 8; - * @return whether the areaId field is set - */ - public boolean hasAreaId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 area_id = 8; + * optional uint32 area_id = 1; * @return this */ public RogueMapInfo clearAreaId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; areaId = 0; return this; } /** - * optional uint32 area_id = 8; + * optional uint32 area_id = 1; * @return the areaId */ public int getAreaId() { @@ -155,36 +81,36 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 area_id = 8; + * optional uint32 area_id = 1; * @param value the areaId to set * @return this */ public RogueMapInfo setAreaId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; areaId = value; return this; } /** - * optional uint32 cur_site_id = 13; + * optional uint32 cur_site_id = 2; * @return whether the curSiteId field is set */ public boolean hasCurSiteId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_site_id = 13; + * optional uint32 cur_site_id = 2; * @return this */ public RogueMapInfo clearCurSiteId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; curSiteId = 0; return this; } /** - * optional uint32 cur_site_id = 13; + * optional uint32 cur_site_id = 2; * @return the curSiteId */ public int getCurSiteId() { @@ -192,18 +118,92 @@ public final class RogueMapInfoOuterClass { } /** - * optional uint32 cur_site_id = 13; + * optional uint32 cur_site_id = 2; * @param value the curSiteId to set * @return this */ public RogueMapInfo setCurSiteId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; curSiteId = value; return this; } /** - * repeated .RogueRoom room_list = 15; + * optional uint32 map_id = 5; + * @return whether the mapId field is set + */ + public boolean hasMapId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 map_id = 5; + * @return this + */ + public RogueMapInfo clearMapId() { + bitField0_ &= ~0x00000004; + mapId = 0; + return this; + } + + /** + * optional uint32 map_id = 5; + * @return the mapId + */ + public int getMapId() { + return mapId; + } + + /** + * optional uint32 map_id = 5; + * @param value the mapId to set + * @return this + */ + public RogueMapInfo setMapId(final int value) { + bitField0_ |= 0x00000004; + mapId = value; + return this; + } + + /** + * optional uint32 cur_room_id = 13; + * @return whether the curRoomId field is set + */ + public boolean hasCurRoomId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cur_room_id = 13; + * @return this + */ + public RogueMapInfo clearCurRoomId() { + bitField0_ &= ~0x00000008; + curRoomId = 0; + return this; + } + + /** + * optional uint32 cur_room_id = 13; + * @return the curRoomId + */ + public int getCurRoomId() { + return curRoomId; + } + + /** + * optional uint32 cur_room_id = 13; + * @param value the curRoomId to set + * @return this + */ + public RogueMapInfo setCurRoomId(final int value) { + bitField0_ |= 0x00000008; + curRoomId = value; + return this; + } + + /** + * repeated .RogueRoom room_list = 4; * @return whether the roomList field is set */ public boolean hasRoomList() { @@ -211,7 +211,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 15; + * repeated .RogueRoom room_list = 4; * @return this */ public RogueMapInfo clearRoomList() { @@ -221,7 +221,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 15; + * repeated .RogueRoom room_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. @@ -235,7 +235,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 15; + * repeated .RogueRoom room_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 @@ -249,7 +249,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 15; + * repeated .RogueRoom room_list = 4; * @param value the roomList to add * @return this */ @@ -260,7 +260,7 @@ public final class RogueMapInfoOuterClass { } /** - * repeated .RogueRoom room_list = 15; + * repeated .RogueRoom room_list = 4; * @param values the roomList to add * @return this */ @@ -275,10 +275,10 @@ public final class RogueMapInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curRoomId = other.curRoomId; - mapId = other.mapId; areaId = other.areaId; curSiteId = other.curSiteId; + mapId = other.mapId; + curRoomId = other.curRoomId; roomList.copyFrom(other.roomList); } return this; @@ -290,18 +290,18 @@ public final class RogueMapInfoOuterClass { return this; } cachedSize = -1; - if (other.hasCurRoomId()) { - setCurRoomId(other.curRoomId); - } - if (other.hasMapId()) { - setMapId(other.mapId); - } if (other.hasAreaId()) { setAreaId(other.areaId); } if (other.hasCurSiteId()) { setCurSiteId(other.curSiteId); } + if (other.hasMapId()) { + setMapId(other.mapId); + } + if (other.hasCurRoomId()) { + setCurRoomId(other.curRoomId); + } if (other.hasRoomList()) { getMutableRoomList().addAll(other.roomList); } @@ -315,10 +315,10 @@ public final class RogueMapInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curRoomId = 0; - mapId = 0; areaId = 0; curSiteId = 0; + mapId = 0; + curRoomId = 0; roomList.clear(); return this; } @@ -344,10 +344,10 @@ public final class RogueMapInfoOuterClass { } RogueMapInfo other = (RogueMapInfo) o; return bitField0_ == other.bitField0_ - && (!hasCurRoomId() || curRoomId == other.curRoomId) - && (!hasMapId() || mapId == other.mapId) && (!hasAreaId() || areaId == other.areaId) && (!hasCurSiteId() || curSiteId == other.curSiteId) + && (!hasMapId() || mapId == other.mapId) + && (!hasCurRoomId() || curRoomId == other.curRoomId) && (!hasRoomList() || roomList.equals(other.roomList)); } @@ -355,23 +355,23 @@ public final class RogueMapInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curRoomId); + output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(mapId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(curSiteId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(areaId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(curSiteId); + output.writeUInt32NoTag(curRoomId); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < roomList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 34); output.writeMessageNoTag(roomList.get(i)); } } @@ -381,17 +381,17 @@ public final class RogueMapInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curRoomId); + } if ((bitField0_ & 0x00000010) != 0) { size += (1 * roomList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(roomList); } @@ -406,26 +406,26 @@ public final class RogueMapInfoOuterClass { while (true) { switch (tag) { case 8: { - // curRoomId - curRoomId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // areaId areaId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // curSiteId + curSiteId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // mapId + mapId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -433,15 +433,15 @@ public final class RogueMapInfoOuterClass { } } case 104: { - // curSiteId - curSiteId = input.readUInt32(); + // curRoomId + curRoomId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 34) { break; } } - case 122: { + case 34: { // roomList tag = input.readRepeatedMessage(roomList, tag); bitField0_ |= 0x00000010; @@ -467,17 +467,17 @@ public final class RogueMapInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curRoomId, curRoomId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mapId, mapId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.areaId, areaId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.curSiteId, curSiteId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.mapId, mapId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.curRoomId, curRoomId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.roomList, roomList); } @@ -491,36 +491,12 @@ public final class RogueMapInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -249266762: - case 524969984: { - if (input.isAtField(FieldNames.curRoomId)) { - if (!input.trySkipNullValue()) { - curRoomId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 103663511: - case -1081377058: { - if (input.isAtField(FieldNames.mapId)) { - if (!input.trySkipNullValue()) { - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1409553784: case -746472947: { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { areaId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -532,6 +508,30 @@ public final class RogueMapInfoOuterClass { if (input.isAtField(FieldNames.curSiteId)) { if (!input.trySkipNullValue()) { curSiteId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 103663511: + case -1081377058: { + if (input.isAtField(FieldNames.mapId)) { + if (!input.trySkipNullValue()) { + mapId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -249266762: + case 524969984: { + if (input.isAtField(FieldNames.curRoomId)) { + if (!input.trySkipNullValue()) { + curRoomId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -603,14 +603,14 @@ public final class RogueMapInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curRoomId = FieldName.forField("curRoomId", "cur_room_id"); - - static final FieldName mapId = FieldName.forField("mapId", "map_id"); - static final FieldName areaId = FieldName.forField("areaId", "area_id"); static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); + static final FieldName mapId = FieldName.forField("mapId", "map_id"); + + static final FieldName curRoomId = FieldName.forField("curRoomId", "cur_room_id"); + static final FieldName roomList = FieldName.forField("roomList", "room_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java index 8941507..9085bbd 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java @@ -20,29 +20,29 @@ public final class RogueMiracleDataInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 JFIPNOAJNJM = 1; + * optional uint32 KABNOGFDKFI = 2; */ - private int jFIPNOAJNJM; + private int kABNOGFDKFI; /** - * optional uint32 IKPLEKFLPFF = 6; + * optional uint32 NDPAMBJKKFD = 9; */ - private int iKPLEKFLPFF; + private int nDPAMBJKKFD; /** - * optional uint32 ODFNOGMKDOA = 9; - */ - private int oDFNOGMKDOA; - - /** - * optional uint32 miracle_id = 12; + * optional uint32 miracle_id = 10; */ private int miracleId; /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * optional uint32 NFNNOMAMNAA = 12; */ - private final RepeatedMessage dFKPIBCLGOP = RepeatedMessage.newEmptyInstance(DFKPIBCLGOPEntry.getFactory()); + private int nFNNOMAMNAA; + + /** + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + */ + private final RepeatedMessage jBFJGEIGGBA = RepeatedMessage.newEmptyInstance(JBFJGEIGGBAEntry.getFactory()); private RogueMiracleDataInfo() { } @@ -55,136 +55,99 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 JFIPNOAJNJM = 1; - * @return whether the jFIPNOAJNJM field is set + * optional uint32 KABNOGFDKFI = 2; + * @return whether the kABNOGFDKFI field is set */ - public boolean hasJFIPNOAJNJM() { + public boolean hasKABNOGFDKFI() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 JFIPNOAJNJM = 1; + * optional uint32 KABNOGFDKFI = 2; * @return this */ - public RogueMiracleDataInfo clearJFIPNOAJNJM() { + public RogueMiracleDataInfo clearKABNOGFDKFI() { bitField0_ &= ~0x00000001; - jFIPNOAJNJM = 0; + kABNOGFDKFI = 0; return this; } /** - * optional uint32 JFIPNOAJNJM = 1; - * @return the jFIPNOAJNJM + * optional uint32 KABNOGFDKFI = 2; + * @return the kABNOGFDKFI */ - public int getJFIPNOAJNJM() { - return jFIPNOAJNJM; + public int getKABNOGFDKFI() { + return kABNOGFDKFI; } /** - * optional uint32 JFIPNOAJNJM = 1; - * @param value the jFIPNOAJNJM to set + * optional uint32 KABNOGFDKFI = 2; + * @param value the kABNOGFDKFI to set * @return this */ - public RogueMiracleDataInfo setJFIPNOAJNJM(final int value) { + public RogueMiracleDataInfo setKABNOGFDKFI(final int value) { bitField0_ |= 0x00000001; - jFIPNOAJNJM = value; + kABNOGFDKFI = value; return this; } /** - * optional uint32 IKPLEKFLPFF = 6; - * @return whether the iKPLEKFLPFF field is set + * optional uint32 NDPAMBJKKFD = 9; + * @return whether the nDPAMBJKKFD field is set */ - public boolean hasIKPLEKFLPFF() { + public boolean hasNDPAMBJKKFD() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 IKPLEKFLPFF = 6; + * optional uint32 NDPAMBJKKFD = 9; * @return this */ - public RogueMiracleDataInfo clearIKPLEKFLPFF() { + public RogueMiracleDataInfo clearNDPAMBJKKFD() { bitField0_ &= ~0x00000002; - iKPLEKFLPFF = 0; + nDPAMBJKKFD = 0; return this; } /** - * optional uint32 IKPLEKFLPFF = 6; - * @return the iKPLEKFLPFF + * optional uint32 NDPAMBJKKFD = 9; + * @return the nDPAMBJKKFD */ - public int getIKPLEKFLPFF() { - return iKPLEKFLPFF; + public int getNDPAMBJKKFD() { + return nDPAMBJKKFD; } /** - * optional uint32 IKPLEKFLPFF = 6; - * @param value the iKPLEKFLPFF to set + * optional uint32 NDPAMBJKKFD = 9; + * @param value the nDPAMBJKKFD to set * @return this */ - public RogueMiracleDataInfo setIKPLEKFLPFF(final int value) { + public RogueMiracleDataInfo setNDPAMBJKKFD(final int value) { bitField0_ |= 0x00000002; - iKPLEKFLPFF = value; + nDPAMBJKKFD = value; return this; } /** - * optional uint32 ODFNOGMKDOA = 9; - * @return whether the oDFNOGMKDOA field is set + * optional uint32 miracle_id = 10; + * @return whether the miracleId field is set */ - public boolean hasODFNOGMKDOA() { + public boolean hasMiracleId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 ODFNOGMKDOA = 9; - * @return this - */ - public RogueMiracleDataInfo clearODFNOGMKDOA() { - bitField0_ &= ~0x00000004; - oDFNOGMKDOA = 0; - return this; - } - - /** - * optional uint32 ODFNOGMKDOA = 9; - * @return the oDFNOGMKDOA - */ - public int getODFNOGMKDOA() { - return oDFNOGMKDOA; - } - - /** - * optional uint32 ODFNOGMKDOA = 9; - * @param value the oDFNOGMKDOA to set - * @return this - */ - public RogueMiracleDataInfo setODFNOGMKDOA(final int value) { - bitField0_ |= 0x00000004; - oDFNOGMKDOA = value; - return this; - } - - /** - * optional uint32 miracle_id = 12; - * @return whether the miracleId field is set - */ - public boolean hasMiracleId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 miracle_id = 12; + * optional uint32 miracle_id = 10; * @return this */ public RogueMiracleDataInfo clearMiracleId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; miracleId = 0; return this; } /** - * optional uint32 miracle_id = 12; + * optional uint32 miracle_id = 10; * @return the miracleId */ public int getMiracleId() { @@ -192,50 +155,87 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 miracle_id = 12; + * optional uint32 miracle_id = 10; * @param value the miracleId to set * @return this */ public RogueMiracleDataInfo setMiracleId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; miracleId = value; return this; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; - * @return whether the dFKPIBCLGOP field is set + * optional uint32 NFNNOMAMNAA = 12; + * @return whether the nFNNOMAMNAA field is set */ - public boolean hasDFKPIBCLGOP() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasNFNNOMAMNAA() { + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * optional uint32 NFNNOMAMNAA = 12; * @return this */ - public RogueMiracleDataInfo clearDFKPIBCLGOP() { - bitField0_ &= ~0x00000010; - dFKPIBCLGOP.clear(); + public RogueMiracleDataInfo clearNFNNOMAMNAA() { + bitField0_ &= ~0x00000008; + nFNNOMAMNAA = 0; return this; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * optional uint32 NFNNOMAMNAA = 12; + * @return the nFNNOMAMNAA + */ + public int getNFNNOMAMNAA() { + return nFNNOMAMNAA; + } + + /** + * optional uint32 NFNNOMAMNAA = 12; + * @param value the nFNNOMAMNAA to set + * @return this + */ + public RogueMiracleDataInfo setNFNNOMAMNAA(final int value) { + bitField0_ |= 0x00000008; + nFNNOMAMNAA = value; + return this; + } + + /** + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * @return whether the jBFJGEIGGBA field is set + */ + public boolean hasJBFJGEIGGBA() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * @return this + */ + public RogueMiracleDataInfo clearJBFJGEIGGBA() { + bitField0_ &= ~0x00000010; + jBFJGEIGGBA.clear(); + return this; + } + + /** + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 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 #getMutableDFKPIBCLGOP()} if you want to modify it. + * Use {@link #getMutableJBFJGEIGGBA()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getDFKPIBCLGOP() { - return dFKPIBCLGOP; + public RepeatedMessage getJBFJGEIGGBA() { + return jBFJGEIGGBA; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 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 @@ -243,30 +243,30 @@ public final class RogueMiracleDataInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableDFKPIBCLGOP() { + public RepeatedMessage getMutableJBFJGEIGGBA() { bitField0_ |= 0x00000010; - return dFKPIBCLGOP; + return jBFJGEIGGBA; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; - * @param value the dFKPIBCLGOP to add + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * @param value the jBFJGEIGGBA to add * @return this */ - public RogueMiracleDataInfo addDFKPIBCLGOP(final DFKPIBCLGOPEntry value) { + public RogueMiracleDataInfo addJBFJGEIGGBA(final JBFJGEIGGBAEntry value) { bitField0_ |= 0x00000010; - dFKPIBCLGOP.add(value); + jBFJGEIGGBA.add(value); return this; } /** - * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; - * @param values the dFKPIBCLGOP to add + * repeated .RogueMiracleDataInfo.JBFJGEIGGBAEntry JBFJGEIGGBA = 6; + * @param values the jBFJGEIGGBA to add * @return this */ - public RogueMiracleDataInfo addAllDFKPIBCLGOP(final DFKPIBCLGOPEntry... values) { + public RogueMiracleDataInfo addAllJBFJGEIGGBA(final JBFJGEIGGBAEntry... values) { bitField0_ |= 0x00000010; - dFKPIBCLGOP.addAll(values); + jBFJGEIGGBA.addAll(values); return this; } @@ -275,11 +275,11 @@ public final class RogueMiracleDataInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - jFIPNOAJNJM = other.jFIPNOAJNJM; - iKPLEKFLPFF = other.iKPLEKFLPFF; - oDFNOGMKDOA = other.oDFNOGMKDOA; + kABNOGFDKFI = other.kABNOGFDKFI; + nDPAMBJKKFD = other.nDPAMBJKKFD; miracleId = other.miracleId; - dFKPIBCLGOP.copyFrom(other.dFKPIBCLGOP); + nFNNOMAMNAA = other.nFNNOMAMNAA; + jBFJGEIGGBA.copyFrom(other.jBFJGEIGGBA); } return this; } @@ -290,20 +290,20 @@ public final class RogueMiracleDataInfoOuterClass { return this; } cachedSize = -1; - if (other.hasJFIPNOAJNJM()) { - setJFIPNOAJNJM(other.jFIPNOAJNJM); + if (other.hasKABNOGFDKFI()) { + setKABNOGFDKFI(other.kABNOGFDKFI); } - if (other.hasIKPLEKFLPFF()) { - setIKPLEKFLPFF(other.iKPLEKFLPFF); - } - if (other.hasODFNOGMKDOA()) { - setODFNOGMKDOA(other.oDFNOGMKDOA); + if (other.hasNDPAMBJKKFD()) { + setNDPAMBJKKFD(other.nDPAMBJKKFD); } if (other.hasMiracleId()) { setMiracleId(other.miracleId); } - if (other.hasDFKPIBCLGOP()) { - getMutableDFKPIBCLGOP().addAll(other.dFKPIBCLGOP); + if (other.hasNFNNOMAMNAA()) { + setNFNNOMAMNAA(other.nFNNOMAMNAA); + } + if (other.hasJBFJGEIGGBA()) { + getMutableJBFJGEIGGBA().addAll(other.jBFJGEIGGBA); } return this; } @@ -315,11 +315,11 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - jFIPNOAJNJM = 0; - iKPLEKFLPFF = 0; - oDFNOGMKDOA = 0; + kABNOGFDKFI = 0; + nDPAMBJKKFD = 0; miracleId = 0; - dFKPIBCLGOP.clear(); + nFNNOMAMNAA = 0; + jBFJGEIGGBA.clear(); return this; } @@ -330,7 +330,7 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dFKPIBCLGOP.clearQuick(); + jBFJGEIGGBA.clearQuick(); return this; } @@ -344,35 +344,35 @@ public final class RogueMiracleDataInfoOuterClass { } RogueMiracleDataInfo other = (RogueMiracleDataInfo) o; return bitField0_ == other.bitField0_ - && (!hasJFIPNOAJNJM() || jFIPNOAJNJM == other.jFIPNOAJNJM) - && (!hasIKPLEKFLPFF() || iKPLEKFLPFF == other.iKPLEKFLPFF) - && (!hasODFNOGMKDOA() || oDFNOGMKDOA == other.oDFNOGMKDOA) + && (!hasKABNOGFDKFI() || kABNOGFDKFI == other.kABNOGFDKFI) + && (!hasNDPAMBJKKFD() || nDPAMBJKKFD == other.nDPAMBJKKFD) && (!hasMiracleId() || miracleId == other.miracleId) - && (!hasDFKPIBCLGOP() || dFKPIBCLGOP.equals(other.dFKPIBCLGOP)); + && (!hasNFNNOMAMNAA() || nFNNOMAMNAA == other.nFNNOMAMNAA) + && (!hasJBFJGEIGGBA() || jBFJGEIGGBA.equals(other.jBFJGEIGGBA)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(jFIPNOAJNJM); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(kABNOGFDKFI); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(iKPLEKFLPFF); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(nDPAMBJKKFD); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(oDFNOGMKDOA); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(miracleId); + output.writeUInt32NoTag(nFNNOMAMNAA); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < dFKPIBCLGOP.length(); i++) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(dFKPIBCLGOP.get(i)); + for (int i = 0; i < jBFJGEIGGBA.length(); i++) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(jBFJGEIGGBA.get(i)); } } } @@ -381,19 +381,19 @@ public final class RogueMiracleDataInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jFIPNOAJNJM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(kABNOGFDKFI); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iKPLEKFLPFF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nDPAMBJKKFD); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oDFNOGMKDOA); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(nFNNOMAMNAA); + } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * dFKPIBCLGOP.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dFKPIBCLGOP); + size += (1 * jBFJGEIGGBA.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(jBFJGEIGGBA); } return size; } @@ -405,27 +405,27 @@ public final class RogueMiracleDataInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // jFIPNOAJNJM - jFIPNOAJNJM = input.readUInt32(); + case 16: { + // kABNOGFDKFI + kABNOGFDKFI = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // iKPLEKFLPFF - iKPLEKFLPFF = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // oDFNOGMKDOA - oDFNOGMKDOA = input.readUInt32(); + // nDPAMBJKKFD + nDPAMBJKKFD = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // miracleId + miracleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 96) { @@ -433,17 +433,17 @@ public final class RogueMiracleDataInfoOuterClass { } } case 96: { - // miracleId - miracleId = input.readUInt32(); + // nFNNOMAMNAA + nFNNOMAMNAA = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 50) { break; } } - case 114: { - // dFKPIBCLGOP - tag = input.readRepeatedMessage(dFKPIBCLGOP, tag); + case 50: { + // jBFJGEIGGBA + tag = input.readRepeatedMessage(jBFJGEIGGBA, tag); bitField0_ |= 0x00000010; if (tag != 0) { break; @@ -467,19 +467,19 @@ public final class RogueMiracleDataInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.jFIPNOAJNJM, jFIPNOAJNJM); + output.writeUInt32(FieldNames.kABNOGFDKFI, kABNOGFDKFI); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.iKPLEKFLPFF, iKPLEKFLPFF); + output.writeUInt32(FieldNames.nDPAMBJKKFD, nDPAMBJKKFD); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.oDFNOGMKDOA, oDFNOGMKDOA); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.miracleId, miracleId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.nFNNOMAMNAA, nFNNOMAMNAA); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.dFKPIBCLGOP, dFKPIBCLGOP); + output.writeRepeatedMessage(FieldNames.jBFJGEIGGBA, jBFJGEIGGBA); } output.endObject(); } @@ -491,10 +491,10 @@ public final class RogueMiracleDataInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1019082596: { - if (input.isAtField(FieldNames.jFIPNOAJNJM)) { + case 1444231062: { + if (input.isAtField(FieldNames.kABNOGFDKFI)) { if (!input.trySkipNullValue()) { - jFIPNOAJNJM = input.readUInt32(); + kABNOGFDKFI = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -502,10 +502,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case -117523130: { - if (input.isAtField(FieldNames.iKPLEKFLPFF)) { + case 1423263980: { + if (input.isAtField(FieldNames.nDPAMBJKKFD)) { if (!input.trySkipNullValue()) { - iKPLEKFLPFF = input.readUInt32(); + nDPAMBJKKFD = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -513,22 +513,22 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case -671364125: { - if (input.isAtField(FieldNames.oDFNOGMKDOA)) { - if (!input.trySkipNullValue()) { - oDFNOGMKDOA = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -164571796: case -806736983: { if (input.isAtField(FieldNames.miracleId)) { if (!input.trySkipNullValue()) { miracleId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -681412180: { + if (input.isAtField(FieldNames.nFNNOMAMNAA)) { + if (!input.trySkipNullValue()) { + nFNNOMAMNAA = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -536,10 +536,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case -916882785: { - if (input.isAtField(FieldNames.dFKPIBCLGOP)) { + case -1130952882: { + if (input.isAtField(FieldNames.jBFJGEIGGBA)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dFKPIBCLGOP); + input.readRepeatedMessage(jBFJGEIGGBA); bitField0_ |= 0x00000010; } } else { @@ -588,9 +588,9 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * Protobuf type {@code DFKPIBCLGOPEntry} + * Protobuf type {@code JBFJGEIGGBAEntry} */ - public static final class DFKPIBCLGOPEntry extends ProtoMessage implements Cloneable { + public static final class JBFJGEIGGBAEntry extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** @@ -603,14 +603,14 @@ public final class RogueMiracleDataInfoOuterClass { */ private int value_; - private DFKPIBCLGOPEntry() { + private JBFJGEIGGBAEntry() { } /** - * @return a new empty instance of {@code DFKPIBCLGOPEntry} + * @return a new empty instance of {@code JBFJGEIGGBAEntry} */ - public static DFKPIBCLGOPEntry newInstance() { - return new DFKPIBCLGOPEntry(); + public static JBFJGEIGGBAEntry newInstance() { + return new JBFJGEIGGBAEntry(); } /** @@ -625,7 +625,7 @@ public final class RogueMiracleDataInfoOuterClass { * optional uint32 key = 1; * @return this */ - public DFKPIBCLGOPEntry clearKey() { + public JBFJGEIGGBAEntry clearKey() { bitField0_ &= ~0x00000001; key = 0; return this; @@ -644,7 +644,7 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the key to set * @return this */ - public DFKPIBCLGOPEntry setKey(final int value) { + public JBFJGEIGGBAEntry setKey(final int value) { bitField0_ |= 0x00000001; key = value; return this; @@ -662,7 +662,7 @@ public final class RogueMiracleDataInfoOuterClass { * optional uint32 value = 2; * @return this */ - public DFKPIBCLGOPEntry clearValue() { + public JBFJGEIGGBAEntry clearValue() { bitField0_ &= ~0x00000002; value_ = 0; return this; @@ -681,14 +681,14 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the value_ to set * @return this */ - public DFKPIBCLGOPEntry setValue(final int value) { + public JBFJGEIGGBAEntry setValue(final int value) { bitField0_ |= 0x00000002; value_ = value; return this; } @Override - public DFKPIBCLGOPEntry copyFrom(final DFKPIBCLGOPEntry other) { + public JBFJGEIGGBAEntry copyFrom(final JBFJGEIGGBAEntry other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; @@ -699,7 +699,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public DFKPIBCLGOPEntry mergeFrom(final DFKPIBCLGOPEntry other) { + public JBFJGEIGGBAEntry mergeFrom(final JBFJGEIGGBAEntry other) { if (other.isEmpty()) { return this; } @@ -714,7 +714,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public DFKPIBCLGOPEntry clear() { + public JBFJGEIGGBAEntry clear() { if (isEmpty()) { return this; } @@ -726,7 +726,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public DFKPIBCLGOPEntry clearQuick() { + public JBFJGEIGGBAEntry clearQuick() { if (isEmpty()) { return this; } @@ -740,10 +740,10 @@ public final class RogueMiracleDataInfoOuterClass { if (o == this) { return true; } - if (!(o instanceof DFKPIBCLGOPEntry)) { + if (!(o instanceof JBFJGEIGGBAEntry)) { return false; } - DFKPIBCLGOPEntry other = (DFKPIBCLGOPEntry) o; + JBFJGEIGGBAEntry other = (JBFJGEIGGBAEntry) o; return bitField0_ == other.bitField0_ && (!hasKey() || key == other.key) && (!hasValue() || value_ == other.value_); @@ -775,7 +775,7 @@ public final class RogueMiracleDataInfoOuterClass { @Override @SuppressWarnings("fallthrough") - public DFKPIBCLGOPEntry mergeFrom(final ProtoSource input) throws IOException { + public JBFJGEIGGBAEntry mergeFrom(final ProtoSource input) throws IOException { // Enabled Fall-Through Optimization (QuickBuffers) int tag = input.readTag(); while (true) { @@ -825,7 +825,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public DFKPIBCLGOPEntry mergeFrom(final JsonSource input) throws IOException { + public JBFJGEIGGBAEntry mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } @@ -864,8 +864,8 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public DFKPIBCLGOPEntry clone() { - return new DFKPIBCLGOPEntry().copyFrom(this); + public JBFJGEIGGBAEntry clone() { + return new JBFJGEIGGBAEntry().copyFrom(this); } @Override @@ -873,32 +873,32 @@ public final class RogueMiracleDataInfoOuterClass { return ((bitField0_) == 0); } - public static DFKPIBCLGOPEntry parseFrom(final byte[] data) throws + public static JBFJGEIGGBAEntry parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new JBFJGEIGGBAEntry(), data).checkInitialized(); } - public static DFKPIBCLGOPEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), input).checkInitialized(); + public static JBFJGEIGGBAEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new JBFJGEIGGBAEntry(), input).checkInitialized(); } - public static DFKPIBCLGOPEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), input).checkInitialized(); + public static JBFJGEIGGBAEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new JBFJGEIGGBAEntry(), input).checkInitialized(); } /** - * @return factory for creating DFKPIBCLGOPEntry messages + * @return factory for creating JBFJGEIGGBAEntry messages */ - public static MessageFactory getFactory() { - return DFKPIBCLGOPEntryFactory.INSTANCE; + public static MessageFactory getFactory() { + return JBFJGEIGGBAEntryFactory.INSTANCE; } - private enum DFKPIBCLGOPEntryFactory implements MessageFactory { + private enum JBFJGEIGGBAEntryFactory implements MessageFactory { INSTANCE; @Override - public DFKPIBCLGOPEntry create() { - return DFKPIBCLGOPEntry.newInstance(); + public JBFJGEIGGBAEntry create() { + return JBFJGEIGGBAEntry.newInstance(); } } @@ -925,15 +925,15 @@ public final class RogueMiracleDataInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jFIPNOAJNJM = FieldName.forField("JFIPNOAJNJM"); + static final FieldName kABNOGFDKFI = FieldName.forField("KABNOGFDKFI"); - static final FieldName iKPLEKFLPFF = FieldName.forField("IKPLEKFLPFF"); - - static final FieldName oDFNOGMKDOA = FieldName.forField("ODFNOGMKDOA"); + static final FieldName nDPAMBJKKFD = FieldName.forField("NDPAMBJKKFD"); static final FieldName miracleId = FieldName.forField("miracleId", "miracle_id"); - static final FieldName dFKPIBCLGOP = FieldName.forField("DFKPIBCLGOP"); + static final FieldName nFNNOMAMNAA = FieldName.forField("NFNNOMAMNAA"); + + static final FieldName jBFJGEIGGBA = FieldName.forField("JBFJGEIGGBA"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java index a80d51b..8cb9313 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java @@ -19,7 +19,11 @@ public final class RogueMiracleDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 2; */ private final RogueMiracleOuterClass.RogueMiracle rogueMiracle = RogueMiracleOuterClass.RogueMiracle.newInstance(); @@ -34,7 +38,11 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 2; * @return whether the rogueMiracle field is set */ public boolean hasRogueMiracle() { @@ -42,7 +50,11 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 2; * @return this */ public RogueMiracleData clearRogueMiracle() { @@ -52,7 +64,11 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 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. @@ -66,7 +82,11 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 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 @@ -80,7 +100,11 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 1; + * 
+     *  13, 2 or 6
+     *
+ * + * optional .RogueMiracle rogue_miracle = 2; * @param value the rogueMiracle to set * @return this */ @@ -150,7 +174,7 @@ public final class RogueMiracleDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rogueMiracle); } } @@ -171,7 +195,7 @@ public final class RogueMiracleDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 18: { // rogueMiracle input.readMessage(rogueMiracle); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java index f10df63..06d3e65 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoDataOuterClass.java @@ -20,17 +20,17 @@ public final class RogueMiracleInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 DMJLJNDFOGP = 1; + * optional uint32 BAILOBNCIGP = 4; */ - private int dMJLJNDFOGP; + private int bAILOBNCIGP; /** - * optional uint32 KHBDIKDDIIB = 2; + * optional uint32 BDDANOBJMEL = 8; */ - private int kHBDIKDDIIB; + private int bDDANOBJMEL; /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; */ private final RepeatedMessage rogueMiracleList = RepeatedMessage.newEmptyInstance(RogueMiracleDataInfoOuterClass.RogueMiracleDataInfo.getFactory()); @@ -45,81 +45,81 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 DMJLJNDFOGP = 1; - * @return whether the dMJLJNDFOGP field is set + * optional uint32 BAILOBNCIGP = 4; + * @return whether the bAILOBNCIGP field is set */ - public boolean hasDMJLJNDFOGP() { + public boolean hasBAILOBNCIGP() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 DMJLJNDFOGP = 1; + * optional uint32 BAILOBNCIGP = 4; * @return this */ - public RogueMiracleInfoData clearDMJLJNDFOGP() { + public RogueMiracleInfoData clearBAILOBNCIGP() { bitField0_ &= ~0x00000001; - dMJLJNDFOGP = 0; + bAILOBNCIGP = 0; return this; } /** - * optional uint32 DMJLJNDFOGP = 1; - * @return the dMJLJNDFOGP + * optional uint32 BAILOBNCIGP = 4; + * @return the bAILOBNCIGP */ - public int getDMJLJNDFOGP() { - return dMJLJNDFOGP; + public int getBAILOBNCIGP() { + return bAILOBNCIGP; } /** - * optional uint32 DMJLJNDFOGP = 1; - * @param value the dMJLJNDFOGP to set + * optional uint32 BAILOBNCIGP = 4; + * @param value the bAILOBNCIGP to set * @return this */ - public RogueMiracleInfoData setDMJLJNDFOGP(final int value) { + public RogueMiracleInfoData setBAILOBNCIGP(final int value) { bitField0_ |= 0x00000001; - dMJLJNDFOGP = value; + bAILOBNCIGP = value; return this; } /** - * optional uint32 KHBDIKDDIIB = 2; - * @return whether the kHBDIKDDIIB field is set + * optional uint32 BDDANOBJMEL = 8; + * @return whether the bDDANOBJMEL field is set */ - public boolean hasKHBDIKDDIIB() { + public boolean hasBDDANOBJMEL() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 KHBDIKDDIIB = 2; + * optional uint32 BDDANOBJMEL = 8; * @return this */ - public RogueMiracleInfoData clearKHBDIKDDIIB() { + public RogueMiracleInfoData clearBDDANOBJMEL() { bitField0_ &= ~0x00000002; - kHBDIKDDIIB = 0; + bDDANOBJMEL = 0; return this; } /** - * optional uint32 KHBDIKDDIIB = 2; - * @return the kHBDIKDDIIB + * optional uint32 BDDANOBJMEL = 8; + * @return the bDDANOBJMEL */ - public int getKHBDIKDDIIB() { - return kHBDIKDDIIB; + public int getBDDANOBJMEL() { + return bDDANOBJMEL; } /** - * optional uint32 KHBDIKDDIIB = 2; - * @param value the kHBDIKDDIIB to set + * optional uint32 BDDANOBJMEL = 8; + * @param value the bDDANOBJMEL to set * @return this */ - public RogueMiracleInfoData setKHBDIKDDIIB(final int value) { + public RogueMiracleInfoData setBDDANOBJMEL(final int value) { bitField0_ |= 0x00000002; - kHBDIKDDIIB = value; + bDDANOBJMEL = value; return this; } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -127,7 +127,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; * @return this */ public RogueMiracleInfoData clearRogueMiracleList() { @@ -137,7 +137,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_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. @@ -152,7 +152,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_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 @@ -167,7 +167,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; * @param value the rogueMiracleList to add * @return this */ @@ -179,7 +179,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 6; * @param values the rogueMiracleList to add * @return this */ @@ -195,8 +195,8 @@ public final class RogueMiracleInfoDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dMJLJNDFOGP = other.dMJLJNDFOGP; - kHBDIKDDIIB = other.kHBDIKDDIIB; + bAILOBNCIGP = other.bAILOBNCIGP; + bDDANOBJMEL = other.bDDANOBJMEL; rogueMiracleList.copyFrom(other.rogueMiracleList); } return this; @@ -208,11 +208,11 @@ public final class RogueMiracleInfoDataOuterClass { return this; } cachedSize = -1; - if (other.hasDMJLJNDFOGP()) { - setDMJLJNDFOGP(other.dMJLJNDFOGP); + if (other.hasBAILOBNCIGP()) { + setBAILOBNCIGP(other.bAILOBNCIGP); } - if (other.hasKHBDIKDDIIB()) { - setKHBDIKDDIIB(other.kHBDIKDDIIB); + if (other.hasBDDANOBJMEL()) { + setBDDANOBJMEL(other.bDDANOBJMEL); } if (other.hasRogueMiracleList()) { getMutableRogueMiracleList().addAll(other.rogueMiracleList); @@ -227,8 +227,8 @@ public final class RogueMiracleInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - dMJLJNDFOGP = 0; - kHBDIKDDIIB = 0; + bAILOBNCIGP = 0; + bDDANOBJMEL = 0; rogueMiracleList.clear(); return this; } @@ -254,24 +254,24 @@ public final class RogueMiracleInfoDataOuterClass { } RogueMiracleInfoData other = (RogueMiracleInfoData) o; return bitField0_ == other.bitField0_ - && (!hasDMJLJNDFOGP() || dMJLJNDFOGP == other.dMJLJNDFOGP) - && (!hasKHBDIKDDIIB() || kHBDIKDDIIB == other.kHBDIKDDIIB) + && (!hasBAILOBNCIGP() || bAILOBNCIGP == other.bAILOBNCIGP) + && (!hasBDDANOBJMEL() || bDDANOBJMEL == other.bDDANOBJMEL) && (!hasRogueMiracleList() || rogueMiracleList.equals(other.rogueMiracleList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(dMJLJNDFOGP); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(bAILOBNCIGP); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(kHBDIKDDIIB); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(bDDANOBJMEL); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(rogueMiracleList.get(i)); } } @@ -281,10 +281,10 @@ public final class RogueMiracleInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dMJLJNDFOGP); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bAILOBNCIGP); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kHBDIKDDIIB); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bDDANOBJMEL); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * rogueMiracleList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueMiracleList); @@ -299,25 +299,25 @@ public final class RogueMiracleInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // dMJLJNDFOGP - dMJLJNDFOGP = input.readUInt32(); + case 32: { + // bAILOBNCIGP + bAILOBNCIGP = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { - // kHBDIKDDIIB - kHBDIKDDIIB = input.readUInt32(); + case 64: { + // bDDANOBJMEL + bDDANOBJMEL = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 50) { break; } } - case 82: { + case 50: { // rogueMiracleList tag = input.readRepeatedMessage(rogueMiracleList, tag); bitField0_ |= 0x00000004; @@ -343,10 +343,10 @@ public final class RogueMiracleInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dMJLJNDFOGP, dMJLJNDFOGP); + output.writeUInt32(FieldNames.bAILOBNCIGP, bAILOBNCIGP); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.kHBDIKDDIIB, kHBDIKDDIIB); + output.writeUInt32(FieldNames.bDDANOBJMEL, bDDANOBJMEL); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.rogueMiracleList, rogueMiracleList); @@ -361,10 +361,10 @@ public final class RogueMiracleInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1929491193: { - if (input.isAtField(FieldNames.dMJLJNDFOGP)) { + case 1343202120: { + if (input.isAtField(FieldNames.bAILOBNCIGP)) { if (!input.trySkipNullValue()) { - dMJLJNDFOGP = input.readUInt32(); + bAILOBNCIGP = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -372,10 +372,10 @@ public final class RogueMiracleInfoDataOuterClass { } break; } - case -1096984703: { - if (input.isAtField(FieldNames.kHBDIKDDIIB)) { + case -1316239828: { + if (input.isAtField(FieldNames.bDDANOBJMEL)) { if (!input.trySkipNullValue()) { - kHBDIKDDIIB = input.readUInt32(); + bDDANOBJMEL = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -448,9 +448,9 @@ public final class RogueMiracleInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dMJLJNDFOGP = FieldName.forField("DMJLJNDFOGP"); + static final FieldName bAILOBNCIGP = FieldName.forField("BAILOBNCIGP"); - static final FieldName kHBDIKDDIIB = FieldName.forField("KHBDIKDDIIB"); + static final FieldName bDDANOBJMEL = FieldName.forField("BDDANOBJMEL"); static final FieldName rogueMiracleList = FieldName.forField("rogueMiracleList", "rogue_miracle_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java index d4876c1..f4b236c 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java @@ -19,7 +19,7 @@ public final class RogueMiracleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 14; */ private final RogueMiracleInfoDataOuterClass.RogueMiracleInfoData rogueMiracleInfo = RogueMiracleInfoDataOuterClass.RogueMiracleInfoData.newInstance(); @@ -34,7 +34,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 14; * @return whether the rogueMiracleInfo field is set */ public boolean hasRogueMiracleInfo() { @@ -42,7 +42,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 14; * @return this */ public RogueMiracleInfo clearRogueMiracleInfo() { @@ -52,7 +52,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 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. @@ -66,7 +66,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 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 @@ -80,7 +80,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 8; + * optional .RogueMiracleInfoData rogue_miracle_info = 14; * @param value the rogueMiracleInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class RogueMiracleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueMiracleInfo); } } @@ -172,7 +172,7 @@ public final class RogueMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 114: { // rogueMiracleInfo input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java index bb9c2a4..94ce593 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleSelectResultOuterClass.java @@ -19,7 +19,7 @@ public final class RogueMiracleSelectResultOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 1; + * optional uint32 miracle_id = 9; */ private int miracleId; @@ -34,7 +34,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 1; + * optional uint32 miracle_id = 9; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -42,7 +42,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 1; + * optional uint32 miracle_id = 9; * @return this */ public RogueMiracleSelectResult clearMiracleId() { @@ -52,7 +52,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 1; + * optional uint32 miracle_id = 9; * @return the miracleId */ public int getMiracleId() { @@ -60,7 +60,7 @@ public final class RogueMiracleSelectResultOuterClass { } /** - * optional uint32 miracle_id = 1; + * optional uint32 miracle_id = 9; * @param value the miracleId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueMiracleSelectResultOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(miracleId); } } @@ -150,7 +150,7 @@ public final class RogueMiracleSelectResultOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // miracleId miracleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java index b838f20..6230151 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueNpcDisappearCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class RogueNpcDisappearCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 15; */ private int entityId; @@ -34,7 +34,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 15; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -42,7 +42,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 15; * @return this */ public RogueNpcDisappearCsReq clearEntityId() { @@ -52,7 +52,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 15; * @return the entityId */ public int getEntityId() { @@ -60,7 +60,7 @@ public final class RogueNpcDisappearCsReqOuterClass { } /** - * optional uint32 entity_id = 7; + * optional uint32 entity_id = 15; * @param value the entityId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueNpcDisappearCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(entityId); } } @@ -150,7 +150,7 @@ public final class RogueNpcDisappearCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 120: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java index 524ae39..0a90ba2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordAvatarOuterClass.java @@ -19,22 +19,22 @@ public final class RogueRecordAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 1; + * optional uint32 level = 13; */ private int level; /** - * optional uint32 slot = 3; + * optional uint32 slot = 14; */ private int slot; /** - * optional uint32 id = 5; + * optional uint32 id = 15; */ private int id; /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 9; */ private int avatarType; @@ -49,7 +49,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 level = 1; + * optional uint32 level = 13; * @return whether the level field is set */ public boolean hasLevel() { @@ -57,7 +57,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 level = 1; + * optional uint32 level = 13; * @return this */ public RogueRecordAvatar clearLevel() { @@ -67,7 +67,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 level = 1; + * optional uint32 level = 13; * @return the level */ public int getLevel() { @@ -75,7 +75,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 level = 1; + * optional uint32 level = 13; * @param value the level to set * @return this */ @@ -86,7 +86,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 14; * @return whether the slot field is set */ public boolean hasSlot() { @@ -94,7 +94,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 14; * @return this */ public RogueRecordAvatar clearSlot() { @@ -104,7 +104,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 14; * @return the slot */ public int getSlot() { @@ -112,7 +112,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 slot = 3; + * optional uint32 slot = 14; * @param value the slot to set * @return this */ @@ -123,7 +123,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 15; * @return whether the id field is set */ public boolean hasId() { @@ -131,7 +131,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 15; * @return this */ public RogueRecordAvatar clearId() { @@ -141,7 +141,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 15; * @return the id */ public int getId() { @@ -149,7 +149,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional uint32 id = 5; + * optional uint32 id = 15; * @param value the id to set * @return this */ @@ -160,7 +160,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 9; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 9; * @return this */ public RogueRecordAvatar clearAvatarType() { @@ -178,7 +178,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 9; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class RogueRecordAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 2; + * optional .AvatarType avatar_type = 9; * @param value the avatarType to set * @return this */ @@ -298,19 +298,19 @@ public final class RogueRecordAvatarOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 72); output.writeEnumNoTag(avatarType); } } @@ -340,34 +340,34 @@ public final class RogueRecordAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 104: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 120) { break; } } - case 40: { + case 120: { // id id = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 16) { + if (tag != 72) { break; } } - case 16: { + case 72: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java index ebf47ea..581f478 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRecordInfoOuterClass.java @@ -21,17 +21,17 @@ public final class RogueRecordInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 10; */ private final RepeatedInt rogueMiracleList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_list = 6; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(RogueRecordAvatarOuterClass.RogueRecordAvatar.getFactory()); /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_list = 15; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -46,7 +46,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 10; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -54,7 +54,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 10; * @return this */ public RogueRecordInfo clearRogueMiracleList() { @@ -64,7 +64,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 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. @@ -78,7 +78,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 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 @@ -92,7 +92,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 10; * @param value the rogueMiracleList to add * @return this */ @@ -103,7 +103,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated uint32 rogue_miracle_list = 8; + * repeated uint32 rogue_miracle_list = 10; * @param values the rogueMiracleList to add * @return this */ @@ -114,7 +114,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_list = 6; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -122,7 +122,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_list = 6; * @return this */ public RogueRecordInfo clearAvatarList() { @@ -132,7 +132,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_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. @@ -146,7 +146,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_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 @@ -160,7 +160,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_list = 6; * @param value the avatarList to add * @return this */ @@ -172,7 +172,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueRecordAvatar avatar_list = 5; + * repeated .RogueRecordAvatar avatar_list = 6; * @param values the avatarList to add * @return this */ @@ -184,7 +184,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_list = 15; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -192,7 +192,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_list = 15; * @return this */ public RogueRecordInfo clearBuffList() { @@ -202,7 +202,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_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. @@ -216,7 +216,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_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 @@ -230,7 +230,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_list = 15; * @param value the buffList to add * @return this */ @@ -241,7 +241,7 @@ public final class RogueRecordInfoOuterClass { } /** - * repeated .RogueBuff buff_list = 14; + * repeated .RogueBuff buff_list = 15; * @param values the buffList to add * @return this */ @@ -326,19 +326,19 @@ public final class RogueRecordInfoOuterClass { 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.writeRawByte((byte) 80); output.writeUInt32NoTag(rogueMiracleList.array()[i]); } } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 50); output.writeMessageNoTag(avatarList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeMessageNoTag(buffList.get(i)); } } @@ -366,24 +366,24 @@ public final class RogueRecordInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 82: { // rogueMiracleList [packed=true] input.readPackedUInt32(rogueMiracleList, tag); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000002; - if (tag != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000004; @@ -401,7 +401,7 @@ public final class RogueRecordInfoOuterClass { tag = input.readTag(); break; } - case 64: { + case 80: { // rogueMiracleList [packed=false] tag = input.readRepeatedUInt32(rogueMiracleList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java index 734a044..c44e9f2 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRerollBuffOuterClass.java @@ -19,7 +19,7 @@ public final class RogueRerollBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_info = 7; */ private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); @@ -34,7 +34,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_info = 7; * @return whether the buffSelectInfo field is set */ public boolean hasBuffSelectInfo() { @@ -42,7 +42,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_info = 7; * @return this */ public RogueRerollBuff clearBuffSelectInfo() { @@ -52,7 +52,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_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. @@ -66,7 +66,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_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 @@ -81,7 +81,7 @@ public final class RogueRerollBuffOuterClass { } /** - * optional .RogueCommonBuffSelectInfo buff_select_info = 15; + * optional .RogueCommonBuffSelectInfo buff_select_info = 7; * @param value the buffSelectInfo to set * @return this */ @@ -152,7 +152,7 @@ public final class RogueRerollBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeMessageNoTag(buffSelectInfo); } } @@ -173,7 +173,7 @@ public final class RogueRerollBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 58: { // buffSelectInfo input.readMessage(buffSelectInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java index ee44792..00a9f17 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java @@ -19,25 +19,22 @@ public final class RogueRoomOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 1; */ private int siteId; /** - * 
-     * uint32 LELFKONOLPP = 3;
-     *
- * - * optional uint32 room_id = 15; + * optional uint32 room_id = 12; */ private int roomId; /** * 
-     * RogueRoomStatus OABFMKCFLGC = 10;
+     *  uint32 MGAHHMCOGKK = 14;
+     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 6; + * optional .RogueRoomStatus room_status = 10; */ private int roomStatus; @@ -52,7 +49,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 1; * @return whether the siteId field is set */ public boolean hasSiteId() { @@ -60,7 +57,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 1; * @return this */ public RogueRoom clearSiteId() { @@ -70,7 +67,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 1; * @return the siteId */ public int getSiteId() { @@ -78,7 +75,7 @@ public final class RogueRoomOuterClass { } /** - * optional uint32 site_id = 5; + * optional uint32 site_id = 1; * @param value the siteId to set * @return this */ @@ -89,11 +86,7 @@ public final class RogueRoomOuterClass { } /** - * 
-     * uint32 LELFKONOLPP = 3;
-     *
- * - * optional uint32 room_id = 15; + * optional uint32 room_id = 12; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -101,11 +94,7 @@ public final class RogueRoomOuterClass { } /** - * 
-     * uint32 LELFKONOLPP = 3;
-     *
- * - * optional uint32 room_id = 15; + * optional uint32 room_id = 12; * @return this */ public RogueRoom clearRoomId() { @@ -115,11 +104,7 @@ public final class RogueRoomOuterClass { } /** - * 
-     * uint32 LELFKONOLPP = 3;
-     *
- * - * optional uint32 room_id = 15; + * optional uint32 room_id = 12; * @return the roomId */ public int getRoomId() { @@ -127,11 +112,7 @@ public final class RogueRoomOuterClass { } /** - * 
-     * uint32 LELFKONOLPP = 3;
-     *
- * - * optional uint32 room_id = 15; + * optional uint32 room_id = 12; * @param value the roomId to set * @return this */ @@ -143,10 +124,11 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus OABFMKCFLGC = 10;
+     *  uint32 MGAHHMCOGKK = 14;
+     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 6; + * optional .RogueRoomStatus room_status = 10; * @return whether the roomStatus field is set */ public boolean hasRoomStatus() { @@ -155,10 +137,11 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus OABFMKCFLGC = 10;
+     *  uint32 MGAHHMCOGKK = 14;
+     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 6; + * optional .RogueRoomStatus room_status = 10; * @return this */ public RogueRoom clearRoomStatus() { @@ -169,10 +152,11 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus OABFMKCFLGC = 10;
+     *  uint32 MGAHHMCOGKK = 14;
+     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 6; + * optional .RogueRoomStatus room_status = 10; * @return the roomStatus */ public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { @@ -206,10 +190,11 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus OABFMKCFLGC = 10;
+     *  uint32 MGAHHMCOGKK = 14;
+     *  RogueRoomStatus GCLIKAAOKJL = 3; // GCLIKAAOKJL
      *
* - * optional .RogueRoomStatus room_status = 6; + * optional .RogueRoomStatus room_status = 10; * @param value the roomStatus to set * @return this */ @@ -290,15 +275,15 @@ public final class RogueRoomOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 80); output.writeEnumNoTag(roomStatus); } } @@ -325,25 +310,25 @@ public final class RogueRoomOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // siteId siteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // roomId roomId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { // roomStatus final int value = input.readInt32(); if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java index ab80127..f8c3a0e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java @@ -21,44 +21,40 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  ?
+     *  FEDDDLLKOLI
      *
* - * optional int64 end_time = 4; - */ - private long endTime; - - /** - * 
-     *  ?
-     *
- * - * optional int64 begin_time = 12; + * optional int64 begin_time = 1; */ private long beginTime; /** - * optional uint32 pool_id = 11; + * optional int64 end_time = 10; + */ + private long endTime; + + /** + * optional uint32 pool_id = 4; */ private int poolId; /** - * optional uint32 score = 15; + * optional uint32 score = 12; */ private int score; /** - * optional bool pool_refreshed = 6; - */ - private boolean poolRefreshed; - - /** - * optional bool has_taken_initial_score = 14; + * optional bool has_taken_initial_score = 7; */ private boolean hasTakenInitialScore; /** - * repeated uint32 has_taken_reward = 5; + * optional bool pool_refreshed = 15; + */ + private boolean poolRefreshed; + + /** + * repeated uint32 has_taken_reward = 13; */ private final RepeatedInt hasTakenReward = RepeatedInt.newEmptyInstance(); @@ -74,89 +70,36 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  ?
+     *  FEDDDLLKOLI
      *
* - * optional int64 end_time = 4; - * @return whether the endTime field is set + * optional int64 begin_time = 1; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** * 
-     *  ?
+     *  FEDDDLLKOLI
      *
* - * optional int64 end_time = 4; - * @return this - */ - public RogueScoreRewardInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * 
-     *  ?
-     *
- * - * optional int64 end_time = 4; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * 
-     *  ?
-     *
- * - * optional int64 end_time = 4; - * @param value the endTime to set - * @return this - */ - public RogueScoreRewardInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - - /** - * 
-     *  ?
-     *
- * - * optional int64 begin_time = 12; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  ?
-     *
- * - * optional int64 begin_time = 12; + * optional int64 begin_time = 1; * @return this */ public RogueScoreRewardInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** * 
-     *  ?
+     *  FEDDDLLKOLI
      *
* - * optional int64 begin_time = 12; + * optional int64 begin_time = 1; * @return the beginTime */ public long getBeginTime() { @@ -165,21 +108,58 @@ public final class RogueScoreRewardInfoOuterClass { /** * 
-     *  ?
+     *  FEDDDLLKOLI
      *
* - * optional int64 begin_time = 12; + * optional int64 begin_time = 1; * @param value the beginTime to set * @return this */ public RogueScoreRewardInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; beginTime = value; return this; } /** - * optional uint32 pool_id = 11; + * optional int64 end_time = 10; + * @return whether the endTime field is set + */ + public boolean hasEndTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 end_time = 10; + * @return this + */ + public RogueScoreRewardInfo clearEndTime() { + bitField0_ &= ~0x00000002; + endTime = 0L; + return this; + } + + /** + * optional int64 end_time = 10; + * @return the endTime + */ + public long getEndTime() { + return endTime; + } + + /** + * optional int64 end_time = 10; + * @param value the endTime to set + * @return this + */ + public RogueScoreRewardInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + + /** + * optional uint32 pool_id = 4; * @return whether the poolId field is set */ public boolean hasPoolId() { @@ -187,7 +167,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 4; * @return this */ public RogueScoreRewardInfo clearPoolId() { @@ -197,7 +177,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 4; * @return the poolId */ public int getPoolId() { @@ -205,7 +185,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 11; + * optional uint32 pool_id = 4; * @param value the poolId to set * @return this */ @@ -216,7 +196,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 15; + * optional uint32 score = 12; * @return whether the score field is set */ public boolean hasScore() { @@ -224,7 +204,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 15; + * optional uint32 score = 12; * @return this */ public RogueScoreRewardInfo clearScore() { @@ -234,7 +214,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 15; + * optional uint32 score = 12; * @return the score */ public int getScore() { @@ -242,7 +222,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 score = 15; + * optional uint32 score = 12; * @param value the score to set * @return this */ @@ -253,62 +233,25 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 6; - * @return whether the poolRefreshed field is set + * optional bool has_taken_initial_score = 7; + * @return whether the hasTakenInitialScore field is set */ - public boolean hasPoolRefreshed() { + public boolean hasHasTakenInitialScore() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool pool_refreshed = 6; - * @return this - */ - public RogueScoreRewardInfo clearPoolRefreshed() { - bitField0_ &= ~0x00000010; - poolRefreshed = false; - return this; - } - - /** - * optional bool pool_refreshed = 6; - * @return the poolRefreshed - */ - public boolean getPoolRefreshed() { - return poolRefreshed; - } - - /** - * optional bool pool_refreshed = 6; - * @param value the poolRefreshed to set - * @return this - */ - public RogueScoreRewardInfo setPoolRefreshed(final boolean value) { - bitField0_ |= 0x00000010; - poolRefreshed = value; - return this; - } - - /** - * optional bool has_taken_initial_score = 14; - * @return whether the hasTakenInitialScore field is set - */ - public boolean hasHasTakenInitialScore() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional bool has_taken_initial_score = 14; + * optional bool has_taken_initial_score = 7; * @return this */ public RogueScoreRewardInfo clearHasTakenInitialScore() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; hasTakenInitialScore = false; return this; } /** - * optional bool has_taken_initial_score = 14; + * optional bool has_taken_initial_score = 7; * @return the hasTakenInitialScore */ public boolean getHasTakenInitialScore() { @@ -316,18 +259,55 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool has_taken_initial_score = 14; + * optional bool has_taken_initial_score = 7; * @param value the hasTakenInitialScore to set * @return this */ public RogueScoreRewardInfo setHasTakenInitialScore(final boolean value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; hasTakenInitialScore = value; return this; } /** - * repeated uint32 has_taken_reward = 5; + * optional bool pool_refreshed = 15; + * @return whether the poolRefreshed field is set + */ + public boolean hasPoolRefreshed() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional bool pool_refreshed = 15; + * @return this + */ + public RogueScoreRewardInfo clearPoolRefreshed() { + bitField0_ &= ~0x00000020; + poolRefreshed = false; + return this; + } + + /** + * optional bool pool_refreshed = 15; + * @return the poolRefreshed + */ + public boolean getPoolRefreshed() { + return poolRefreshed; + } + + /** + * optional bool pool_refreshed = 15; + * @param value the poolRefreshed to set + * @return this + */ + public RogueScoreRewardInfo setPoolRefreshed(final boolean value) { + bitField0_ |= 0x00000020; + poolRefreshed = value; + return this; + } + + /** + * repeated uint32 has_taken_reward = 13; * @return whether the hasTakenReward field is set */ public boolean hasHasTakenReward() { @@ -335,7 +315,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 13; * @return this */ public RogueScoreRewardInfo clearHasTakenReward() { @@ -345,7 +325,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 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. @@ -359,7 +339,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 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 @@ -373,7 +353,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 13; * @param value the hasTakenReward to add * @return this */ @@ -384,7 +364,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 5; + * repeated uint32 has_taken_reward = 13; * @param values the hasTakenReward to add * @return this */ @@ -399,12 +379,12 @@ public final class RogueScoreRewardInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; poolId = other.poolId; score = other.score; - poolRefreshed = other.poolRefreshed; hasTakenInitialScore = other.hasTakenInitialScore; + poolRefreshed = other.poolRefreshed; hasTakenReward.copyFrom(other.hasTakenReward); } return this; @@ -416,24 +396,24 @@ public final class RogueScoreRewardInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasEndTime()) { + setEndTime(other.endTime); + } if (other.hasPoolId()) { setPoolId(other.poolId); } if (other.hasScore()) { setScore(other.score); } - if (other.hasPoolRefreshed()) { - setPoolRefreshed(other.poolRefreshed); - } if (other.hasHasTakenInitialScore()) { setHasTakenInitialScore(other.hasTakenInitialScore); } + if (other.hasPoolRefreshed()) { + setPoolRefreshed(other.poolRefreshed); + } if (other.hasHasTakenReward()) { getMutableHasTakenReward().addAll(other.hasTakenReward); } @@ -447,12 +427,12 @@ public final class RogueScoreRewardInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; poolId = 0; score = 0; - poolRefreshed = false; hasTakenInitialScore = false; + poolRefreshed = false; hasTakenReward.clear(); return this; } @@ -478,44 +458,44 @@ public final class RogueScoreRewardInfoOuterClass { } RogueScoreRewardInfo other = (RogueScoreRewardInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) && (!hasPoolId() || poolId == other.poolId) && (!hasScore() || score == other.score) - && (!hasPoolRefreshed() || poolRefreshed == other.poolRefreshed) && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) + && (!hasPoolRefreshed() || poolRefreshed == other.poolRefreshed) && (!hasHasTakenReward() || hasTakenReward.equals(other.hasTakenReward)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeInt64NoTag(endTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 8); output.writeInt64NoTag(beginTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeInt64NoTag(endTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(poolId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); - output.writeBoolNoTag(poolRefreshed); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(hasTakenInitialScore); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeBoolNoTag(hasTakenInitialScore); + output.writeRawByte((byte) 120); + output.writeBoolNoTag(poolRefreshed); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < hasTakenReward.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(hasTakenReward.array()[i]); } } @@ -525,10 +505,10 @@ public final class RogueScoreRewardInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(poolId); @@ -555,61 +535,61 @@ public final class RogueScoreRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // poolId + poolId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000002; + // score + score = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { - // poolId - poolId = input.readUInt32(); - bitField0_ |= 0x00000004; + case 56: { + // hasTakenInitialScore + hasTakenInitialScore = input.readBool(); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // poolRefreshed poolRefreshed = input.readBool(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // hasTakenInitialScore - hasTakenInitialScore = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 42) { + if (tag != 106) { break; } } - case 42: { + case 106: { // hasTakenReward [packed=true] input.readPackedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -628,7 +608,7 @@ public final class RogueScoreRewardInfoOuterClass { tag = input.readTag(); break; } - case 40: { + case 104: { // hasTakenReward [packed=false] tag = input.readRepeatedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -642,10 +622,10 @@ public final class RogueScoreRewardInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.endTime, endTime); + output.writeInt64(FieldNames.beginTime, beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); + output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.poolId, poolId); @@ -654,10 +634,10 @@ public final class RogueScoreRewardInfoOuterClass { output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.poolRefreshed, poolRefreshed); + output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); + output.writeBool(FieldNames.poolRefreshed, poolRefreshed); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedUInt32(FieldNames.hasTakenReward, hasTakenReward); @@ -672,11 +652,11 @@ public final class RogueScoreRewardInfoOuterClass { } 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 { @@ -684,11 +664,11 @@ public final class RogueScoreRewardInfoOuterClass { } 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 { @@ -719,11 +699,11 @@ public final class RogueScoreRewardInfoOuterClass { } break; } - case -1555416066: - case -403409833: { - if (input.isAtField(FieldNames.poolRefreshed)) { + case 1561171099: + case -1786836166: { + if (input.isAtField(FieldNames.hasTakenInitialScore)) { if (!input.trySkipNullValue()) { - poolRefreshed = input.readBool(); + hasTakenInitialScore = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -731,11 +711,11 @@ public final class RogueScoreRewardInfoOuterClass { } break; } - case 1561171099: - case -1786836166: { - if (input.isAtField(FieldNames.hasTakenInitialScore)) { + case -1555416066: + case -403409833: { + if (input.isAtField(FieldNames.poolRefreshed)) { if (!input.trySkipNullValue()) { - hasTakenInitialScore = input.readBool(); + poolRefreshed = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -808,18 +788,18 @@ public final class RogueScoreRewardInfoOuterClass { * 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 endTime = FieldName.forField("endTime", "end_time"); + static final FieldName poolId = FieldName.forField("poolId", "pool_id"); static final FieldName score = FieldName.forField("score"); - static final FieldName poolRefreshed = FieldName.forField("poolRefreshed", "pool_refreshed"); - static final FieldName hasTakenInitialScore = FieldName.forField("hasTakenInitialScore", "has_taken_initial_score"); + static final FieldName poolRefreshed = FieldName.forField("poolRefreshed", "pool_refreshed"); + static final FieldName hasTakenReward = FieldName.forField("hasTakenReward", "has_taken_reward"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java index 23fa4d7..b77d62e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSeasonInfoOuterClass.java @@ -19,17 +19,17 @@ public final class RogueSeasonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; */ private long beginTime; /** - * optional int64 end_time = 15; + * optional int64 end_time = 10; */ private long endTime; /** - * optional uint32 season_id = 5; + * optional uint32 season_id = 3; */ private int seasonId; @@ -44,7 +44,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -52,7 +52,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; * @return this */ public RogueSeasonInfo clearBeginTime() { @@ -62,7 +62,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; * @return the beginTime */ public long getBeginTime() { @@ -70,7 +70,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 8; + * optional int64 begin_time = 6; * @param value the beginTime to set * @return this */ @@ -81,7 +81,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 10; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -89,7 +89,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 10; * @return this */ public RogueSeasonInfo clearEndTime() { @@ -99,7 +99,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 10; * @return the endTime */ public long getEndTime() { @@ -107,7 +107,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 15; + * optional int64 end_time = 10; * @param value the endTime to set * @return this */ @@ -118,7 +118,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 5; + * optional uint32 season_id = 3; * @return whether the seasonId field is set */ public boolean hasSeasonId() { @@ -126,7 +126,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 5; + * optional uint32 season_id = 3; * @return this */ public RogueSeasonInfo clearSeasonId() { @@ -136,7 +136,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 5; + * optional uint32 season_id = 3; * @return the seasonId */ public int getSeasonId() { @@ -144,7 +144,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 5; + * optional uint32 season_id = 3; * @param value the seasonId to set * @return this */ @@ -225,15 +225,15 @@ public final class RogueSeasonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 80); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(seasonId); } } @@ -260,25 +260,25 @@ public final class RogueSeasonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { + case 80: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { + case 24: { // seasonId seasonId = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java index da92435..4c78b58 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueSyncContextBoardEventOuterClass.java @@ -19,15 +19,15 @@ public final class RogueSyncContextBoardEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 board_event_id = 4; - */ - private int boardEventId; - - /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 3; */ private int modifierEffectType; + /** + * optional uint32 board_event_id = 7; + */ + private int boardEventId; + private RogueSyncContextBoardEvent() { } @@ -39,62 +39,25 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 board_event_id = 4; - * @return whether the boardEventId field is set + * optional uint32 modifier_effect_type = 3; + * @return whether the modifierEffectType field is set */ - public boolean hasBoardEventId() { + public boolean hasModifierEffectType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 board_event_id = 4; - * @return this - */ - public RogueSyncContextBoardEvent clearBoardEventId() { - bitField0_ &= ~0x00000001; - boardEventId = 0; - return this; - } - - /** - * optional uint32 board_event_id = 4; - * @return the boardEventId - */ - public int getBoardEventId() { - return boardEventId; - } - - /** - * optional uint32 board_event_id = 4; - * @param value the boardEventId to set - * @return this - */ - public RogueSyncContextBoardEvent setBoardEventId(final int value) { - bitField0_ |= 0x00000001; - boardEventId = value; - return this; - } - - /** - * optional uint32 modifier_effect_type = 6; - * @return whether the modifierEffectType field is set - */ - public boolean hasModifierEffectType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 3; * @return this */ public RogueSyncContextBoardEvent clearModifierEffectType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; modifierEffectType = 0; return this; } /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 3; * @return the modifierEffectType */ public int getModifierEffectType() { @@ -102,23 +65,60 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 modifier_effect_type = 6; + * optional uint32 modifier_effect_type = 3; * @param value the modifierEffectType to set * @return this */ public RogueSyncContextBoardEvent setModifierEffectType(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; modifierEffectType = value; return this; } + /** + * optional uint32 board_event_id = 7; + * @return whether the boardEventId field is set + */ + public boolean hasBoardEventId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 board_event_id = 7; + * @return this + */ + public RogueSyncContextBoardEvent clearBoardEventId() { + bitField0_ &= ~0x00000002; + boardEventId = 0; + return this; + } + + /** + * optional uint32 board_event_id = 7; + * @return the boardEventId + */ + public int getBoardEventId() { + return boardEventId; + } + + /** + * optional uint32 board_event_id = 7; + * @param value the boardEventId to set + * @return this + */ + public RogueSyncContextBoardEvent setBoardEventId(final int value) { + bitField0_ |= 0x00000002; + boardEventId = value; + return this; + } + @Override public RogueSyncContextBoardEvent copyFrom(final RogueSyncContextBoardEvent other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - boardEventId = other.boardEventId; modifierEffectType = other.modifierEffectType; + boardEventId = other.boardEventId; } return this; } @@ -129,12 +129,12 @@ public final class RogueSyncContextBoardEventOuterClass { return this; } cachedSize = -1; - if (other.hasBoardEventId()) { - setBoardEventId(other.boardEventId); - } if (other.hasModifierEffectType()) { setModifierEffectType(other.modifierEffectType); } + if (other.hasBoardEventId()) { + setBoardEventId(other.boardEventId); + } return this; } @@ -145,8 +145,8 @@ public final class RogueSyncContextBoardEventOuterClass { } cachedSize = -1; bitField0_ = 0; - boardEventId = 0; modifierEffectType = 0; + boardEventId = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueSyncContextBoardEventOuterClass { } RogueSyncContextBoardEvent other = (RogueSyncContextBoardEvent) o; return bitField0_ == other.bitField0_ - && (!hasBoardEventId() || boardEventId == other.boardEventId) - && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType); + && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType) + && (!hasBoardEventId() || boardEventId == other.boardEventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(boardEventId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(modifierEffectType); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(boardEventId); } } @@ -190,10 +190,10 @@ public final class RogueSyncContextBoardEventOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); } return size; } @@ -205,18 +205,18 @@ public final class RogueSyncContextBoardEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // boardEventId - boardEventId = input.readUInt32(); + case 24: { + // modifierEffectType + modifierEffectType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { - // modifierEffectType - modifierEffectType = input.readUInt32(); + case 56: { + // boardEventId + boardEventId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueSyncContextBoardEventOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.boardEventId, boardEventId); + output.writeUInt32(FieldNames.modifierEffectType, modifierEffectType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.modifierEffectType, modifierEffectType); + output.writeUInt32(FieldNames.boardEventId, boardEventId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueSyncContextBoardEventOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1130727537: - case -1668848103: { - if (input.isAtField(FieldNames.boardEventId)) { + case -1445000542: + case -145180736: { + if (input.isAtField(FieldNames.modifierEffectType)) { if (!input.trySkipNullValue()) { - boardEventId = input.readUInt32(); + modifierEffectType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueSyncContextBoardEventOuterClass { } break; } - case -1445000542: - case -145180736: { - if (input.isAtField(FieldNames.modifierEffectType)) { + case -1130727537: + case -1668848103: { + if (input.isAtField(FieldNames.boardEventId)) { if (!input.trySkipNullValue()) { - modifierEffectType = input.readUInt32(); + boardEventId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueSyncContextBoardEventOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName boardEventId = FieldName.forField("boardEventId", "board_event_id"); - static final FieldName modifierEffectType = FieldName.forField("modifierEffectType", "modifier_effect_type"); + + static final FieldName boardEventId = FieldName.forField("boardEventId", "board_event_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java index 4e885b1..88821af 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java @@ -20,7 +20,7 @@ public final class RogueTalentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 7; */ private final RepeatedMessage rogueTalent = RepeatedMessage.newEmptyInstance(RogueTalentOuterClass.RogueTalent.getFactory()); @@ -35,7 +35,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 7; * @return whether the rogueTalent field is set */ public boolean hasRogueTalent() { @@ -43,7 +43,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 7; * @return this */ public RogueTalentInfo clearRogueTalent() { @@ -53,7 +53,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 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. @@ -67,7 +67,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 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 @@ -81,7 +81,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 7; * @param value the rogueTalent to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 9; + * repeated .RogueTalent rogue_talent = 7; * @param values the rogueTalent to add * @return this */ @@ -163,7 +163,7 @@ public final class RogueTalentInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < rogueTalent.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueTalent.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueTalentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 58: { // rogueTalent tag = input.readRepeatedMessage(rogueTalent, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java index 8518829..f7f926a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueTalentOuterClass.java @@ -20,17 +20,17 @@ public final class RogueTalentOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 12; */ private int talentId; /** - * optional .RogueTalentStatus status = 5; + * optional .RogueTalentStatus status = 7; */ private int status; /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 5; */ private final RepeatedMessage unlockProgressList = RepeatedMessage.newEmptyInstance(RogueUnlockProgressOuterClass.RogueUnlockProgress.getFactory()); @@ -45,7 +45,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 12; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -53,7 +53,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 12; * @return this */ public RogueTalent clearTalentId() { @@ -63,7 +63,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 12; * @return the talentId */ public int getTalentId() { @@ -71,7 +71,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 8; + * optional uint32 talent_id = 12; * @param value the talentId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 5; + * optional .RogueTalentStatus status = 7; * @return whether the status field is set */ public boolean hasStatus() { @@ -90,7 +90,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 5; + * optional .RogueTalentStatus status = 7; * @return this */ public RogueTalent clearStatus() { @@ -100,7 +100,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 5; + * optional .RogueTalentStatus status = 7; * @return the status */ public RogueTalentStatusOuterClass.RogueTalentStatus getStatus() { @@ -133,7 +133,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 5; + * optional .RogueTalentStatus status = 7; * @param value the status to set * @return this */ @@ -144,7 +144,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 5; * @return whether the unlockProgressList field is set */ public boolean hasUnlockProgressList() { @@ -152,7 +152,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 5; * @return this */ public RogueTalent clearUnlockProgressList() { @@ -162,7 +162,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 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. @@ -177,7 +177,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 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 @@ -192,7 +192,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 5; * @param value the unlockProgressList to add * @return this */ @@ -204,7 +204,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 3; + * repeated .RogueUnlockProgress unlock_progress_list = 5; * @param values the unlockProgressList to add * @return this */ @@ -287,16 +287,16 @@ public final class RogueTalentOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(talentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < unlockProgressList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(unlockProgressList.get(i)); } } @@ -324,16 +324,16 @@ public final class RogueTalentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 96: { // talentId talentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { + case 56: { // status final int value = input.readInt32(); if (RogueTalentStatusOuterClass.RogueTalentStatus.forNumber(value) != null) { @@ -341,11 +341,11 @@ public final class RogueTalentOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 26) { + if (tag != 42) { break; } } - case 26: { + case 42: { // unlockProgressList tag = input.readRepeatedMessage(unlockProgressList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java index dbba100..d1722af 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueUnlockProgressOuterClass.java @@ -19,17 +19,17 @@ public final class RogueUnlockProgressOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unlock_id = 4; - */ - private int unlockId; - - /** - * optional uint32 progress = 15; + * optional uint32 progress = 1; */ private int progress; /** - * optional bool finish = 1; + * optional uint32 unlock_id = 3; + */ + private int unlockId; + + /** + * optional bool finish = 9; */ private boolean finish; @@ -44,62 +44,25 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 4; - * @return whether the unlockId field is set + * optional uint32 progress = 1; + * @return whether the progress field is set */ - public boolean hasUnlockId() { + public boolean hasProgress() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unlock_id = 4; - * @return this - */ - public RogueUnlockProgress clearUnlockId() { - bitField0_ &= ~0x00000001; - unlockId = 0; - return this; - } - - /** - * optional uint32 unlock_id = 4; - * @return the unlockId - */ - public int getUnlockId() { - return unlockId; - } - - /** - * optional uint32 unlock_id = 4; - * @param value the unlockId to set - * @return this - */ - public RogueUnlockProgress setUnlockId(final int value) { - bitField0_ |= 0x00000001; - unlockId = value; - return this; - } - - /** - * optional uint32 progress = 15; - * @return whether the progress field is set - */ - public boolean hasProgress() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 progress = 15; + * optional uint32 progress = 1; * @return this */ public RogueUnlockProgress clearProgress() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; progress = 0; return this; } /** - * optional uint32 progress = 15; + * optional uint32 progress = 1; * @return the progress */ public int getProgress() { @@ -107,18 +70,55 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 15; + * optional uint32 progress = 1; * @param value the progress to set * @return this */ public RogueUnlockProgress setProgress(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; progress = value; return this; } /** - * optional bool finish = 1; + * optional uint32 unlock_id = 3; + * @return whether the unlockId field is set + */ + public boolean hasUnlockId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unlock_id = 3; + * @return this + */ + public RogueUnlockProgress clearUnlockId() { + bitField0_ &= ~0x00000002; + unlockId = 0; + return this; + } + + /** + * optional uint32 unlock_id = 3; + * @return the unlockId + */ + public int getUnlockId() { + return unlockId; + } + + /** + * optional uint32 unlock_id = 3; + * @param value the unlockId to set + * @return this + */ + public RogueUnlockProgress setUnlockId(final int value) { + bitField0_ |= 0x00000002; + unlockId = value; + return this; + } + + /** + * optional bool finish = 9; * @return whether the finish field is set */ public boolean hasFinish() { @@ -126,7 +126,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 1; + * optional bool finish = 9; * @return this */ public RogueUnlockProgress clearFinish() { @@ -136,7 +136,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 1; + * optional bool finish = 9; * @return the finish */ public boolean getFinish() { @@ -144,7 +144,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 1; + * optional bool finish = 9; * @param value the finish to set * @return this */ @@ -159,8 +159,8 @@ public final class RogueUnlockProgressOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - unlockId = other.unlockId; progress = other.progress; + unlockId = other.unlockId; finish = other.finish; } return this; @@ -172,12 +172,12 @@ public final class RogueUnlockProgressOuterClass { return this; } cachedSize = -1; - if (other.hasUnlockId()) { - setUnlockId(other.unlockId); - } if (other.hasProgress()) { setProgress(other.progress); } + if (other.hasUnlockId()) { + setUnlockId(other.unlockId); + } if (other.hasFinish()) { setFinish(other.finish); } @@ -191,8 +191,8 @@ public final class RogueUnlockProgressOuterClass { } cachedSize = -1; bitField0_ = 0; - unlockId = 0; progress = 0; + unlockId = 0; finish = false; return this; } @@ -217,23 +217,23 @@ public final class RogueUnlockProgressOuterClass { } RogueUnlockProgress other = (RogueUnlockProgress) o; return bitField0_ == other.bitField0_ - && (!hasUnlockId() || unlockId == other.unlockId) && (!hasProgress() || progress == other.progress) + && (!hasUnlockId() || unlockId == other.unlockId) && (!hasFinish() || finish == other.finish); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(unlockId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(progress); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(unlockId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeBoolNoTag(finish); } } @@ -242,10 +242,10 @@ public final class RogueUnlockProgressOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class RogueUnlockProgressOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // unlockId - unlockId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 8: { // progress progress = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 24) { break; } } - case 8: { + case 24: { + // unlockId + unlockId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // finish finish = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class RogueUnlockProgressOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.unlockId, unlockId); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.progress, progress); + output.writeUInt32(FieldNames.unlockId, unlockId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.finish, finish); @@ -323,11 +323,10 @@ public final class RogueUnlockProgressOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -210950273: - case 2050497526: { - if (input.isAtField(FieldNames.unlockId)) { + case -1001078227: { + if (input.isAtField(FieldNames.progress)) { if (!input.trySkipNullValue()) { - unlockId = input.readUInt32(); + progress = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +334,11 @@ public final class RogueUnlockProgressOuterClass { } break; } - case -1001078227: { - if (input.isAtField(FieldNames.progress)) { + case -210950273: + case 2050497526: { + if (input.isAtField(FieldNames.unlockId)) { if (!input.trySkipNullValue()) { - progress = input.readUInt32(); + unlockId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -410,10 +410,10 @@ public final class RogueUnlockProgressOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName unlockId = FieldName.forField("unlockId", "unlock_id"); - static final FieldName progress = FieldName.forField("progress"); + static final FieldName unlockId = FieldName.forField("unlockId", "unlock_id"); + static final FieldName finish = FieldName.forField("finish"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java index fa64824..2499f8e 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemDataOuterClass.java @@ -23,14 +23,14 @@ public final class RogueVirtualItemDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 num = 13; + * optional uint32 display_type = 2; */ - private int num; + private int displayType; /** - * optional uint32 MDBPDPDDHBC = 14; + * optional uint32 num = 14; */ - private int mDBPDPDDHBC; + private int num; private RogueVirtualItemData() { } @@ -47,25 +47,62 @@ public final class RogueVirtualItemDataOuterClass { } /** - * optional uint32 num = 13; - * @return whether the num field is set + * optional uint32 display_type = 2; + * @return whether the displayType field is set */ - public boolean hasNum() { + public boolean hasDisplayType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 num = 13; + * optional uint32 display_type = 2; + * @return this + */ + public RogueVirtualItemData clearDisplayType() { + bitField0_ &= ~0x00000001; + displayType = 0; + return this; + } + + /** + * optional uint32 display_type = 2; + * @return the displayType + */ + public int getDisplayType() { + return displayType; + } + + /** + * optional uint32 display_type = 2; + * @param value the displayType to set + * @return this + */ + public RogueVirtualItemData setDisplayType(final int value) { + bitField0_ |= 0x00000001; + displayType = value; + return this; + } + + /** + * optional uint32 num = 14; + * @return whether the num field is set + */ + public boolean hasNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 num = 14; * @return this */ public RogueVirtualItemData clearNum() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; num = 0; return this; } /** - * optional uint32 num = 13; + * optional uint32 num = 14; * @return the num */ public int getNum() { @@ -73,50 +110,13 @@ public final class RogueVirtualItemDataOuterClass { } /** - * optional uint32 num = 13; + * optional uint32 num = 14; * @param value the num to set * @return this */ public RogueVirtualItemData setNum(final int value) { - bitField0_ |= 0x00000001; - num = value; - return this; - } - - /** - * optional uint32 MDBPDPDDHBC = 14; - * @return whether the mDBPDPDDHBC field is set - */ - public boolean hasMDBPDPDDHBC() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 MDBPDPDDHBC = 14; - * @return this - */ - public RogueVirtualItemData clearMDBPDPDDHBC() { - bitField0_ &= ~0x00000002; - mDBPDPDDHBC = 0; - return this; - } - - /** - * optional uint32 MDBPDPDDHBC = 14; - * @return the mDBPDPDDHBC - */ - public int getMDBPDPDDHBC() { - return mDBPDPDDHBC; - } - - /** - * optional uint32 MDBPDPDDHBC = 14; - * @param value the mDBPDPDDHBC to set - * @return this - */ - public RogueVirtualItemData setMDBPDPDDHBC(final int value) { bitField0_ |= 0x00000002; - mDBPDPDDHBC = value; + num = value; return this; } @@ -125,8 +125,8 @@ public final class RogueVirtualItemDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + displayType = other.displayType; num = other.num; - mDBPDPDDHBC = other.mDBPDPDDHBC; } return this; } @@ -137,12 +137,12 @@ public final class RogueVirtualItemDataOuterClass { return this; } cachedSize = -1; + if (other.hasDisplayType()) { + setDisplayType(other.displayType); + } if (other.hasNum()) { setNum(other.num); } - if (other.hasMDBPDPDDHBC()) { - setMDBPDPDDHBC(other.mDBPDPDDHBC); - } return this; } @@ -153,8 +153,8 @@ public final class RogueVirtualItemDataOuterClass { } cachedSize = -1; bitField0_ = 0; + displayType = 0; num = 0; - mDBPDPDDHBC = 0; return this; } @@ -178,19 +178,19 @@ public final class RogueVirtualItemDataOuterClass { } RogueVirtualItemData other = (RogueVirtualItemData) o; return bitField0_ == other.bitField0_ - && (!hasNum() || num == other.num) - && (!hasMDBPDPDDHBC() || mDBPDPDDHBC == other.mDBPDPDDHBC); + && (!hasDisplayType() || displayType == other.displayType) + && (!hasNum() || num == other.num); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(displayType); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(mDBPDPDDHBC); + output.writeUInt32NoTag(num); } } @@ -198,10 +198,10 @@ public final class RogueVirtualItemDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(displayType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mDBPDPDDHBC); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } return size; } @@ -213,9 +213,9 @@ public final class RogueVirtualItemDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { - // num - num = input.readUInt32(); + case 16: { + // displayType + displayType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -223,8 +223,8 @@ public final class RogueVirtualItemDataOuterClass { } } case 112: { - // mDBPDPDDHBC - mDBPDPDDHBC = input.readUInt32(); + // num + num = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -249,10 +249,10 @@ public final class RogueVirtualItemDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.displayType, displayType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mDBPDPDDHBC, mDBPDPDDHBC); + output.writeUInt32(FieldNames.num, num); } output.endObject(); } @@ -264,10 +264,11 @@ public final class RogueVirtualItemDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109446: { - if (input.isAtField(FieldNames.num)) { + case 1714350876: + case 1615288471: { + if (input.isAtField(FieldNames.displayType)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + displayType = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -275,10 +276,10 @@ public final class RogueVirtualItemDataOuterClass { } break; } - case -170385096: { - if (input.isAtField(FieldNames.mDBPDPDDHBC)) { + case 109446: { + if (input.isAtField(FieldNames.num)) { if (!input.trySkipNullValue()) { - mDBPDPDDHBC = input.readUInt32(); + num = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -339,9 +340,9 @@ public final class RogueVirtualItemDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName num = FieldName.forField("num"); + static final FieldName displayType = FieldName.forField("displayType", "display_type"); - static final FieldName mDBPDPDDHBC = FieldName.forField("MDBPDPDDHBC"); + static final FieldName num = FieldName.forField("num"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java index 2bcadf5..ec2f232 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java @@ -20,10 +20,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  uint32 JLGAKDGCBOH = 7;
+     *  could be 5, 7 or 12
      *
* - * optional uint32 rogue_coin = 8; + * optional uint32 rogue_coin = 3; */ private int rogueCoin; @@ -39,10 +39,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  uint32 JLGAKDGCBOH = 7;
+     *  could be 5, 7 or 12
      *
* - * optional uint32 rogue_coin = 8; + * optional uint32 rogue_coin = 3; * @return whether the rogueCoin field is set */ public boolean hasRogueCoin() { @@ -51,10 +51,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  uint32 JLGAKDGCBOH = 7;
+     *  could be 5, 7 or 12
      *
* - * optional uint32 rogue_coin = 8; + * optional uint32 rogue_coin = 3; * @return this */ public RogueVirtualItemInfo clearRogueCoin() { @@ -65,10 +65,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  uint32 JLGAKDGCBOH = 7;
+     *  could be 5, 7 or 12
      *
* - * optional uint32 rogue_coin = 8; + * optional uint32 rogue_coin = 3; * @return the rogueCoin */ public int getRogueCoin() { @@ -77,10 +77,10 @@ public final class RogueVirtualItemInfoOuterClass { /** * 
-     *  uint32 JLGAKDGCBOH = 7;
+     *  could be 5, 7 or 12
      *
* - * optional uint32 rogue_coin = 8; + * optional uint32 rogue_coin = 3; * @param value the rogueCoin to set * @return this */ @@ -149,7 +149,7 @@ public final class RogueVirtualItemInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(rogueCoin); } } @@ -170,7 +170,7 @@ public final class RogueVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 24: { // rogueCoin rogueCoin = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java index 277f01f..6b10364 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java @@ -19,17 +19,17 @@ public final class RotateMapScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 client_pos_version = 11; + * optional uint32 client_pos_version = 5; */ private int clientPosVersion; /** - * optional .MotionInfo motion = 6; + * optional uint32 retcode = 10; + */ + private int retcode; + + /** + * optional .MotionInfo motion = 11; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,62 +44,25 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 client_pos_version = 5; + * @return whether the clientPosVersion field is set */ - public boolean hasRetcode() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public RotateMapScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 1; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 1; - * @param value the retcode to set - * @return this - */ - public RotateMapScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 client_pos_version = 11; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 client_pos_version = 11; + * optional uint32 client_pos_version = 5; * @return this */ public RotateMapScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 11; + * optional uint32 client_pos_version = 5; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,18 +70,55 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 11; + * optional uint32 client_pos_version = 5; * @param value the clientPosVersion to set * @return this */ public RotateMapScRsp setClientPosVersion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientPosVersion = value; return this; } /** - * optional .MotionInfo motion = 6; + * optional uint32 retcode = 10; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public RotateMapScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 10; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 10; + * @param value the retcode to set + * @return this + */ + public RotateMapScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .MotionInfo motion = 11; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 6; + * optional .MotionInfo motion = 11; * @return this */ public RotateMapScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 6; + * optional .MotionInfo motion = 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. @@ -150,7 +150,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 6; + * optional .MotionInfo motion = 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 @@ -164,7 +164,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 6; + * optional .MotionInfo motion = 11; * @param value the motion to set * @return this */ @@ -179,8 +179,8 @@ public final class RotateMapScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; clientPosVersion = other.clientPosVersion; + retcode = other.retcode; motion.copyFrom(other.motion); } return this; @@ -192,12 +192,12 @@ public final class RotateMapScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -211,8 +211,8 @@ public final class RotateMapScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; clientPosVersion = 0; + retcode = 0; motion.clear(); return this; } @@ -238,23 +238,23 @@ public final class RotateMapScRspOuterClass { } RotateMapScRsp other = (RotateMapScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasRetcode() || retcode == other.retcode) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(clientPosVersion); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 90); output.writeMessageNoTag(motion); } } @@ -263,10 +263,10 @@ public final class RotateMapScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -281,25 +281,25 @@ public final class RotateMapScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 40: { // clientPosVersion clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 80) { break; } } - case 50: { + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class RotateMapScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -344,10 +344,11 @@ public final class RotateMapScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class RotateMapScRspOuterClass { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -431,10 +431,10 @@ public final class RotateMapScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName motion = FieldName.forField("motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index 017f9ed..aed2a86 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java @@ -19,22 +19,22 @@ public final class SceneActorInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 5; - */ - private int baseAvatarId; - - /** - * optional uint32 map_layer = 13; - */ - private int mapLayer; - - /** - * optional uint32 uid = 15; + * optional uint32 uid = 7; */ private int uid; /** - * optional .AvatarType avatar_type = 10; + * optional uint32 map_layer = 9; + */ + private int mapLayer; + + /** + * optional uint32 base_avatar_id = 11; + */ + private int baseAvatarId; + + /** + * optional .AvatarType avatar_type = 2; */ private int avatarType; @@ -49,44 +49,44 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 base_avatar_id = 5; - * @return whether the baseAvatarId field is set + * optional uint32 uid = 7; + * @return whether the uid field is set */ - public boolean hasBaseAvatarId() { + public boolean hasUid() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 uid = 7; * @return this */ - public SceneActorInfo clearBaseAvatarId() { + public SceneActorInfo clearUid() { bitField0_ &= ~0x00000001; - baseAvatarId = 0; + uid = 0; return this; } /** - * optional uint32 base_avatar_id = 5; - * @return the baseAvatarId + * optional uint32 uid = 7; + * @return the uid */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getUid() { + return uid; } /** - * optional uint32 base_avatar_id = 5; - * @param value the baseAvatarId to set + * optional uint32 uid = 7; + * @param value the uid to set * @return this */ - public SceneActorInfo setBaseAvatarId(final int value) { + public SceneActorInfo setUid(final int value) { bitField0_ |= 0x00000001; - baseAvatarId = value; + uid = value; return this; } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 9; * @return whether the mapLayer field is set */ public boolean hasMapLayer() { @@ -94,7 +94,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 9; * @return this */ public SceneActorInfo clearMapLayer() { @@ -104,7 +104,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 9; * @return the mapLayer */ public int getMapLayer() { @@ -112,7 +112,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 13; + * optional uint32 map_layer = 9; * @param value the mapLayer to set * @return this */ @@ -123,44 +123,44 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 uid = 15; - * @return whether the uid field is set + * optional uint32 base_avatar_id = 11; + * @return whether the baseAvatarId field is set */ - public boolean hasUid() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 uid = 15; + * optional uint32 base_avatar_id = 11; * @return this */ - public SceneActorInfo clearUid() { + public SceneActorInfo clearBaseAvatarId() { bitField0_ &= ~0x00000004; - uid = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 uid = 15; - * @return the uid + * optional uint32 base_avatar_id = 11; + * @return the baseAvatarId */ - public int getUid() { - return uid; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 uid = 15; - * @param value the uid to set + * optional uint32 base_avatar_id = 11; + * @param value the baseAvatarId to set * @return this */ - public SceneActorInfo setUid(final int value) { + public SceneActorInfo setBaseAvatarId(final int value) { bitField0_ |= 0x00000004; - uid = value; + baseAvatarId = value; return this; } /** - * optional .AvatarType avatar_type = 10; + * optional .AvatarType avatar_type = 2; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 10; + * optional .AvatarType avatar_type = 2; * @return this */ public SceneActorInfo clearAvatarType() { @@ -178,7 +178,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 10; + * optional .AvatarType avatar_type = 2; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 10; + * optional .AvatarType avatar_type = 2; * @param value the avatarType to set * @return this */ @@ -226,9 +226,9 @@ public final class SceneActorInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; - mapLayer = other.mapLayer; uid = other.uid; + mapLayer = other.mapLayer; + baseAvatarId = other.baseAvatarId; avatarType = other.avatarType; } return this; @@ -240,14 +240,14 @@ public final class SceneActorInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasUid()) { + setUid(other.uid); } if (other.hasMapLayer()) { setMapLayer(other.mapLayer); } - if (other.hasUid()) { - setUid(other.uid); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); @@ -262,9 +262,9 @@ public final class SceneActorInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; - mapLayer = 0; uid = 0; + mapLayer = 0; + baseAvatarId = 0; avatarType = 0; return this; } @@ -289,28 +289,28 @@ public final class SceneActorInfoOuterClass { } SceneActorInfo other = (SceneActorInfo) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasUid() || uid == other.uid) + && (!hasMapLayer() || mapLayer == other.mapLayer) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasAvatarType() || avatarType == other.avatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(uid); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeEnumNoTag(avatarType); } } @@ -319,13 +319,13 @@ public final class SceneActorInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -340,34 +340,34 @@ public final class SceneActorInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 56: { + // uid + uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // mapLayer mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { - // uid - uid = input.readUInt32(); + case 88: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 16) { break; } } - case 80: { + case 16: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -397,13 +397,13 @@ public final class SceneActorInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -418,11 +418,10 @@ public final class SceneActorInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -442,10 +441,11 @@ public final class SceneActorInfoOuterClass { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -523,11 +523,11 @@ public final class SceneActorInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName uid = FieldName.forField("uid"); static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); - static final FieldName uid = FieldName.forField("uid"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); } diff --git a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java index d040b53..8303d91 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java @@ -20,55 +20,55 @@ public final class SceneBattleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 1; - */ - private int worldLevel; - - /** - * optional uint32 logic_random_seed = 3; - */ - private int logicRandomSeed; - - /** - * optional uint32 rounds_limit = 8; + * optional uint32 rounds_limit = 2; */ private int roundsLimit; /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 4; */ private int stageId; /** - * optional uint32 battle_id = 15; + * optional uint32 world_level = 6; + */ + private int worldLevel; + + /** + * optional uint32 logic_random_seed = 12; + */ + private int logicRandomSeed; + + /** + * optional uint32 battle_id = 14; */ private int battleId; /** - * repeated .BattleAvatar battle_avatar_list = 4; - */ - private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); - - /** - * repeated .BattleBuff buff_list = 6; - */ - private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); - - /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_list = 1; */ private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .BattleBuff buff_list = 3; */ - private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); + private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; + * repeated .BattleAvatar battle_avatar_list = 15; + */ + private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; */ private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); + /** + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + */ + private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); + private SceneBattleInfo() { } @@ -80,99 +80,25 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 world_level = 1; - * @return whether the worldLevel field is set + * optional uint32 rounds_limit = 2; + * @return whether the roundsLimit field is set */ - public boolean hasWorldLevel() { + public boolean hasRoundsLimit() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 1; - * @return this - */ - public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 1; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 1; - * @param value the worldLevel to set - * @return this - */ - public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 logic_random_seed = 3; - * @return whether the logicRandomSeed field is set - */ - public boolean hasLogicRandomSeed() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 logic_random_seed = 3; - * @return this - */ - public SceneBattleInfo clearLogicRandomSeed() { - bitField0_ &= ~0x00000002; - logicRandomSeed = 0; - return this; - } - - /** - * optional uint32 logic_random_seed = 3; - * @return the logicRandomSeed - */ - public int getLogicRandomSeed() { - return logicRandomSeed; - } - - /** - * optional uint32 logic_random_seed = 3; - * @param value the logicRandomSeed to set - * @return this - */ - public SceneBattleInfo setLogicRandomSeed(final int value) { - bitField0_ |= 0x00000002; - logicRandomSeed = value; - return this; - } - - /** - * optional uint32 rounds_limit = 8; - * @return whether the roundsLimit field is set - */ - public boolean hasRoundsLimit() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 rounds_limit = 8; + * optional uint32 rounds_limit = 2; * @return this */ public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; roundsLimit = 0; return this; } /** - * optional uint32 rounds_limit = 8; + * optional uint32 rounds_limit = 2; * @return the roundsLimit */ public int getRoundsLimit() { @@ -180,36 +106,36 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 rounds_limit = 8; + * optional uint32 rounds_limit = 2; * @param value the roundsLimit to set * @return this */ public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; roundsLimit = value; return this; } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 4; * @return whether the stageId field is set */ public boolean hasStageId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 4; * @return this */ public SceneBattleInfo clearStageId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; stageId = 0; return this; } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 4; * @return the stageId */ public int getStageId() { @@ -217,18 +143,92 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 stage_id = 11; + * optional uint32 stage_id = 4; * @param value the stageId to set * @return this */ public SceneBattleInfo setStageId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; stageId = value; return this; } /** - * optional uint32 battle_id = 15; + * optional uint32 world_level = 6; + * @return whether the worldLevel field is set + */ + public boolean hasWorldLevel() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 world_level = 6; + * @return this + */ + public SceneBattleInfo clearWorldLevel() { + bitField0_ &= ~0x00000004; + worldLevel = 0; + return this; + } + + /** + * optional uint32 world_level = 6; + * @return the worldLevel + */ + public int getWorldLevel() { + return worldLevel; + } + + /** + * optional uint32 world_level = 6; + * @param value the worldLevel to set + * @return this + */ + public SceneBattleInfo setWorldLevel(final int value) { + bitField0_ |= 0x00000004; + worldLevel = value; + return this; + } + + /** + * optional uint32 logic_random_seed = 12; + * @return whether the logicRandomSeed field is set + */ + public boolean hasLogicRandomSeed() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 logic_random_seed = 12; + * @return this + */ + public SceneBattleInfo clearLogicRandomSeed() { + bitField0_ &= ~0x00000008; + logicRandomSeed = 0; + return this; + } + + /** + * optional uint32 logic_random_seed = 12; + * @return the logicRandomSeed + */ + public int getLogicRandomSeed() { + return logicRandomSeed; + } + + /** + * optional uint32 logic_random_seed = 12; + * @param value the logicRandomSeed to set + * @return this + */ + public SceneBattleInfo setLogicRandomSeed(final int value) { + bitField0_ |= 0x00000008; + logicRandomSeed = value; + return this; + } + + /** + * optional uint32 battle_id = 14; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -236,7 +236,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 15; + * optional uint32 battle_id = 14; * @return this */ public SceneBattleInfo clearBattleId() { @@ -246,7 +246,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 15; + * optional uint32 battle_id = 14; * @return the battleId */ public int getBattleId() { @@ -254,7 +254,7 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 battle_id = 15; + * optional uint32 battle_id = 14; * @param value the battleId to set * @return this */ @@ -265,162 +265,25 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 4; - * @return whether the battleAvatarList field is set + * repeated .SceneMonsterWave monster_wave_list = 1; + * @return whether the monsterWaveList field is set */ - public boolean hasBattleAvatarList() { + public boolean hasMonsterWaveList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .BattleAvatar battle_avatar_list = 4; - * @return this - */ - public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000020; - battleAvatarList.clear(); - return this; - } - - /** - * repeated .BattleAvatar battle_avatar_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 #getMutableBattleAvatarList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBattleAvatarList() { - return battleAvatarList; - } - - /** - * repeated .BattleAvatar battle_avatar_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 RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000020; - return battleAvatarList; - } - - /** - * repeated .BattleAvatar battle_avatar_list = 4; - * @param value the battleAvatarList to add - * @return this - */ - public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000020; - battleAvatarList.add(value); - return this; - } - - /** - * repeated .BattleAvatar battle_avatar_list = 4; - * @param values the battleAvatarList to add - * @return this - */ - public SceneBattleInfo addAllBattleAvatarList( - final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000020; - battleAvatarList.addAll(values); - return this; - } - - /** - * repeated .BattleBuff buff_list = 6; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .BattleBuff buff_list = 6; - * @return this - */ - public SceneBattleInfo clearBuffList() { - bitField0_ &= ~0x00000040; - buffList.clear(); - return this; - } - - /** - * repeated .BattleBuff 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 .BattleBuff 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_ |= 0x00000040; - return buffList; - } - - /** - * repeated .BattleBuff buff_list = 6; - * @param value the buffList to add - * @return this - */ - public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { - bitField0_ |= 0x00000040; - buffList.add(value); - return this; - } - - /** - * repeated .BattleBuff buff_list = 6; - * @param values the buffList to add - * @return this - */ - public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { - bitField0_ |= 0x00000040; - buffList.addAll(values); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 7; - * @return whether the monsterWaveList field is set - */ - public boolean hasMonsterWaveList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_list = 1; * @return this */ public SceneBattleInfo clearMonsterWaveList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; monsterWaveList.clear(); return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_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. @@ -434,7 +297,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_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 @@ -444,54 +307,259 @@ public final class SceneBattleInfoOuterClass { */ public RepeatedMessage getMutableMonsterWaveList( ) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; return monsterWaveList; } /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_list = 1; * @param value the monsterWaveList to add * @return this */ public SceneBattleInfo addMonsterWaveList( final SceneMonsterWaveOuterClass.SceneMonsterWave value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; monsterWaveList.add(value); return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 7; + * repeated .SceneMonsterWave monster_wave_list = 1; * @param values the monsterWaveList to add * @return this */ public SceneBattleInfo addAllMonsterWaveList( final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; monsterWaveList.addAll(values); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; - * @return whether the eventBattleInfoList field is set + * repeated .BattleBuff buff_list = 3; + * @return whether the buffList field is set */ - public boolean hasEventBattleInfoList() { + public boolean hasBuffList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .BattleBuff buff_list = 3; + * @return this + */ + public SceneBattleInfo clearBuffList() { + bitField0_ &= ~0x00000040; + buffList.clear(); + return this; + } + + /** + * repeated .BattleBuff buff_list = 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 #getMutableBuffList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBuffList() { + return buffList; + } + + /** + * repeated .BattleBuff buff_list = 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 RepeatedMessage getMutableBuffList() { + bitField0_ |= 0x00000040; + return buffList; + } + + /** + * repeated .BattleBuff buff_list = 3; + * @param value the buffList to add + * @return this + */ + public SceneBattleInfo addBuffList(final BattleBuffOuterClass.BattleBuff value) { + bitField0_ |= 0x00000040; + buffList.add(value); + return this; + } + + /** + * repeated .BattleBuff buff_list = 3; + * @param values the buffList to add + * @return this + */ + public SceneBattleInfo addAllBuffList(final BattleBuffOuterClass.BattleBuff... values) { + bitField0_ |= 0x00000040; + buffList.addAll(values); + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; + * @return whether the battleAvatarList field is set + */ + public boolean hasBattleAvatarList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; + * @return this + */ + public SceneBattleInfo clearBattleAvatarList() { + bitField0_ &= ~0x00000080; + battleAvatarList.clear(); + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_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 #getMutableBattleAvatarList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBattleAvatarList() { + return battleAvatarList; + } + + /** + * repeated .BattleAvatar battle_avatar_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 RepeatedMessage getMutableBattleAvatarList() { + bitField0_ |= 0x00000080; + return battleAvatarList; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; + * @param value the battleAvatarList to add + * @return this + */ + public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { + bitField0_ |= 0x00000080; + battleAvatarList.add(value); + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; + * @param values the battleAvatarList to add + * @return this + */ + public SceneBattleInfo addAllBattleAvatarList( + final BattleAvatarOuterClass.BattleAvatar... values) { + bitField0_ |= 0x00000080; + battleAvatarList.addAll(values); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * @return whether the battleTargetInfo field is set + */ + public boolean hasBattleTargetInfo() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * @return this + */ + public SceneBattleInfo clearBattleTargetInfo() { + bitField0_ &= ~0x00000100; + battleTargetInfo.clear(); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * + * 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 #getMutableBattleTargetInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBattleTargetInfo() { + return battleTargetInfo; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * + * 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 getMutableBattleTargetInfo() { + bitField0_ |= 0x00000100; + return battleTargetInfo; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * @param value the battleTargetInfo to add + * @return this + */ + public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { + bitField0_ |= 0x00000100; + battleTargetInfo.add(value); + return this; + } + + /** + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 149; + * @param values the battleTargetInfo to add + * @return this + */ + public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { + bitField0_ |= 0x00000100; + battleTargetInfo.addAll(values); + return this; + } + + /** + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; + * @return whether the eventBattleInfoList field is set + */ + public boolean hasEventBattleInfoList() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; * @return this */ public SceneBattleInfo clearEventBattleInfoList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; eventBattleInfoList.clear(); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; * * 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. @@ -506,7 +574,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -516,117 +584,49 @@ public final class SceneBattleInfoOuterClass { */ public RepeatedMessage getMutableEventBattleInfoList( ) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return eventBattleInfoList; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; * @param value the eventBattleInfoList to add * @return this */ public SceneBattleInfo addEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; eventBattleInfoList.add(value); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 413; + * repeated .BattleEventBattleInfo event_battle_info_list = 1965; * @param values the eventBattleInfoList to add * @return this */ public SceneBattleInfo addAllEventBattleInfoList( final BattleEventBattleInfoOuterClass.BattleEventBattleInfo... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; eventBattleInfoList.addAll(values); return this; } - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * @return whether the battleTargetInfo field is set - */ - public boolean hasBattleTargetInfo() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * @return this - */ - public SceneBattleInfo clearBattleTargetInfo() { - bitField0_ &= ~0x00000200; - battleTargetInfo.clear(); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * - * 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 #getMutableBattleTargetInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBattleTargetInfo() { - return battleTargetInfo; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * - * 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 getMutableBattleTargetInfo() { - bitField0_ |= 0x00000200; - return battleTargetInfo; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * @param value the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addBattleTargetInfo(final BattleTargetInfoEntry value) { - bitField0_ |= 0x00000200; - battleTargetInfo.add(value); - return this; - } - - /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; - * @param values the battleTargetInfo to add - * @return this - */ - public SceneBattleInfo addAllBattleTargetInfo(final BattleTargetInfoEntry... values) { - bitField0_ |= 0x00000200; - battleTargetInfo.addAll(values); - return this; - } - @Override public SceneBattleInfo copyFrom(final SceneBattleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; - logicRandomSeed = other.logicRandomSeed; roundsLimit = other.roundsLimit; stageId = other.stageId; + worldLevel = other.worldLevel; + logicRandomSeed = other.logicRandomSeed; battleId = other.battleId; - battleAvatarList.copyFrom(other.battleAvatarList); - buffList.copyFrom(other.buffList); monsterWaveList.copyFrom(other.monsterWaveList); - eventBattleInfoList.copyFrom(other.eventBattleInfoList); + buffList.copyFrom(other.buffList); + battleAvatarList.copyFrom(other.battleAvatarList); battleTargetInfo.copyFrom(other.battleTargetInfo); + eventBattleInfoList.copyFrom(other.eventBattleInfoList); } return this; } @@ -637,36 +637,36 @@ public final class SceneBattleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } - if (other.hasLogicRandomSeed()) { - setLogicRandomSeed(other.logicRandomSeed); - } if (other.hasRoundsLimit()) { setRoundsLimit(other.roundsLimit); } if (other.hasStageId()) { setStageId(other.stageId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } + if (other.hasLogicRandomSeed()) { + setLogicRandomSeed(other.logicRandomSeed); + } if (other.hasBattleId()) { setBattleId(other.battleId); } - if (other.hasBattleAvatarList()) { - getMutableBattleAvatarList().addAll(other.battleAvatarList); - } - if (other.hasBuffList()) { - getMutableBuffList().addAll(other.buffList); - } if (other.hasMonsterWaveList()) { getMutableMonsterWaveList().addAll(other.monsterWaveList); } - if (other.hasEventBattleInfoList()) { - getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); + if (other.hasBuffList()) { + getMutableBuffList().addAll(other.buffList); + } + if (other.hasBattleAvatarList()) { + getMutableBattleAvatarList().addAll(other.battleAvatarList); } if (other.hasBattleTargetInfo()) { getMutableBattleTargetInfo().addAll(other.battleTargetInfo); } + if (other.hasEventBattleInfoList()) { + getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); + } return this; } @@ -677,16 +677,16 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; - logicRandomSeed = 0; roundsLimit = 0; stageId = 0; + worldLevel = 0; + logicRandomSeed = 0; battleId = 0; - battleAvatarList.clear(); - buffList.clear(); monsterWaveList.clear(); - eventBattleInfoList.clear(); + buffList.clear(); + battleAvatarList.clear(); battleTargetInfo.clear(); + eventBattleInfoList.clear(); return this; } @@ -697,11 +697,11 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - battleAvatarList.clearQuick(); - buffList.clearQuick(); monsterWaveList.clearQuick(); - eventBattleInfoList.clearQuick(); + buffList.clearQuick(); + battleAvatarList.clearQuick(); battleTargetInfo.clearQuick(); + eventBattleInfoList.clearQuick(); return this; } @@ -715,68 +715,68 @@ public final class SceneBattleInfoOuterClass { } SceneBattleInfo other = (SceneBattleInfo) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) && (!hasStageId() || stageId == other.stageId) + && (!hasWorldLevel() || worldLevel == other.worldLevel) + && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) && (!hasBattleId() || battleId == other.battleId) - && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) - && (!hasBuffList() || buffList.equals(other.buffList)) && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) - && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)) - && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)); + && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)) + && (!hasBattleTargetInfo() || battleTargetInfo.equals(other.battleTargetInfo)) + && (!hasEventBattleInfoList() || eventBattleInfoList.equals(other.eventBattleInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(logicRandomSeed); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(roundsLimit); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); output.writeUInt32NoTag(stageId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(worldLevel); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(logicRandomSeed); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(battleAvatarList.get(i)); + for (int i = 0; i < monsterWaveList.length(); i++) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(monsterWaveList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 26); output.writeMessageNoTag(buffList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(monsterWaveList.get(i)); + for (int i = 0; i < battleAvatarList.length(); i++) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(battleAvatarList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < eventBattleInfoList.length(); i++) { - output.writeRawLittleEndian16((short) 6634); - output.writeMessageNoTag(eventBattleInfoList.get(i)); + for (int i = 0; i < battleTargetInfo.length(); i++) { + output.writeRawLittleEndian16((short) 2474); + output.writeMessageNoTag(battleTargetInfo.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < battleTargetInfo.length(); i++) { - output.writeRawLittleEndian16((short) 9402); - output.writeMessageNoTag(battleTargetInfo.get(i)); + for (int i = 0; i < eventBattleInfoList.length(); i++) { + output.writeRawLittleEndian16((short) 31466); + output.writeMessageNoTag(eventBattleInfoList.get(i)); } } } @@ -785,34 +785,34 @@ public final class SceneBattleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); + size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } if ((bitField0_ & 0x00000100) != 0) { - size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); + size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); } if ((bitField0_ & 0x00000200) != 0) { - size += (2 * battleTargetInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleTargetInfo); + size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); } return size; } @@ -824,86 +824,86 @@ public final class SceneBattleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // logicRandomSeed - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 16: { // roundsLimit roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 32) { break; } } - case 88: { + case 32: { // stageId stageId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { + case 48: { + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // logicRandomSeed + logicRandomSeed = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // battleId battleId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { - // battleAvatarList - tag = input.readRepeatedMessage(battleAvatarList, tag); + case 10: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); bitField0_ |= 0x00000020; - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { + case 26: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000040; - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { - // monsterWaveList - tag = input.readRepeatedMessage(monsterWaveList, tag); + case 122: { + // battleAvatarList + tag = input.readRepeatedMessage(battleAvatarList, tag); bitField0_ |= 0x00000080; - if (tag != 3306) { + if (tag != 1194) { break; } } - case 3306: { - // eventBattleInfoList - tag = input.readRepeatedMessage(eventBattleInfoList, tag); - bitField0_ |= 0x00000100; - if (tag != 4666) { - break; - } - } - case 4666: { + case 1194: { // battleTargetInfo tag = input.readRepeatedMessage(battleTargetInfo, tag); + bitField0_ |= 0x00000100; + if (tag != 15722) { + break; + } + } + case 15722: { + // eventBattleInfoList + tag = input.readRepeatedMessage(eventBattleInfoList, tag); bitField0_ |= 0x00000200; if (tag != 0) { break; @@ -927,34 +927,34 @@ public final class SceneBattleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.roundsLimit, roundsLimit); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.stageId, stageId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.worldLevel, worldLevel); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); + } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.buffList, buffList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); + output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); + output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.battleTargetInfo, battleTargetInfo); + output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); } output.endObject(); } @@ -966,36 +966,12 @@ public final class SceneBattleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { - if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 141999058: - case -1894951668: { - if (input.isAtField(FieldNames.logicRandomSeed)) { - if (!input.trySkipNullValue()) { - logicRandomSeed = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 306477590: case 1457479585: { if (input.isAtField(FieldNames.roundsLimit)) { if (!input.trySkipNullValue()) { roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1007,6 +983,30 @@ public final class SceneBattleInfoOuterClass { if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { stageId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { + if (!input.trySkipNullValue()) { + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 141999058: + case -1894951668: { + if (input.isAtField(FieldNames.logicRandomSeed)) { + if (!input.trySkipNullValue()) { + logicRandomSeed = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1026,11 +1026,11 @@ public final class SceneBattleInfoOuterClass { } break; } - case 768292975: - case 328463037: { - if (input.isAtField(FieldNames.battleAvatarList)) { + case 697746737: + case -1492024321: { + if (input.isAtField(FieldNames.monsterWaveList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(battleAvatarList); + input.readRepeatedMessage(monsterWaveList); bitField0_ |= 0x00000020; } } else { @@ -1050,11 +1050,11 @@ public final class SceneBattleInfoOuterClass { } break; } - case 697746737: - case -1492024321: { - if (input.isAtField(FieldNames.monsterWaveList)) { + case 768292975: + case 328463037: { + if (input.isAtField(FieldNames.battleAvatarList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterWaveList); + input.readRepeatedMessage(battleAvatarList); bitField0_ |= 0x00000080; } } else { @@ -1062,23 +1062,23 @@ public final class SceneBattleInfoOuterClass { } break; } - case 1643489406: - case 1679998413: { - if (input.isAtField(FieldNames.eventBattleInfoList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(eventBattleInfoList); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } case 1657979063: case 2141477269: { if (input.isAtField(FieldNames.battleTargetInfo)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(battleTargetInfo); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1643489406: + case 1679998413: { + if (input.isAtField(FieldNames.eventBattleInfoList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(eventBattleInfoList); bitField0_ |= 0x00000200; } } else { @@ -1486,25 +1486,25 @@ public final class SceneBattleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - - static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); - static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + + static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); + static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); - - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); - static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); - static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list"); + static final FieldName buffList = FieldName.forField("buffList", "buff_list"); + + static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); static final FieldName battleTargetInfo = FieldName.forField("battleTargetInfo", "battle_target_info"); + + static final FieldName eventBattleInfoList = FieldName.forField("eventBattleInfoList", "event_battle_info_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java index 8af8479..cf685da 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java @@ -19,20 +19,20 @@ public final class SceneCastSkillCostMpCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 skill_index = 1; - */ - private int skillIndex; - - /** - * optional uint32 caster_id = 4; + * optional uint32 caster_id = 2; */ private int casterId; /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; + /** + * optional uint32 skill_index = 15; + */ + private int skillIndex; + private SceneCastSkillCostMpCsReq() { } @@ -44,62 +44,25 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 skill_index = 1; - * @return whether the skillIndex field is set + * optional uint32 caster_id = 2; + * @return whether the casterId field is set */ - public boolean hasSkillIndex() { + public boolean hasCasterId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 skill_index = 1; - * @return this - */ - public SceneCastSkillCostMpCsReq clearSkillIndex() { - bitField0_ &= ~0x00000001; - skillIndex = 0; - return this; - } - - /** - * optional uint32 skill_index = 1; - * @return the skillIndex - */ - public int getSkillIndex() { - return skillIndex; - } - - /** - * optional uint32 skill_index = 1; - * @param value the skillIndex to set - * @return this - */ - public SceneCastSkillCostMpCsReq setSkillIndex(final int value) { - bitField0_ |= 0x00000001; - skillIndex = value; - return this; - } - - /** - * optional uint32 caster_id = 4; - * @return whether the casterId field is set - */ - public boolean hasCasterId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 caster_id = 4; + * optional uint32 caster_id = 2; * @return this */ public SceneCastSkillCostMpCsReq clearCasterId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; casterId = 0; return this; } /** - * optional uint32 caster_id = 4; + * optional uint32 caster_id = 2; * @return the casterId */ public int getCasterId() { @@ -107,36 +70,36 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 caster_id = 4; + * optional uint32 caster_id = 2; * @param value the casterId to set * @return this */ public SceneCastSkillCostMpCsReq setCasterId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; casterId = value; return this; } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillCostMpCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -144,24 +107,61 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillCostMpCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; attackedGroupId = value; return this; } + /** + * optional uint32 skill_index = 15; + * @return whether the skillIndex field is set + */ + public boolean hasSkillIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 skill_index = 15; + * @return this + */ + public SceneCastSkillCostMpCsReq clearSkillIndex() { + bitField0_ &= ~0x00000004; + skillIndex = 0; + return this; + } + + /** + * optional uint32 skill_index = 15; + * @return the skillIndex + */ + public int getSkillIndex() { + return skillIndex; + } + + /** + * optional uint32 skill_index = 15; + * @param value the skillIndex to set + * @return this + */ + public SceneCastSkillCostMpCsReq setSkillIndex(final int value) { + bitField0_ |= 0x00000004; + skillIndex = value; + return this; + } + @Override public SceneCastSkillCostMpCsReq copyFrom(final SceneCastSkillCostMpCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - skillIndex = other.skillIndex; casterId = other.casterId; attackedGroupId = other.attackedGroupId; + skillIndex = other.skillIndex; } return this; } @@ -172,15 +172,15 @@ public final class SceneCastSkillCostMpCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSkillIndex()) { - setSkillIndex(other.skillIndex); - } if (other.hasCasterId()) { setCasterId(other.casterId); } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } + if (other.hasSkillIndex()) { + setSkillIndex(other.skillIndex); + } return this; } @@ -191,9 +191,9 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - skillIndex = 0; casterId = 0; attackedGroupId = 0; + skillIndex = 0; return this; } @@ -217,39 +217,39 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } SceneCastSkillCostMpCsReq other = (SceneCastSkillCostMpCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSkillIndex() || skillIndex == other.skillIndex) && (!hasCasterId() || casterId == other.casterId) - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId); + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasSkillIndex() || skillIndex == other.skillIndex); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(casterId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(skillIndex); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); + } return size; } @@ -260,27 +260,27 @@ public final class SceneCastSkillCostMpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // skillIndex - skillIndex = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 16: { // casterId casterId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // attackedGroupId attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // skillIndex + skillIndex = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class SceneCastSkillCostMpCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.skillIndex, skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.casterId, casterId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.skillIndex, skillIndex); + } output.endObject(); } @@ -323,24 +323,12 @@ public final class SceneCastSkillCostMpCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1587034369: - case -1716021916: { - if (input.isAtField(FieldNames.skillIndex)) { - if (!input.trySkipNullValue()) { - skillIndex = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 35676775: case 1106001422: { if (input.isAtField(FieldNames.casterId)) { if (!input.trySkipNullValue()) { casterId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -352,6 +340,18 @@ public final class SceneCastSkillCostMpCsReqOuterClass { if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1587034369: + case -1716021916: { + if (input.isAtField(FieldNames.skillIndex)) { + if (!input.trySkipNullValue()) { + skillIndex = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -412,11 +412,11 @@ public final class SceneCastSkillCostMpCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); - static final FieldName casterId = FieldName.forField("casterId", "caster_id"); static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + + static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java index d49afee..227e19c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SceneCastSkillCostMpScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 attacked_group_id = 6; - */ - private int attackedGroupId; - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; */ private int retcode; + /** + * optional uint32 attacked_group_id = 2; + */ + private int attackedGroupId; + private SceneCastSkillCostMpScRsp() { } @@ -39,62 +39,25 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 attacked_group_id = 6; - * @return whether the attackedGroupId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasAttackedGroupId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 6; - * @return this - */ - public SceneCastSkillCostMpScRsp clearAttackedGroupId() { - bitField0_ &= ~0x00000001; - attackedGroupId = 0; - return this; - } - - /** - * optional uint32 attacked_group_id = 6; - * @return the attackedGroupId - */ - public int getAttackedGroupId() { - return attackedGroupId; - } - - /** - * optional uint32 attacked_group_id = 6; - * @param value the attackedGroupId to set - * @return this - */ - public SceneCastSkillCostMpScRsp setAttackedGroupId(final int value) { - bitField0_ |= 0x00000001; - attackedGroupId = value; - return this; - } - - /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public SceneCastSkillCostMpScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class SceneCastSkillCostMpScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public SceneCastSkillCostMpScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 attacked_group_id = 2; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 attacked_group_id = 2; + * @return this + */ + public SceneCastSkillCostMpScRsp clearAttackedGroupId() { + bitField0_ &= ~0x00000002; + attackedGroupId = 0; + return this; + } + + /** + * optional uint32 attacked_group_id = 2; + * @return the attackedGroupId + */ + public int getAttackedGroupId() { + return attackedGroupId; + } + + /** + * optional uint32 attacked_group_id = 2; + * @param value the attackedGroupId to set + * @return this + */ + public SceneCastSkillCostMpScRsp setAttackedGroupId(final int value) { + bitField0_ |= 0x00000002; + attackedGroupId = value; + return this; + } + @Override public SceneCastSkillCostMpScRsp copyFrom(final SceneCastSkillCostMpScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; retcode = other.retcode; + attackedGroupId = other.attackedGroupId; } return this; } @@ -129,12 +129,12 @@ public final class SceneCastSkillCostMpScRspOuterClass { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } return this; } @@ -145,8 +145,8 @@ public final class SceneCastSkillCostMpScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; retcode = 0; + attackedGroupId = 0; return this; } @@ -170,19 +170,19 @@ public final class SceneCastSkillCostMpScRspOuterClass { } SceneCastSkillCostMpScRsp other = (SceneCastSkillCostMpScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(attackedGroupId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(attackedGroupId); } } @@ -190,10 +190,10 @@ public final class SceneCastSkillCostMpScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } return size; } @@ -205,18 +205,18 @@ public final class SceneCastSkillCostMpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // attackedGroupId - attackedGroupId = input.readUInt32(); + case 8: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { - // retcode - retcode = input.readUInt32(); + case 16: { + // attackedGroupId + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SceneCastSkillCostMpScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class SceneCastSkillCostMpScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class SceneCastSkillCostMpScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class SceneCastSkillCostMpScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index ef9304a..d02d8b7 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java @@ -21,12 +21,7 @@ public final class SceneCastSkillCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 skill_index = 9; - */ - private int skillIndex; - - /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; @@ -36,7 +31,12 @@ public final class SceneCastSkillCsReqOuterClass { private int casterId; /** - * optional .MotionInfo target_motion = 6; + * optional uint32 skill_index = 15; + */ + private int skillIndex; + + /** + * optional .MotionInfo target_motion = 12; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -46,7 +46,7 @@ public final class SceneCastSkillCsReqOuterClass { private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_list = 4; */ private final RepeatedMessage assistMonsterWaveList = RepeatedMessage.newEmptyInstance(AssistMonsterWaveOuterClass.AssistMonsterWave.getFactory()); @@ -61,62 +61,25 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 9; - * @return whether the skillIndex field is set + * optional uint32 attacked_group_id = 10; + * @return whether the attackedGroupId field is set */ - public boolean hasSkillIndex() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 skill_index = 9; - * @return this - */ - public SceneCastSkillCsReq clearSkillIndex() { - bitField0_ &= ~0x00000001; - skillIndex = 0; - return this; - } - - /** - * optional uint32 skill_index = 9; - * @return the skillIndex - */ - public int getSkillIndex() { - return skillIndex; - } - - /** - * optional uint32 skill_index = 9; - * @param value the skillIndex to set - * @return this - */ - public SceneCastSkillCsReq setSkillIndex(final int value) { - bitField0_ |= 0x00000001; - skillIndex = value; - return this; - } - - /** - * optional uint32 attacked_group_id = 12; - * @return whether the attackedGroupId field is set - */ - public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -124,12 +87,12 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 12; + * optional uint32 attacked_group_id = 10; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; attackedGroupId = value; return this; } @@ -139,7 +102,7 @@ public final class SceneCastSkillCsReqOuterClass { * @return whether the casterId field is set */ public boolean hasCasterId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -147,7 +110,7 @@ public final class SceneCastSkillCsReqOuterClass { * @return this */ public SceneCastSkillCsReq clearCasterId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; casterId = 0; return this; } @@ -166,13 +129,50 @@ public final class SceneCastSkillCsReqOuterClass { * @return this */ public SceneCastSkillCsReq setCasterId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; casterId = value; return this; } /** - * optional .MotionInfo target_motion = 6; + * optional uint32 skill_index = 15; + * @return whether the skillIndex field is set + */ + public boolean hasSkillIndex() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 skill_index = 15; + * @return this + */ + public SceneCastSkillCsReq clearSkillIndex() { + bitField0_ &= ~0x00000004; + skillIndex = 0; + return this; + } + + /** + * optional uint32 skill_index = 15; + * @return the skillIndex + */ + public int getSkillIndex() { + return skillIndex; + } + + /** + * optional uint32 skill_index = 15; + * @param value the skillIndex to set + * @return this + */ + public SceneCastSkillCsReq setSkillIndex(final int value) { + bitField0_ |= 0x00000004; + skillIndex = value; + return this; + } + + /** + * optional .MotionInfo target_motion = 12; * @return whether the targetMotion field is set */ public boolean hasTargetMotion() { @@ -180,7 +180,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 6; + * optional .MotionInfo target_motion = 12; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { @@ -190,7 +190,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 6; + * optional .MotionInfo target_motion = 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. @@ -204,7 +204,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 6; + * optional .MotionInfo target_motion = 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 @@ -218,7 +218,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 6; + * optional .MotionInfo target_motion = 12; * @param value the targetMotion to set * @return this */ @@ -297,7 +297,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_list = 4; * @return whether the assistMonsterWaveList field is set */ public boolean hasAssistMonsterWaveList() { @@ -305,7 +305,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_list = 4; * @return this */ public SceneCastSkillCsReq clearAssistMonsterWaveList() { @@ -315,7 +315,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_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. @@ -330,7 +330,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_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 @@ -345,7 +345,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_list = 4; * @param value the assistMonsterWaveList to add * @return this */ @@ -357,7 +357,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 1; + * repeated .AssistMonsterWave assist_monster_wave_list = 4; * @param values the assistMonsterWaveList to add * @return this */ @@ -373,9 +373,9 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - skillIndex = other.skillIndex; attackedGroupId = other.attackedGroupId; casterId = other.casterId; + skillIndex = other.skillIndex; targetMotion.copyFrom(other.targetMotion); hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); assistMonsterWaveList.copyFrom(other.assistMonsterWaveList); @@ -389,15 +389,15 @@ public final class SceneCastSkillCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSkillIndex()) { - setSkillIndex(other.skillIndex); - } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } if (other.hasCasterId()) { setCasterId(other.casterId); } + if (other.hasSkillIndex()) { + setSkillIndex(other.skillIndex); + } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); } @@ -417,9 +417,9 @@ public final class SceneCastSkillCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - skillIndex = 0; attackedGroupId = 0; casterId = 0; + skillIndex = 0; targetMotion.clear(); hitTargetEntityIdList.clear(); assistMonsterWaveList.clear(); @@ -449,9 +449,9 @@ public final class SceneCastSkillCsReqOuterClass { } SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSkillIndex() || skillIndex == other.skillIndex) && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasCasterId() || casterId == other.casterId) + && (!hasSkillIndex() || skillIndex == other.skillIndex) && (!hasTargetMotion() || targetMotion.equals(other.targetMotion)) && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList)) && (!hasAssistMonsterWaveList() || assistMonsterWaveList.equals(other.assistMonsterWaveList)); @@ -460,19 +460,19 @@ public final class SceneCastSkillCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attackedGroupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(casterId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(skillIndex); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { @@ -483,7 +483,7 @@ public final class SceneCastSkillCsReqOuterClass { } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < assistMonsterWaveList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 34); output.writeMessageNoTag(assistMonsterWaveList.get(i)); } } @@ -493,14 +493,14 @@ public final class SceneCastSkillCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); } @@ -520,19 +520,10 @@ public final class SceneCastSkillCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // skillIndex - skillIndex = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 80: { // attackedGroupId attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { break; @@ -541,13 +532,22 @@ public final class SceneCastSkillCsReqOuterClass { case 104: { // casterId casterId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 120) { break; } } - case 50: { + case 120: { + // skillIndex + skillIndex = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { // targetMotion input.readMessage(targetMotion); bitField0_ |= 0x00000008; @@ -561,11 +561,11 @@ public final class SceneCastSkillCsReqOuterClass { input.readPackedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 10) { + if (tag != 34) { break; } } - case 10: { + case 34: { // assistMonsterWaveList tag = input.readRepeatedMessage(assistMonsterWaveList, tag); bitField0_ |= 0x00000020; @@ -597,14 +597,14 @@ public final class SceneCastSkillCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.skillIndex, skillIndex); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.casterId, casterId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.skillIndex, skillIndex); + } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.targetMotion, targetMotion); } @@ -624,24 +624,12 @@ public final class SceneCastSkillCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1587034369: - case -1716021916: { - if (input.isAtField(FieldNames.skillIndex)) { - if (!input.trySkipNullValue()) { - skillIndex = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1725961965: case -715836621: { if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -653,6 +641,18 @@ public final class SceneCastSkillCsReqOuterClass { if (input.isAtField(FieldNames.casterId)) { if (!input.trySkipNullValue()) { casterId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1587034369: + case -1716021916: { + if (input.isAtField(FieldNames.skillIndex)) { + if (!input.trySkipNullValue()) { + skillIndex = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -749,12 +749,12 @@ public final class SceneCastSkillCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); static final FieldName casterId = FieldName.forField("casterId", "caster_id"); + static final FieldName skillIndex = FieldName.forField("skillIndex", "skill_index"); + static final FieldName targetMotion = FieldName.forField("targetMotion", "target_motion"); static final FieldName hitTargetEntityIdList = FieldName.forField("hitTargetEntityIdList", "hit_target_entity_id_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java index 23be5d4..0d7382c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillMpUpdateScNotifyOuterClass.java @@ -19,12 +19,12 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 mp = 8; + * optional uint32 mp = 4; */ private int mp; /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; */ private int attackedGroupId; @@ -39,7 +39,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 8; + * optional uint32 mp = 4; * @return whether the mp field is set */ public boolean hasMp() { @@ -47,7 +47,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 8; + * optional uint32 mp = 4; * @return this */ public SceneCastSkillMpUpdateScNotify clearMp() { @@ -57,7 +57,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 8; + * optional uint32 mp = 4; * @return the mp */ public int getMp() { @@ -65,7 +65,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 8; + * optional uint32 mp = 4; * @param value the mp to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -84,7 +84,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { @@ -94,7 +94,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -102,7 +102,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 10; + * optional uint32 attacked_group_id = 5; * @param value the attackedGroupId to set * @return this */ @@ -177,11 +177,11 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(mp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(attackedGroupId); } } @@ -205,16 +205,16 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // mp mp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { + case 40: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java index 019cbbe..33f1538 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SceneCastSkillScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 attacked_group_id = 12; - */ - private int attackedGroupId; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 10; + * optional uint32 attacked_group_id = 6; + */ + private int attackedGroupId; + + /** + * optional .SceneBattleInfo battle_info = 9; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 12; - * @return whether the attackedGroupId field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasAttackedGroupId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 attacked_group_id = 12; - * @return this - */ - public SceneCastSkillScRsp clearAttackedGroupId() { - bitField0_ &= ~0x00000001; - attackedGroupId = 0; - return this; - } - - /** - * optional uint32 attacked_group_id = 12; - * @return the attackedGroupId - */ - public int getAttackedGroupId() { - return attackedGroupId; - } - - /** - * optional uint32 attacked_group_id = 12; - * @param value the attackedGroupId to set - * @return this - */ - public SceneCastSkillScRsp setAttackedGroupId(final int value) { - bitField0_ |= 0x00000001; - attackedGroupId = value; - return this; - } - - /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return this */ public SceneCastSkillScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public SceneCastSkillScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .SceneBattleInfo battle_info = 10; + * optional uint32 attacked_group_id = 6; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 attacked_group_id = 6; + * @return this + */ + public SceneCastSkillScRsp clearAttackedGroupId() { + bitField0_ &= ~0x00000002; + attackedGroupId = 0; + return this; + } + + /** + * optional uint32 attacked_group_id = 6; + * @return the attackedGroupId + */ + public int getAttackedGroupId() { + return attackedGroupId; + } + + /** + * optional uint32 attacked_group_id = 6; + * @param value the attackedGroupId to set + * @return this + */ + public SceneCastSkillScRsp setAttackedGroupId(final int value) { + bitField0_ |= 0x00000002; + attackedGroupId = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 9; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 9; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 9; * * 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. @@ -150,7 +150,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 9; * @param value the battleInfo to set * @return this */ @@ -180,8 +180,8 @@ public final class SceneCastSkillScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - attackedGroupId = other.attackedGroupId; retcode = other.retcode; + attackedGroupId = other.attackedGroupId; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public final class SceneCastSkillScRspOuterClass { return this; } cachedSize = -1; - if (other.hasAttackedGroupId()) { - setAttackedGroupId(other.attackedGroupId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public final class SceneCastSkillScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - attackedGroupId = 0; retcode = 0; + attackedGroupId = 0; battleInfo.clear(); return this; } @@ -239,23 +239,23 @@ public final class SceneCastSkillScRspOuterClass { } SceneCastSkillScRsp other = (SceneCastSkillScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasRetcode() || retcode == other.retcode) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(attackedGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(attackedGroupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(battleInfo); } } @@ -264,10 +264,10 @@ public final class SceneCastSkillScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -282,25 +282,25 @@ public final class SceneCastSkillScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // attackedGroupId - attackedGroupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 16: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 48) { break; } } - case 82: { + case 48: { + // attackedGroupId + attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class SceneCastSkillScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,11 +345,10 @@ public final class SceneCastSkillScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class SceneCastSkillScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneCastSkillScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName attackedGroupId = FieldName.forField("attackedGroupId", "attacked_group_id"); + static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java index 69d412d..93a0e3c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEnterStageCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SceneEnterStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 5; + * optional uint32 stage_id = 4; */ private int stageId; @@ -34,7 +34,7 @@ public final class SceneEnterStageCsReqOuterClass { } /** - * optional uint32 stage_id = 5; + * optional uint32 stage_id = 4; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -42,7 +42,7 @@ public final class SceneEnterStageCsReqOuterClass { } /** - * optional uint32 stage_id = 5; + * optional uint32 stage_id = 4; * @return this */ public SceneEnterStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public final class SceneEnterStageCsReqOuterClass { } /** - * optional uint32 stage_id = 5; + * optional uint32 stage_id = 4; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public final class SceneEnterStageCsReqOuterClass { } /** - * optional uint32 stage_id = 5; + * optional uint32 stage_id = 4; * @param value the stageId to set * @return this */ @@ -129,7 +129,7 @@ public final class SceneEnterStageCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public final class SceneEnterStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 32: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java index 3fca31b..5de2651 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SceneEnterStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_info = 15; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return this */ public SceneEnterStageScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_info = 15; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -84,7 +84,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_info = 15; * @return this */ public SceneEnterStageScRsp clearBattleInfo() { @@ -94,7 +94,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_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. @@ -108,7 +108,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_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 @@ -122,7 +122,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 2; + * optional .SceneBattleInfo battle_info = 15; * @param value the battleInfo to set * @return this */ @@ -199,11 +199,11 @@ public final class SceneEnterStageScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeMessageNoTag(battleInfo); } } @@ -227,16 +227,16 @@ public final class SceneEnterStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java index ca52c1c..a9ac36f 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityGroupInfoOuterClass.java @@ -20,17 +20,17 @@ public final class SceneEntityGroupInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 2; */ private int groupId; /** - * optional uint32 state = 15; + * optional uint32 state = 6; */ private int state; /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 2; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -53,7 +53,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 2; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -63,7 +63,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 2; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 2; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 15; + * optional uint32 state = 6; * @return whether the state field is set */ public boolean hasState() { @@ -90,7 +90,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 15; + * optional uint32 state = 6; * @return this */ public SceneEntityGroupInfo clearState() { @@ -100,7 +100,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 15; + * optional uint32 state = 6; * @return the state */ public int getState() { @@ -108,7 +108,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 15; + * optional uint32 state = 6; * @param value the state to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_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. @@ -151,7 +151,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_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 @@ -165,7 +165,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 2; + * repeated .SceneEntityInfo entity_list = 12; * @param values the entityList to add * @return this */ @@ -260,16 +260,16 @@ public final class SceneEntityGroupInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 16: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { + case 48: { // state state = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 98) { break; } } - case 18: { + case 98: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java index 8254818..81fc7d6 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -19,32 +19,32 @@ public final class SceneEntityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 2; - */ - private int groupId; - - /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 4; */ private int entityId; /** - * optional uint32 inst_id = 15; + * optional uint32 inst_id = 8; */ private int instId; /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional uint32 group_id = 14; + */ + private int groupId; + + /** + * optional .SceneNpcMonsterInfo npc_monster = 2; */ private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); /** - * optional .MotionInfo motion = 7; + * optional .SceneNpcInfo npc = 5; */ - private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 6; */ private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); @@ -54,12 +54,12 @@ public final class SceneEntityInfoOuterClass { private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); /** - * optional .SceneNpcInfo npc = 12; + * optional .MotionInfo motion = 13; */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 15; */ private final SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo summonUnit = SceneSummonUnitInfoOuterClass.SceneSummonUnitInfo.newInstance(); @@ -74,62 +74,25 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 group_id = 2; - * @return whether the groupId field is set + * optional uint32 entity_id = 4; + * @return whether the entityId field is set */ - public boolean hasGroupId() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 2; - * @return this - */ - public SceneEntityInfo clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 2; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 2; - * @param value the groupId to set - * @return this - */ - public SceneEntityInfo setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 entity_id = 6; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 4; * @return this */ public SceneEntityInfo clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 4; * @return the entityId */ public int getEntityId() { @@ -137,36 +100,36 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 entity_id = 6; + * optional uint32 entity_id = 4; * @param value the entityId to set * @return this */ public SceneEntityInfo setEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entityId = value; return this; } /** - * optional uint32 inst_id = 15; + * optional uint32 inst_id = 8; * @return whether the instId field is set */ public boolean hasInstId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 inst_id = 15; + * optional uint32 inst_id = 8; * @return this */ public SceneEntityInfo clearInstId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; instId = 0; return this; } /** - * optional uint32 inst_id = 15; + * optional uint32 inst_id = 8; * @return the instId */ public int getInstId() { @@ -174,18 +137,55 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 inst_id = 15; + * optional uint32 inst_id = 8; * @param value the instId to set * @return this */ public SceneEntityInfo setInstId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; instId = value; return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional uint32 group_id = 14; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 group_id = 14; + * @return this + */ + public SceneEntityInfo clearGroupId() { + bitField0_ &= ~0x00000004; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 14; + * @param value the groupId to set + * @return this + */ + public SceneEntityInfo setGroupId(final int value) { + bitField0_ |= 0x00000004; + groupId = value; + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 2; * @return whether the npcMonster field is set */ public boolean hasNpcMonster() { @@ -193,7 +193,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional .SceneNpcMonsterInfo npc_monster = 2; * @return this */ public SceneEntityInfo clearNpcMonster() { @@ -203,7 +203,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional .SceneNpcMonsterInfo npc_monster = 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. @@ -217,7 +217,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional .SceneNpcMonsterInfo npc_monster = 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 @@ -231,7 +231,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 5; + * optional .SceneNpcMonsterInfo npc_monster = 2; * @param value the npcMonster to set * @return this */ @@ -243,39 +243,39 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .MotionInfo motion = 7; - * @return whether the motion field is set + * optional .SceneNpcInfo npc = 5; + * @return whether the npc field is set */ - public boolean hasMotion() { + public boolean hasNpc() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .MotionInfo motion = 7; + * optional .SceneNpcInfo npc = 5; * @return this */ - public SceneEntityInfo clearMotion() { + public SceneEntityInfo clearNpc() { bitField0_ &= ~0x00000010; - motion.clear(); + npc.clear(); return this; } /** - * optional .MotionInfo motion = 7; + * optional .SceneNpcInfo npc = 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 #getMutableMotion()} if you want to modify it. + * Use {@link #getMutableNpc()} if you want to modify it. * * @return internal storage object for reading */ - public MotionInfoOuterClass.MotionInfo getMotion() { - return motion; + public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { + return npc; } /** - * optional .MotionInfo motion = 7; + * optional .SceneNpcInfo npc = 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 @@ -283,24 +283,24 @@ public final class SceneEntityInfoOuterClass { * * @return internal storage object for modifications */ - public MotionInfoOuterClass.MotionInfo getMutableMotion() { + public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { bitField0_ |= 0x00000010; - return motion; + return npc; } /** - * optional .MotionInfo motion = 7; - * @param value the motion to set + * optional .SceneNpcInfo npc = 5; + * @param value the npc to set * @return this */ - public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { + public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { bitField0_ |= 0x00000010; - motion.copyFrom(value); + npc.copyFrom(value); return this; } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 6; * @return whether the actor field is set */ public boolean hasActor() { @@ -308,7 +308,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 6; * @return this */ public SceneEntityInfo clearActor() { @@ -318,7 +318,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 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. @@ -332,7 +332,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 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 @@ -346,7 +346,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneActorInfo actor = 9; + * optional .SceneActorInfo actor = 6; * @param value the actor to set * @return this */ @@ -414,39 +414,39 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcInfo npc = 12; - * @return whether the npc field is set + * optional .MotionInfo motion = 13; + * @return whether the motion field is set */ - public boolean hasNpc() { + public boolean hasMotion() { return (bitField0_ & 0x00000080) != 0; } /** - * optional .SceneNpcInfo npc = 12; + * optional .MotionInfo motion = 13; * @return this */ - public SceneEntityInfo clearNpc() { + public SceneEntityInfo clearMotion() { bitField0_ &= ~0x00000080; - npc.clear(); + motion.clear(); return this; } /** - * optional .SceneNpcInfo npc = 12; + * optional .MotionInfo motion = 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 #getMutableNpc()} if you want to modify it. + * Use {@link #getMutableMotion()} if you want to modify it. * * @return internal storage object for reading */ - public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { - return npc; + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; } /** - * optional .SceneNpcInfo npc = 12; + * optional .MotionInfo motion = 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 @@ -454,24 +454,24 @@ public final class SceneEntityInfoOuterClass { * * @return internal storage object for modifications */ - public SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { + public MotionInfoOuterClass.MotionInfo getMutableMotion() { bitField0_ |= 0x00000080; - return npc; + return motion; } /** - * optional .SceneNpcInfo npc = 12; - * @param value the npc to set + * optional .MotionInfo motion = 13; + * @param value the motion to set * @return this */ - public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { + public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { bitField0_ |= 0x00000080; - npc.copyFrom(value); + motion.copyFrom(value); return this; } /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 15; * @return whether the summonUnit field is set */ public boolean hasSummonUnit() { @@ -479,7 +479,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 15; * @return this */ public SceneEntityInfo clearSummonUnit() { @@ -489,7 +489,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 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. @@ -503,7 +503,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 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 @@ -517,7 +517,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneSummonUnitInfo summon_unit = 14; + * optional .SceneSummonUnitInfo summon_unit = 15; * @param value the summonUnit to set * @return this */ @@ -533,14 +533,14 @@ public final class SceneEntityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; entityId = other.entityId; instId = other.instId; + groupId = other.groupId; npcMonster.copyFrom(other.npcMonster); - motion.copyFrom(other.motion); + npc.copyFrom(other.npc); actor.copyFrom(other.actor); prop.copyFrom(other.prop); - npc.copyFrom(other.npc); + motion.copyFrom(other.motion); summonUnit.copyFrom(other.summonUnit); } return this; @@ -552,20 +552,20 @@ public final class SceneEntityInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasEntityId()) { setEntityId(other.entityId); } if (other.hasInstId()) { setInstId(other.instId); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasNpcMonster()) { getMutableNpcMonster().mergeFrom(other.npcMonster); } - if (other.hasMotion()) { - getMutableMotion().mergeFrom(other.motion); + if (other.hasNpc()) { + getMutableNpc().mergeFrom(other.npc); } if (other.hasActor()) { getMutableActor().mergeFrom(other.actor); @@ -573,8 +573,8 @@ public final class SceneEntityInfoOuterClass { if (other.hasProp()) { getMutableProp().mergeFrom(other.prop); } - if (other.hasNpc()) { - getMutableNpc().mergeFrom(other.npc); + if (other.hasMotion()) { + getMutableMotion().mergeFrom(other.motion); } if (other.hasSummonUnit()) { getMutableSummonUnit().mergeFrom(other.summonUnit); @@ -589,14 +589,14 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; entityId = 0; instId = 0; + groupId = 0; npcMonster.clear(); - motion.clear(); + npc.clear(); actor.clear(); prop.clear(); - npc.clear(); + motion.clear(); summonUnit.clear(); return this; } @@ -609,10 +609,10 @@ public final class SceneEntityInfoOuterClass { cachedSize = -1; bitField0_ = 0; npcMonster.clearQuick(); - motion.clearQuick(); + npc.clearQuick(); actor.clearQuick(); prop.clearQuick(); - npc.clearQuick(); + motion.clearQuick(); summonUnit.clearQuick(); return this; } @@ -627,41 +627,41 @@ public final class SceneEntityInfoOuterClass { } SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasEntityId() || entityId == other.entityId) && (!hasInstId() || instId == other.instId) + && (!hasGroupId() || groupId == other.groupId) && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) - && (!hasMotion() || motion.equals(other.motion)) + && (!hasNpc() || npc.equals(other.npc)) && (!hasActor() || actor.equals(other.actor)) && (!hasProp() || prop.equals(other.prop)) - && (!hasNpc() || npc.equals(other.npc)) + && (!hasMotion() || motion.equals(other.motion)) && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entityId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(instId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(groupId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); output.writeMessageNoTag(npcMonster); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(motion); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(npc); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000040) != 0) { @@ -669,11 +669,11 @@ public final class SceneEntityInfoOuterClass { output.writeMessageNoTag(prop); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(npc); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeMessageNoTag(summonUnit); } } @@ -682,19 +682,19 @@ public final class SceneEntityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(motion); + size += 1 + ProtoSink.computeMessageSizeNoTag(npc); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(actor); @@ -703,7 +703,7 @@ public final class SceneEntityInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + size += 1 + ProtoSink.computeMessageSizeNoTag(motion); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(summonUnit); @@ -718,52 +718,52 @@ public final class SceneEntityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 32: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { + case 64: { // instId instId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // npcMonster + input.readMessage(npcMonster); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 42) { break; } } case 42: { - // npcMonster - input.readMessage(npcMonster); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { - // motion - input.readMessage(motion); + // npc + input.readMessage(npc); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // actor input.readMessage(actor); bitField0_ |= 0x00000020; @@ -777,20 +777,20 @@ public final class SceneEntityInfoOuterClass { input.readMessage(prop); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { - // npc - input.readMessage(npc); + case 106: { + // motion + input.readMessage(motion); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // summonUnit input.readMessage(summonUnit); bitField0_ |= 0x00000100; @@ -817,19 +817,19 @@ public final class SceneEntityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entityId, entityId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.instId, instId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.npcMonster, npcMonster); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.motion, motion); + output.writeMessage(FieldNames.npc, npc); } if ((bitField0_ & 0x00000020) != 0) { output.writeMessage(FieldNames.actor, actor); @@ -838,7 +838,7 @@ public final class SceneEntityInfoOuterClass { output.writeMessage(FieldNames.prop, prop); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.npc, npc); + output.writeMessage(FieldNames.motion, motion); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.summonUnit, summonUnit); @@ -853,24 +853,12 @@ public final class SceneEntityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { - if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -2102099874: case -740565257: { if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { entityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -882,6 +870,18 @@ public final class SceneEntityInfoOuterClass { if (input.isAtField(FieldNames.instId)) { if (!input.trySkipNullValue()) { instId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -901,10 +901,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case -1068318794: { - if (input.isAtField(FieldNames.motion)) { + case 109281: { + if (input.isAtField(FieldNames.npc)) { if (!input.trySkipNullValue()) { - input.readMessage(motion); + input.readMessage(npc); bitField0_ |= 0x00000010; } } else { @@ -934,10 +934,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case 109281: { - if (input.isAtField(FieldNames.npc)) { + case -1068318794: { + if (input.isAtField(FieldNames.motion)) { if (!input.trySkipNullValue()) { - input.readMessage(npc); + input.readMessage(motion); bitField0_ |= 0x00000080; } } else { @@ -1010,21 +1010,21 @@ public final class SceneEntityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); static final FieldName instId = FieldName.forField("instId", "inst_id"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); - static final FieldName motion = FieldName.forField("motion"); + static final FieldName npc = FieldName.forField("npc"); static final FieldName actor = FieldName.forField("actor"); static final FieldName prop = FieldName.forField("prop"); - static final FieldName npc = FieldName.forField("npc"); + static final FieldName motion = FieldName.forField("motion"); static final FieldName summonUnit = FieldName.forField("summonUnit", "summon_unit"); } diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java index 7170f91..4f3a69a 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class SceneEntityMoveCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 11; */ private int entryId; /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_list = 12; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -40,7 +40,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 11; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 11; * @return this */ public SceneEntityMoveCsReq clearEntryId() { @@ -58,7 +58,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 11; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 11; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_list = 12; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { @@ -85,7 +85,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_list = 12; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { @@ -95,7 +95,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_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. @@ -109,7 +109,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_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 @@ -123,7 +123,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_list = 12; * @param value the entityMotionList to add * @return this */ @@ -135,7 +135,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 4; + * repeated .EntityMotion entity_motion_list = 12; * @param values the entityMotionList to add * @return this */ @@ -212,12 +212,12 @@ public final class SceneEntityMoveCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 98); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -242,16 +242,16 @@ public final class SceneEntityMoveCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 88: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 98) { break; } } - case 34: { + case 98: { // entityMotionList tag = input.readRepeatedMessage(entityMotionList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java index 15829cb..76b9414 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java @@ -19,17 +19,17 @@ public final class SceneEntityMoveScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 3; - */ - private int entityId; - - /** - * optional uint32 client_pos_version = 5; + * optional uint32 client_pos_version = 10; */ private int clientPosVersion; /** - * optional uint32 entry_id = 14; + * optional uint32 entity_id = 11; + */ + private int entityId; + + /** + * optional uint32 entry_id = 13; */ private int entryId; @@ -49,62 +49,25 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 3; - * @return whether the entityId field is set + * optional uint32 client_pos_version = 10; + * @return whether the clientPosVersion field is set */ - public boolean hasEntityId() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 3; - * @return this - */ - public SceneEntityMoveScNotify clearEntityId() { - bitField0_ &= ~0x00000001; - entityId = 0; - return this; - } - - /** - * optional uint32 entity_id = 3; - * @return the entityId - */ - public int getEntityId() { - return entityId; - } - - /** - * optional uint32 entity_id = 3; - * @param value the entityId to set - * @return this - */ - public SceneEntityMoveScNotify setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = value; - return this; - } - - /** - * optional uint32 client_pos_version = 5; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 client_pos_version = 5; + * optional uint32 client_pos_version = 10; * @return this */ public SceneEntityMoveScNotify clearClientPosVersion() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; clientPosVersion = 0; return this; } /** - * optional uint32 client_pos_version = 5; + * optional uint32 client_pos_version = 10; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -112,18 +75,55 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 client_pos_version = 5; + * optional uint32 client_pos_version = 10; * @param value the clientPosVersion to set * @return this */ public SceneEntityMoveScNotify setClientPosVersion(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; clientPosVersion = value; return this; } /** - * optional uint32 entry_id = 14; + * optional uint32 entity_id = 11; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 entity_id = 11; + * @return this + */ + public SceneEntityMoveScNotify clearEntityId() { + bitField0_ &= ~0x00000002; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 11; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 11; + * @param value the entityId to set + * @return this + */ + public SceneEntityMoveScNotify setEntityId(final int value) { + bitField0_ |= 0x00000002; + entityId = value; + return this; + } + + /** + * optional uint32 entry_id = 13; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -131,7 +131,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 13; * @return this */ public SceneEntityMoveScNotify clearEntryId() { @@ -141,7 +141,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 13; * @return the entryId */ public int getEntryId() { @@ -149,7 +149,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entry_id = 14; + * optional uint32 entry_id = 13; * @param value the entryId to set * @return this */ @@ -221,8 +221,8 @@ public final class SceneEntityMoveScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entityId = other.entityId; clientPosVersion = other.clientPosVersion; + entityId = other.entityId; entryId = other.entryId; motion.copyFrom(other.motion); } @@ -235,12 +235,12 @@ public final class SceneEntityMoveScNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } if (other.hasEntryId()) { setEntryId(other.entryId); } @@ -257,8 +257,8 @@ public final class SceneEntityMoveScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; clientPosVersion = 0; + entityId = 0; entryId = 0; motion.clear(); return this; @@ -285,8 +285,8 @@ public final class SceneEntityMoveScNotifyOuterClass { } SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) + && (!hasEntityId() || entityId == other.entityId) && (!hasEntryId() || entryId == other.entryId) && (!hasMotion() || motion.equals(other.motion)); } @@ -294,15 +294,15 @@ public final class SceneEntityMoveScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(clientPosVersion); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(entityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { @@ -315,10 +315,10 @@ public final class SceneEntityMoveScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); @@ -336,25 +336,25 @@ public final class SceneEntityMoveScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 80: { // clientPosVersion clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { + // entityId + entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -390,10 +390,10 @@ public final class SceneEntityMoveScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); @@ -411,11 +411,11 @@ public final class SceneEntityMoveScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,11 +423,11 @@ public final class SceneEntityMoveScNotifyOuterClass { } break; } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -511,10 +511,10 @@ public final class SceneEntityMoveScNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName motion = FieldName.forField("motion"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java index fa16cfe..97378d8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityRefreshInfoOuterClass.java @@ -19,12 +19,12 @@ public final class SceneEntityRefreshInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 del_entity = 5; + * optional uint32 del_entity = 4; */ private int delEntity; /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 6; */ private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 5; + * optional uint32 del_entity = 4; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -47,7 +47,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 5; + * optional uint32 del_entity = 4; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -57,7 +57,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 5; + * optional uint32 del_entity = 4; * @return the delEntity */ public int getDelEntity() { @@ -65,7 +65,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 5; + * optional uint32 del_entity = 4; * @param value the delEntity to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 6; * @return whether the addEntity field is set */ public boolean hasAddEntity() { @@ -84,7 +84,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 6; * @return this */ public SceneEntityRefreshInfo clearAddEntity() { @@ -94,7 +94,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 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. @@ -108,7 +108,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 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 @@ -122,7 +122,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 4; + * optional .SceneEntityInfo add_entity = 6; * @param value the addEntity to set * @return this */ @@ -199,11 +199,11 @@ public final class SceneEntityRefreshInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 50); output.writeMessageNoTag(addEntity); } } @@ -227,16 +227,16 @@ public final class SceneEntityRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 32: { // delEntity delEntity = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 50) { break; } } - case 34: { + case 50: { // addEntity input.readMessage(addEntity); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java index 63e6ffb..c6c6bd1 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class SceneEntityTeleportCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 4; */ private int entryId; /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 11; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 4; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 4; * @return this */ public SceneEntityTeleportCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 4; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 9; + * optional uint32 entry_id = 4; * @param value the entryId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 11; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -84,7 +84,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 11; * @return this */ public SceneEntityTeleportCsReq clearEntityMotion() { @@ -94,7 +94,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 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. @@ -108,7 +108,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 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 @@ -122,7 +122,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 13; + * optional .EntityMotion entity_motion = 11; * @param value the entityMotion to set * @return this */ @@ -199,11 +199,11 @@ public final class SceneEntityTeleportCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 90); output.writeMessageNoTag(entityMotion); } } @@ -227,16 +227,16 @@ public final class SceneEntityTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 90) { break; } } - case 106: { + case 90: { // entityMotion input.readMessage(entityMotion); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java index f88d551..8566e24 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityTeleportScRspOuterClass.java @@ -19,17 +19,17 @@ public final class SceneEntityTeleportScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 12; */ private int clientPosVersion; /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -44,7 +44,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return this */ public SceneEntityTeleportScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 12; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { @@ -89,7 +89,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 12; * @return this */ public SceneEntityTeleportScRsp clearClientPosVersion() { @@ -99,7 +99,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 12; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,7 +107,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 12; * @param value the clientPosVersion to set * @return this */ @@ -118,7 +118,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -126,7 +126,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; * @return this */ public SceneEntityTeleportScRsp clearEntityMotion() { @@ -136,7 +136,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; * * 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. @@ -150,7 +150,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -164,7 +164,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 11; + * optional .EntityMotion entity_motion = 9; * @param value the entityMotion to set * @return this */ @@ -247,15 +247,15 @@ public final class SceneEntityTeleportScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 74); output.writeMessageNoTag(entityMotion); } } @@ -282,25 +282,25 @@ public final class SceneEntityTeleportScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { + case 96: { // clientPosVersion clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 74) { break; } } - case 90: { + case 74: { // entityMotion input.readMessage(entityMotion); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java index 3541023..168e37f 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java @@ -20,22 +20,22 @@ public final class SceneGroupRefreshInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 6; - */ - private int groupId; - - /** - * optional uint32 state = 7; + * optional uint32 state = 1; */ private int state; /** - * optional .SceneGroupRefreshType group_refresh_type = 2; + * optional uint32 group_id = 2; + */ + private int groupId; + + /** + * optional .SceneGroupRefreshType group_refresh_type = 7; */ private int groupRefreshType; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 5; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -50,62 +50,25 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 6; - * @return whether the groupId field is set + * optional uint32 state = 1; + * @return whether the state field is set */ - public boolean hasGroupId() { + public boolean hasState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 6; - * @return this - */ - public SceneGroupRefreshInfo clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 6; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 6; - * @param value the groupId to set - * @return this - */ - public SceneGroupRefreshInfo setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 state = 7; - * @return whether the state field is set - */ - public boolean hasState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @return this */ public SceneGroupRefreshInfo clearState() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; state = 0; return this; } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @return the state */ public int getState() { @@ -113,18 +76,55 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 7; + * optional uint32 state = 1; * @param value the state to set * @return this */ public SceneGroupRefreshInfo setState(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; state = value; return this; } /** - * optional .SceneGroupRefreshType group_refresh_type = 2; + * optional uint32 group_id = 2; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 2; + * @return this + */ + public SceneGroupRefreshInfo clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 2; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 2; + * @param value the groupId to set + * @return this + */ + public SceneGroupRefreshInfo setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional .SceneGroupRefreshType group_refresh_type = 7; * @return whether the groupRefreshType field is set */ public boolean hasGroupRefreshType() { @@ -132,7 +132,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 2; + * optional .SceneGroupRefreshType group_refresh_type = 7; * @return this */ public SceneGroupRefreshInfo clearGroupRefreshType() { @@ -142,7 +142,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 2; + * optional .SceneGroupRefreshType group_refresh_type = 7; * @return the groupRefreshType */ public SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType getGroupRefreshType() { @@ -175,7 +175,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 2; + * optional .SceneGroupRefreshType group_refresh_type = 7; * @param value the groupRefreshType to set * @return this */ @@ -187,7 +187,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 5; * @return whether the refreshEntity field is set */ public boolean hasRefreshEntity() { @@ -195,7 +195,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 5; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { @@ -205,7 +205,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 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. @@ -220,7 +220,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 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 @@ -235,7 +235,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 5; * @param value the refreshEntity to add * @return this */ @@ -247,7 +247,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 15; + * repeated .SceneEntityRefreshInfo refresh_entity = 5; * @param values the refreshEntity to add * @return this */ @@ -263,8 +263,8 @@ public final class SceneGroupRefreshInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; state = other.state; + groupId = other.groupId; groupRefreshType = other.groupRefreshType; refreshEntity.copyFrom(other.refreshEntity); } @@ -277,12 +277,12 @@ public final class SceneGroupRefreshInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasState()) { setState(other.state); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasGroupRefreshType()) { setGroupRefreshTypeValue(other.groupRefreshType); } @@ -299,8 +299,8 @@ public final class SceneGroupRefreshInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; state = 0; + groupId = 0; groupRefreshType = 0; refreshEntity.clear(); return this; @@ -327,8 +327,8 @@ public final class SceneGroupRefreshInfoOuterClass { } SceneGroupRefreshInfo other = (SceneGroupRefreshInfo) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId) && (!hasGroupRefreshType() || groupRefreshType == other.groupRefreshType) && (!hasRefreshEntity() || refreshEntity.equals(other.refreshEntity)); } @@ -336,20 +336,20 @@ public final class SceneGroupRefreshInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(state); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 56); output.writeEnumNoTag(groupRefreshType); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 42); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -359,10 +359,10 @@ public final class SceneGroupRefreshInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(groupRefreshType); @@ -380,25 +380,25 @@ public final class SceneGroupRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 8: { // state state = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 16) { break; } } case 16: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { // groupRefreshType final int value = input.readInt32(); if (SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.forNumber(value) != null) { @@ -406,11 +406,11 @@ public final class SceneGroupRefreshInfoOuterClass { bitField0_ |= 0x00000004; } tag = input.readTag(); - if (tag != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // refreshEntity tag = input.readRepeatedMessage(refreshEntity, tag); bitField0_ |= 0x00000008; @@ -436,10 +436,10 @@ public final class SceneGroupRefreshInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.groupRefreshType, groupRefreshType, SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType.converter()); @@ -457,11 +457,10 @@ public final class SceneGroupRefreshInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -469,10 +468,11 @@ public final class SceneGroupRefreshInfoOuterClass { } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -562,10 +562,10 @@ public final class SceneGroupRefreshInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName state = FieldName.forField("state"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName groupRefreshType = FieldName.forField("groupRefreshType", "group_refresh_type"); static final FieldName refreshEntity = FieldName.forField("refreshEntity", "refresh_entity"); diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java index 44cb090..a4ce3bb 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_info = 2; */ private final RepeatedMessage groupRefreshInfo = RepeatedMessage.newEmptyInstance(SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_info = 2; * @return whether the groupRefreshInfo field is set */ public boolean hasGroupRefreshInfo() { @@ -43,7 +43,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_info = 2; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_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. @@ -68,7 +68,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_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 @@ -83,7 +83,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_info = 2; * @param value the groupRefreshInfo to add * @return this */ @@ -95,7 +95,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 1; + * repeated .SceneGroupRefreshInfo group_refresh_info = 2; * @param values the groupRefreshInfo to add * @return this */ @@ -167,7 +167,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < groupRefreshInfo.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 18); output.writeMessageNoTag(groupRefreshInfo.get(i)); } } @@ -189,7 +189,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 18: { // groupRefreshInfo tag = input.readRepeatedMessage(groupRefreshInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java index ce5398d..107e2aa 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java @@ -19,17 +19,17 @@ public final class SceneGroupStateOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 6; - */ - private int groupId; - - /** - * optional uint32 state = 8; + * optional uint32 state = 6; */ private int state; /** - * optional bool is_default = 3; + * optional uint32 group_id = 13; + */ + private int groupId; + + /** + * optional bool is_default = 2; */ private boolean isDefault; @@ -44,62 +44,25 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 group_id = 6; - * @return whether the groupId field is set + * optional uint32 state = 6; + * @return whether the state field is set */ - public boolean hasGroupId() { + public boolean hasState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 6; - * @return this - */ - public SceneGroupState clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 6; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 6; - * @param value the groupId to set - * @return this - */ - public SceneGroupState setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 state = 8; - * @return whether the state field is set - */ - public boolean hasState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 state = 8; + * optional uint32 state = 6; * @return this */ public SceneGroupState clearState() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; state = 0; return this; } /** - * optional uint32 state = 8; + * optional uint32 state = 6; * @return the state */ public int getState() { @@ -107,18 +70,55 @@ public final class SceneGroupStateOuterClass { } /** - * optional uint32 state = 8; + * optional uint32 state = 6; * @param value the state to set * @return this */ public SceneGroupState setState(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; state = value; return this; } /** - * optional bool is_default = 3; + * optional uint32 group_id = 13; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 13; + * @return this + */ + public SceneGroupState clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 13; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 13; + * @param value the groupId to set + * @return this + */ + public SceneGroupState setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional bool is_default = 2; * @return whether the isDefault field is set */ public boolean hasIsDefault() { @@ -126,7 +126,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 3; + * optional bool is_default = 2; * @return this */ public SceneGroupState clearIsDefault() { @@ -136,7 +136,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 3; + * optional bool is_default = 2; * @return the isDefault */ public boolean getIsDefault() { @@ -144,7 +144,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 3; + * optional bool is_default = 2; * @param value the isDefault to set * @return this */ @@ -159,8 +159,8 @@ public final class SceneGroupStateOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; state = other.state; + groupId = other.groupId; isDefault = other.isDefault; } return this; @@ -172,12 +172,12 @@ public final class SceneGroupStateOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasState()) { setState(other.state); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasIsDefault()) { setIsDefault(other.isDefault); } @@ -191,8 +191,8 @@ public final class SceneGroupStateOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; state = 0; + groupId = 0; isDefault = false; return this; } @@ -217,8 +217,8 @@ public final class SceneGroupStateOuterClass { } SceneGroupState other = (SceneGroupState) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) && (!hasState() || state == other.state) + && (!hasGroupId() || groupId == other.groupId) && (!hasIsDefault() || isDefault == other.isDefault); } @@ -226,14 +226,14 @@ public final class SceneGroupStateOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(groupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); output.writeUInt32NoTag(state); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(groupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isDefault); } } @@ -242,10 +242,10 @@ public final class SceneGroupStateOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -261,24 +261,24 @@ public final class SceneGroupStateOuterClass { while (true) { switch (tag) { case 48: { - // groupId - groupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { // state state = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { + case 104: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // isDefault isDefault = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class SceneGroupStateOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isDefault, isDefault); @@ -323,11 +323,10 @@ public final class SceneGroupStateOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +334,11 @@ public final class SceneGroupStateOuterClass { } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class SceneGroupStateOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName state = FieldName.forField("state"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName isDefault = FieldName.forField("isDefault", "is_default"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java index 7945b08..97fc7ff 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -22,78 +22,78 @@ public final class SceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  Guessed
-     *
- * - * optional uint32 world_id = 1; - */ - private int worldId; - - /** - * optional uint32 entry_id = 2; - */ - private int entryId; - - /** - * 
-     *  Guessed
-     *
- * - * optional uint32 leader_entity_id = 5; - */ - private int leaderEntityId; - - /** - * optional uint32 floor_id = 8; - */ - private int floorId; - - /** - * optional uint32 game_mode_type = 13; - */ - private int gameModeType; - - /** - * optional uint32 plane_id = 14; + * optional uint32 plane_id = 5; */ private int planeId; /** - * optional uint32 client_pos_version = 15; + * optional uint32 entry_id = 6; + */ + private int entryId; + + /** + * optional uint32 floor_id = 7; + */ + private int floorId; + + /** + * optional uint32 game_mode_type = 10; + */ + private int gameModeType; + + /** + * optional uint32 client_pos_version = 12; */ private int clientPosVersion; /** - * repeated uint32 lighten_section_list = 7; + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 14; */ - private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); + private int leaderEntityId; /** - * repeated uint32 group_id_list = 12; + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 15; + */ + private int worldId; + + /** + * repeated uint32 group_id_list = 1; */ private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated uint32 lighten_section_list = 8; + */ + private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .SceneEntityInfo entity_list = 4; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; + * repeated .SceneEntityGroupInfo entity_group_list = 203; + */ + private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; */ private final RepeatedMessage extraData = RepeatedMessage.newEmptyInstance(ExtraDataEntry.getFactory()); /** - * repeated .SceneGroupState group_state_list = 605; + * repeated .SceneGroupState group_state_list = 1274; */ private final RepeatedMessage groupStateList = RepeatedMessage.newEmptyInstance(SceneGroupStateOuterClass.SceneGroupState.getFactory()); - /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; - */ - private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); - private SceneInfo() { } @@ -105,60 +105,44 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * - * optional uint32 world_id = 1; - * @return whether the worldId field is set + * optional uint32 plane_id = 5; + * @return whether the planeId field is set */ - public boolean hasWorldId() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  Guessed
-     *
- * - * optional uint32 world_id = 1; + * optional uint32 plane_id = 5; * @return this */ - public SceneInfo clearWorldId() { + public SceneInfo clearPlaneId() { bitField0_ &= ~0x00000001; - worldId = 0; + planeId = 0; return this; } /** - * 
-     *  Guessed
-     *
- * - * optional uint32 world_id = 1; - * @return the worldId + * optional uint32 plane_id = 5; + * @return the planeId */ - public int getWorldId() { - return worldId; + public int getPlaneId() { + return planeId; } /** - * 
-     *  Guessed
-     *
- * - * optional uint32 world_id = 1; - * @param value the worldId to set + * optional uint32 plane_id = 5; + * @param value the planeId to set * @return this */ - public SceneInfo setWorldId(final int value) { + public SceneInfo setPlaneId(final int value) { bitField0_ |= 0x00000001; - worldId = value; + planeId = value; return this; } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 6; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -166,7 +150,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 6; * @return this */ public SceneInfo clearEntryId() { @@ -176,7 +160,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 6; * @return the entryId */ public int getEntryId() { @@ -184,7 +168,7 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 6; * @param value the entryId to set * @return this */ @@ -195,27 +179,138 @@ public final class SceneInfoOuterClass { } /** - * 
-     *  Guessed
-     *
- * - * optional uint32 leader_entity_id = 5; - * @return whether the leaderEntityId field is set + * optional uint32 floor_id = 7; + * @return whether the floorId field is set */ - public boolean hasLeaderEntityId() { + public boolean hasFloorId() { return (bitField0_ & 0x00000004) != 0; } + /** + * optional uint32 floor_id = 7; + * @return this + */ + public SceneInfo clearFloorId() { + bitField0_ &= ~0x00000004; + floorId = 0; + return this; + } + + /** + * optional uint32 floor_id = 7; + * @return the floorId + */ + public int getFloorId() { + return floorId; + } + + /** + * optional uint32 floor_id = 7; + * @param value the floorId to set + * @return this + */ + public SceneInfo setFloorId(final int value) { + bitField0_ |= 0x00000004; + floorId = value; + return this; + } + + /** + * optional uint32 game_mode_type = 10; + * @return whether the gameModeType field is set + */ + public boolean hasGameModeType() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 game_mode_type = 10; + * @return this + */ + public SceneInfo clearGameModeType() { + bitField0_ &= ~0x00000008; + gameModeType = 0; + return this; + } + + /** + * optional uint32 game_mode_type = 10; + * @return the gameModeType + */ + public int getGameModeType() { + return gameModeType; + } + + /** + * optional uint32 game_mode_type = 10; + * @param value the gameModeType to set + * @return this + */ + public SceneInfo setGameModeType(final int value) { + bitField0_ |= 0x00000008; + gameModeType = value; + return this; + } + + /** + * optional uint32 client_pos_version = 12; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 client_pos_version = 12; + * @return this + */ + public SceneInfo clearClientPosVersion() { + bitField0_ &= ~0x00000010; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 12; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 12; + * @param value the clientPosVersion to set + * @return this + */ + public SceneInfo setClientPosVersion(final int value) { + bitField0_ |= 0x00000010; + clientPosVersion = value; + return this; + } + /** * 
      *  Guessed
      *
* - * optional uint32 leader_entity_id = 5; + * optional uint32 leader_entity_id = 14; + * @return whether the leaderEntityId field is set + */ + public boolean hasLeaderEntityId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 14; * @return this */ public SceneInfo clearLeaderEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000020; leaderEntityId = 0; return this; } @@ -225,7 +320,7 @@ public final class SceneInfoOuterClass { * Guessed * * - * optional uint32 leader_entity_id = 5; + * optional uint32 leader_entity_id = 14; * @return the leaderEntityId */ public int getLeaderEntityId() { @@ -237,252 +332,89 @@ public final class SceneInfoOuterClass { * Guessed * * - * optional uint32 leader_entity_id = 5; + * optional uint32 leader_entity_id = 14; * @param value the leaderEntityId to set * @return this */ public SceneInfo setLeaderEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000020; leaderEntityId = value; return this; } /** - * optional uint32 floor_id = 8; - * @return whether the floorId field is set + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 15; + * @return whether the worldId field is set */ - public boolean hasFloorId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 floor_id = 8; - * @return this - */ - public SceneInfo clearFloorId() { - bitField0_ &= ~0x00000008; - floorId = 0; - return this; - } - - /** - * optional uint32 floor_id = 8; - * @return the floorId - */ - public int getFloorId() { - return floorId; - } - - /** - * optional uint32 floor_id = 8; - * @param value the floorId to set - * @return this - */ - public SceneInfo setFloorId(final int value) { - bitField0_ |= 0x00000008; - floorId = value; - return this; - } - - /** - * optional uint32 game_mode_type = 13; - * @return whether the gameModeType field is set - */ - public boolean hasGameModeType() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 game_mode_type = 13; - * @return this - */ - public SceneInfo clearGameModeType() { - bitField0_ &= ~0x00000010; - gameModeType = 0; - return this; - } - - /** - * optional uint32 game_mode_type = 13; - * @return the gameModeType - */ - public int getGameModeType() { - return gameModeType; - } - - /** - * optional uint32 game_mode_type = 13; - * @param value the gameModeType to set - * @return this - */ - public SceneInfo setGameModeType(final int value) { - bitField0_ |= 0x00000010; - gameModeType = value; - return this; - } - - /** - * optional uint32 plane_id = 14; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 plane_id = 14; - * @return this - */ - public SceneInfo clearPlaneId() { - bitField0_ &= ~0x00000020; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 14; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 14; - * @param value the planeId to set - * @return this - */ - public SceneInfo setPlaneId(final int value) { - bitField0_ |= 0x00000020; - planeId = value; - return this; - } - - /** - * optional uint32 client_pos_version = 15; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { + public boolean hasWorldId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 client_pos_version = 15; + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 15; * @return this */ - public SceneInfo clearClientPosVersion() { + public SceneInfo clearWorldId() { bitField0_ &= ~0x00000040; - clientPosVersion = 0; + worldId = 0; return this; } /** - * optional uint32 client_pos_version = 15; - * @return the clientPosVersion + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 15; + * @return the worldId */ - public int getClientPosVersion() { - return clientPosVersion; + public int getWorldId() { + return worldId; } /** - * optional uint32 client_pos_version = 15; - * @param value the clientPosVersion to set + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 15; + * @param value the worldId to set * @return this */ - public SceneInfo setClientPosVersion(final int value) { + public SceneInfo setWorldId(final int value) { bitField0_ |= 0x00000040; - clientPosVersion = value; + worldId = value; return this; } /** - * repeated uint32 lighten_section_list = 7; - * @return whether the lightenSectionList field is set + * repeated uint32 group_id_list = 1; + * @return whether the groupIdList field is set */ - public boolean hasLightenSectionList() { + public boolean hasGroupIdList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated uint32 lighten_section_list = 7; - * @return this - */ - public SceneInfo clearLightenSectionList() { - bitField0_ &= ~0x00000080; - lightenSectionList.clear(); - return this; - } - - /** - * repeated uint32 lighten_section_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 #getMutableLightenSectionList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getLightenSectionList() { - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_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 RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000080; - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_list = 7; - * @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 = 7; - * @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 = 12; - * @return whether the groupIdList field is set - */ - public boolean hasGroupIdList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated uint32 group_id_list = 12; + * repeated uint32 group_id_list = 1; * @return this */ public SceneInfo clearGroupIdList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; groupIdList.clear(); return this; } /** - * repeated uint32 group_id_list = 12; + * repeated uint32 group_id_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. @@ -496,7 +428,7 @@ public final class SceneInfoOuterClass { } /** - * repeated uint32 group_id_list = 12; + * repeated uint32 group_id_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 @@ -505,34 +437,102 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableGroupIdList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return groupIdList; } /** - * repeated uint32 group_id_list = 12; + * repeated uint32 group_id_list = 1; * @param value the groupIdList to add * @return this */ public SceneInfo addGroupIdList(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; groupIdList.add(value); return this; } /** - * repeated uint32 group_id_list = 12; + * repeated uint32 group_id_list = 1; * @param values the groupIdList to add * @return this */ public SceneInfo addAllGroupIdList(final int... values) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; groupIdList.addAll(values); return this; } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated uint32 lighten_section_list = 8; + * @return whether the lightenSectionList field is set + */ + public boolean hasLightenSectionList() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * repeated uint32 lighten_section_list = 8; + * @return this + */ + public SceneInfo clearLightenSectionList() { + bitField0_ &= ~0x00000100; + lightenSectionList.clear(); + return this; + } + + /** + * repeated uint32 lighten_section_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 #getMutableLightenSectionList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLightenSectionList() { + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_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 getMutableLightenSectionList() { + bitField0_ |= 0x00000100; + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_list = 8; + * @param value the lightenSectionList to add + * @return this + */ + public SceneInfo addLightenSectionList(final int value) { + bitField0_ |= 0x00000100; + lightenSectionList.add(value); + return this; + } + + /** + * repeated uint32 lighten_section_list = 8; + * @param values the lightenSectionList to add + * @return this + */ + public SceneInfo addAllLightenSectionList(final int... values) { + bitField0_ |= 0x00000100; + lightenSectionList.addAll(values); + return this; + } + + /** + * repeated .SceneEntityInfo entity_list = 4; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -540,7 +540,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated .SceneEntityInfo entity_list = 4; * @return this */ public SceneInfo clearEntityList() { @@ -550,7 +550,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated .SceneEntityInfo entity_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. @@ -564,7 +564,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated .SceneEntityInfo entity_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 @@ -578,7 +578,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated .SceneEntityInfo entity_list = 4; * @param value the entityList to add * @return this */ @@ -589,7 +589,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 10; + * repeated .SceneEntityInfo entity_list = 4; * @param values the entityList to add * @return this */ @@ -600,162 +600,25 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * @return whether the extraData field is set + * repeated .SceneEntityGroupInfo entity_group_list = 203; + * @return whether the entityGroupList field is set */ - public boolean hasExtraData() { + public boolean hasEntityGroupList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * @return this - */ - public SceneInfo clearExtraData() { - bitField0_ &= ~0x00000400; - extraData.clear(); - return this; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * - * 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 #getMutableExtraData()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getExtraData() { - return extraData; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * - * 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 getMutableExtraData() { - bitField0_ |= 0x00000400; - return extraData; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * @param value the extraData to add - * @return this - */ - public SceneInfo addExtraData(final ExtraDataEntry value) { - bitField0_ |= 0x00000400; - extraData.add(value); - return this; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 211; - * @param values the extraData to add - * @return this - */ - public SceneInfo addAllExtraData(final ExtraDataEntry... values) { - bitField0_ |= 0x00000400; - extraData.addAll(values); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * @return whether the groupStateList field is set - */ - public boolean hasGroupStateList() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * @return this - */ - public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00000800; - groupStateList.clear(); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * - * 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 #getMutableGroupStateList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getGroupStateList() { - return groupStateList; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * - * 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 getMutableGroupStateList() { - bitField0_ |= 0x00000800; - return groupStateList; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * @param value the groupStateList to add - * @return this - */ - public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { - bitField0_ |= 0x00000800; - groupStateList.add(value); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 605; - * @param values the groupStateList to add - * @return this - */ - public SceneInfo addAllGroupStateList( - final SceneGroupStateOuterClass.SceneGroupState... values) { - bitField0_ |= 0x00000800; - groupStateList.addAll(values); - return this; - } - - /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; - * @return whether the entityGroupList field is set - */ - public boolean hasEntityGroupList() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; + * repeated .SceneEntityGroupInfo entity_group_list = 203; * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000400; entityGroupList.clear(); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; + * repeated .SceneEntityGroupInfo entity_group_list = 203; * * 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. @@ -770,7 +633,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; + * repeated .SceneEntityGroupInfo entity_group_list = 203; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -780,52 +643,189 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; return entityGroupList; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; + * repeated .SceneEntityGroupInfo entity_group_list = 203; * @param value the entityGroupList to add * @return this */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; entityGroupList.add(value); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 1132; + * repeated .SceneEntityGroupInfo entity_group_list = 203; * @param values the entityGroupList to add * @return this */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000400; entityGroupList.addAll(values); return this; } + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * @return whether the extraData field is set + */ + public boolean hasExtraData() { + return (bitField0_ & 0x00000800) != 0; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * @return this + */ + public SceneInfo clearExtraData() { + bitField0_ &= ~0x00000800; + extraData.clear(); + return this; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * + * 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 #getMutableExtraData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getExtraData() { + return extraData; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * + * 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 getMutableExtraData() { + bitField0_ |= 0x00000800; + return extraData; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * @param value the extraData to add + * @return this + */ + public SceneInfo addExtraData(final ExtraDataEntry value) { + bitField0_ |= 0x00000800; + extraData.add(value); + return this; + } + + /** + * repeated .SceneInfo.ExtraDataEntry extra_data = 317; + * @param values the extraData to add + * @return this + */ + public SceneInfo addAllExtraData(final ExtraDataEntry... values) { + bitField0_ |= 0x00000800; + extraData.addAll(values); + return this; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * @return whether the groupStateList field is set + */ + public boolean hasGroupStateList() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * @return this + */ + public SceneInfo clearGroupStateList() { + bitField0_ &= ~0x00001000; + groupStateList.clear(); + return this; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * + * 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 #getMutableGroupStateList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getGroupStateList() { + return groupStateList; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * + * 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 getMutableGroupStateList() { + bitField0_ |= 0x00001000; + return groupStateList; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * @param value the groupStateList to add + * @return this + */ + public SceneInfo addGroupStateList(final SceneGroupStateOuterClass.SceneGroupState value) { + bitField0_ |= 0x00001000; + groupStateList.add(value); + return this; + } + + /** + * repeated .SceneGroupState group_state_list = 1274; + * @param values the groupStateList to add + * @return this + */ + public SceneInfo addAllGroupStateList( + final SceneGroupStateOuterClass.SceneGroupState... values) { + bitField0_ |= 0x00001000; + groupStateList.addAll(values); + return this; + } + @Override public SceneInfo copyFrom(final SceneInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldId = other.worldId; + planeId = other.planeId; entryId = other.entryId; - leaderEntityId = other.leaderEntityId; floorId = other.floorId; gameModeType = other.gameModeType; - planeId = other.planeId; clientPosVersion = other.clientPosVersion; - lightenSectionList.copyFrom(other.lightenSectionList); + leaderEntityId = other.leaderEntityId; + worldId = other.worldId; groupIdList.copyFrom(other.groupIdList); + lightenSectionList.copyFrom(other.lightenSectionList); entityList.copyFrom(other.entityList); + entityGroupList.copyFrom(other.entityGroupList); extraData.copyFrom(other.extraData); groupStateList.copyFrom(other.groupStateList); - entityGroupList.copyFrom(other.entityGroupList); } return this; } @@ -836,45 +836,45 @@ public final class SceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasWorldId()) { - setWorldId(other.worldId); + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasLeaderEntityId()) { - setLeaderEntityId(other.leaderEntityId); - } if (other.hasFloorId()) { setFloorId(other.floorId); } if (other.hasGameModeType()) { setGameModeType(other.gameModeType); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } - if (other.hasLightenSectionList()) { - getMutableLightenSectionList().addAll(other.lightenSectionList); + if (other.hasLeaderEntityId()) { + setLeaderEntityId(other.leaderEntityId); + } + if (other.hasWorldId()) { + setWorldId(other.worldId); } if (other.hasGroupIdList()) { getMutableGroupIdList().addAll(other.groupIdList); } + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); + } if (other.hasEntityList()) { getMutableEntityList().addAll(other.entityList); } + if (other.hasEntityGroupList()) { + getMutableEntityGroupList().addAll(other.entityGroupList); + } if (other.hasExtraData()) { getMutableExtraData().addAll(other.extraData); } if (other.hasGroupStateList()) { getMutableGroupStateList().addAll(other.groupStateList); } - if (other.hasEntityGroupList()) { - getMutableEntityGroupList().addAll(other.entityGroupList); - } return this; } @@ -885,19 +885,19 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - worldId = 0; + planeId = 0; entryId = 0; - leaderEntityId = 0; floorId = 0; gameModeType = 0; - planeId = 0; clientPosVersion = 0; - lightenSectionList.clear(); + leaderEntityId = 0; + worldId = 0; groupIdList.clear(); + lightenSectionList.clear(); entityList.clear(); + entityGroupList.clear(); extraData.clear(); groupStateList.clear(); - entityGroupList.clear(); return this; } @@ -908,12 +908,12 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - lightenSectionList.clear(); groupIdList.clear(); + lightenSectionList.clear(); entityList.clearQuick(); + entityGroupList.clearQuick(); extraData.clearQuick(); groupStateList.clearQuick(); - entityGroupList.clearQuick(); return this; } @@ -927,85 +927,85 @@ public final class SceneInfoOuterClass { } SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasWorldId() || worldId == other.worldId) + && (!hasPlaneId() || planeId == other.planeId) && (!hasEntryId() || entryId == other.entryId) - && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) && (!hasFloorId() || floorId == other.floorId) && (!hasGameModeType() || gameModeType == other.gameModeType) - && (!hasPlaneId() || planeId == other.planeId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) - && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) + && (!hasWorldId() || worldId == other.worldId) && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) + && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) && (!hasEntityList() || entityList.equals(other.entityList)) + && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) && (!hasExtraData() || extraData.equals(other.extraData)) - && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)) - && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)); + && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(worldId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(leaderEntityId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(floorId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(gameModeType); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(clientPosVersion); + } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(leaderEntityId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(clientPosVersion); + output.writeUInt32NoTag(worldId); } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(lightenSectionList.array()[i]); + for (int i = 0; i < groupIdList.length(); i++) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(groupIdList.array()[i]); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < groupIdList.length(); i++) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(groupIdList.array()[i]); + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 34); output.writeMessageNoTag(entityList.get(i)); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < extraData.length(); i++) { - output.writeRawLittleEndian16((short) 3482); - output.writeMessageNoTag(extraData.get(i)); + for (int i = 0; i < entityGroupList.length(); i++) { + output.writeRawLittleEndian16((short) 3290); + output.writeMessageNoTag(entityGroupList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < groupStateList.length(); i++) { - output.writeRawLittleEndian16((short) 9706); - output.writeMessageNoTag(groupStateList.get(i)); + for (int i = 0; i < extraData.length(); i++) { + output.writeRawLittleEndian16((short) 5098); + output.writeMessageNoTag(extraData.get(i)); } } if ((bitField0_ & 0x00001000) != 0) { - for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 18146); - output.writeMessageNoTag(entityGroupList.get(i)); + for (int i = 0; i < groupStateList.length(); i++) { + output.writeRawLittleEndian16((short) 20434); + output.writeMessageNoTag(groupStateList.get(i)); } } } @@ -1014,43 +1014,43 @@ public final class SceneInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); + } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } if ((bitField0_ & 0x00000400) != 0) { - size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData); + size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); } if ((bitField0_ & 0x00000800) != 0) { - size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); + size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData); } if ((bitField0_ & 0x00001000) != 0) { - size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); } return size; } @@ -1062,45 +1062,45 @@ public final class SceneInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // worldId - worldId = input.readUInt32(); + case 40: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 48) { break; } } - case 16: { + case 48: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // leaderEntityId - leaderEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 56: { // floorId floorId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { + case 80: { // gameModeType gameModeType = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // clientPosVersion + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 112) { @@ -1108,8 +1108,8 @@ public final class SceneInfoOuterClass { } } case 112: { - // planeId - planeId = input.readUInt32(); + // leaderEntityId + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -1117,59 +1117,59 @@ public final class SceneInfoOuterClass { } } case 120: { - // clientPosVersion - clientPosVersion = input.readUInt32(); + // worldId + worldId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { - // lightenSectionList [packed=true] - input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { + case 10: { // groupIdList [packed=true] input.readPackedUInt32(groupIdList, tag); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 82) { + if (tag != 66) { break; } } - case 82: { + case 66: { + // lightenSectionList [packed=true] + input.readPackedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000200; - if (tag != 1690) { + if (tag != 1626) { break; } } - case 1690: { - // extraData - tag = input.readRepeatedMessage(extraData, tag); - bitField0_ |= 0x00000400; - if (tag != 4842) { - break; - } - } - case 4842: { - // groupStateList - tag = input.readRepeatedMessage(groupStateList, tag); - bitField0_ |= 0x00000800; - if (tag != 9058) { - break; - } - } - case 9058: { + case 1626: { // entityGroupList tag = input.readRepeatedMessage(entityGroupList, tag); + bitField0_ |= 0x00000400; + if (tag != 2538) { + break; + } + } + case 2538: { + // extraData + tag = input.readRepeatedMessage(extraData, tag); + bitField0_ |= 0x00000800; + if (tag != 10194) { + break; + } + } + case 10194: { + // groupStateList + tag = input.readRepeatedMessage(groupStateList, tag); bitField0_ |= 0x00001000; if (tag != 0) { break; @@ -1185,15 +1185,15 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } - case 56: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 8: { + // groupIdList [packed=false] + tag = input.readRepeatedUInt32(groupIdList, tag); bitField0_ |= 0x00000080; break; } - case 96: { - // groupIdList [packed=false] - tag = input.readRepeatedUInt32(groupIdList, tag); + case 64: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000100; break; } @@ -1205,43 +1205,43 @@ public final class SceneInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.worldId, worldId); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.floorId, floorId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.gameModeType, gameModeType); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000040) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.worldId, worldId); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.entityList, entityList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.extraData, extraData); + output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); + output.writeRepeatedMessage(FieldNames.extraData, extraData); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); } output.endObject(); } @@ -1253,11 +1253,11 @@ public final class SceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1525188685: - case 36230376: { - if (input.isAtField(FieldNames.worldId)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - worldId = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1277,24 +1277,12 @@ public final class SceneInfoOuterClass { } break; } - case 1693061255: - case 794634049: { - if (input.isAtField(FieldNames.leaderEntityId)) { - if (!input.trySkipNullValue()) { - leaderEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -766027193: case 2022982190: { if (input.isAtField(FieldNames.floorId)) { if (!input.trySkipNullValue()) { floorId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -1306,19 +1294,7 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.gameModeType)) { if (!input.trySkipNullValue()) { gameModeType = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { - if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1330,19 +1306,31 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); } break; } - case -1942343836: - case 1328850360: { - if (input.isAtField(FieldNames.lightenSectionList)) { + case 1693061255: + case 794634049: { + if (input.isAtField(FieldNames.leaderEntityId)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lightenSectionList); - bitField0_ |= 0x00000080; + leaderEntityId = input.readUInt32(); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1525188685: + case 36230376: { + if (input.isAtField(FieldNames.worldId)) { + if (!input.trySkipNullValue()) { + worldId = input.readUInt32(); + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1354,6 +1342,18 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.groupIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(groupIdList); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1942343836: + case 1328850360: { + if (input.isAtField(FieldNames.lightenSectionList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lightenSectionList); bitField0_ |= 0x00000100; } } else { @@ -1373,12 +1373,24 @@ public final class SceneInfoOuterClass { } break; } + case -914706662: + case 1589108794: { + if (input.isAtField(FieldNames.entityGroupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(entityGroupList); + bitField0_ |= 0x00000400; + } + } else { + input.skipUnknownField(); + } + break; + } case -253792294: case 747380345: { if (input.isAtField(FieldNames.extraData)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(extraData); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -1390,18 +1402,6 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.groupStateList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(groupStateList); - bitField0_ |= 0x00000800; - } - } else { - input.skipUnknownField(); - } - break; - } - case -914706662: - case 1589108794: { - if (input.isAtField(FieldNames.entityGroupList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(entityGroupList); bitField0_ |= 0x00001000; } } else { @@ -1815,31 +1815,31 @@ public final class SceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldId = FieldName.forField("worldId", "world_id"); + static final FieldName planeId = FieldName.forField("planeId", "plane_id"); static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); - static final FieldName floorId = FieldName.forField("floorId", "floor_id"); static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + static final FieldName leaderEntityId = FieldName.forField("leaderEntityId", "leader_entity_id"); + + static final FieldName worldId = FieldName.forField("worldId", "world_id"); static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); + static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + static final FieldName entityList = FieldName.forField("entityList", "entity_list"); + static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); + static final FieldName extraData = FieldName.forField("extraData", "extra_data"); static final FieldName groupStateList = FieldName.forField("groupStateList", "group_state_list"); - - static final FieldName entityGroupList = FieldName.forField("entityGroupList", "entity_group_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java index 1807c3d..6bfe25f 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterOuterClass.java @@ -19,20 +19,20 @@ public final class SceneMonsterOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 10; */ private int monsterId; /** - * optional uint32 cur_hp = 3; - */ - private int curHp; - - /** - * optional uint32 max_hp = 9; + * optional uint32 max_hp = 14; */ private int maxHp; + /** + * optional uint32 cur_hp = 15; + */ + private int curHp; + private SceneMonster() { } @@ -44,7 +44,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 10; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -52,7 +52,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 10; * @return this */ public SceneMonster clearMonsterId() { @@ -62,7 +62,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 10; * @return the monsterId */ public int getMonsterId() { @@ -70,7 +70,7 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 monster_id = 2; + * optional uint32 monster_id = 10; * @param value the monsterId to set * @return this */ @@ -81,62 +81,25 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 cur_hp = 3; - * @return whether the curHp field is set + * optional uint32 max_hp = 14; + * @return whether the maxHp field is set */ - public boolean hasCurHp() { + public boolean hasMaxHp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 cur_hp = 3; - * @return this - */ - public SceneMonster clearCurHp() { - bitField0_ &= ~0x00000002; - curHp = 0; - return this; - } - - /** - * optional uint32 cur_hp = 3; - * @return the curHp - */ - public int getCurHp() { - return curHp; - } - - /** - * optional uint32 cur_hp = 3; - * @param value the curHp to set - * @return this - */ - public SceneMonster setCurHp(final int value) { - bitField0_ |= 0x00000002; - curHp = value; - return this; - } - - /** - * optional uint32 max_hp = 9; - * @return whether the maxHp field is set - */ - public boolean hasMaxHp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 max_hp = 9; + * optional uint32 max_hp = 14; * @return this */ public SceneMonster clearMaxHp() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; maxHp = 0; return this; } /** - * optional uint32 max_hp = 9; + * optional uint32 max_hp = 14; * @return the maxHp */ public int getMaxHp() { @@ -144,24 +107,61 @@ public final class SceneMonsterOuterClass { } /** - * optional uint32 max_hp = 9; + * optional uint32 max_hp = 14; * @param value the maxHp to set * @return this */ public SceneMonster setMaxHp(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; maxHp = value; return this; } + /** + * optional uint32 cur_hp = 15; + * @return whether the curHp field is set + */ + public boolean hasCurHp() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_hp = 15; + * @return this + */ + public SceneMonster clearCurHp() { + bitField0_ &= ~0x00000004; + curHp = 0; + return this; + } + + /** + * optional uint32 cur_hp = 15; + * @return the curHp + */ + public int getCurHp() { + return curHp; + } + + /** + * optional uint32 cur_hp = 15; + * @param value the curHp to set + * @return this + */ + public SceneMonster setCurHp(final int value) { + bitField0_ |= 0x00000004; + curHp = value; + return this; + } + @Override public SceneMonster copyFrom(final SceneMonster other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; monsterId = other.monsterId; - curHp = other.curHp; maxHp = other.maxHp; + curHp = other.curHp; } return this; } @@ -175,12 +175,12 @@ public final class SceneMonsterOuterClass { if (other.hasMonsterId()) { setMonsterId(other.monsterId); } - if (other.hasCurHp()) { - setCurHp(other.curHp); - } if (other.hasMaxHp()) { setMaxHp(other.maxHp); } + if (other.hasCurHp()) { + setCurHp(other.curHp); + } return this; } @@ -192,8 +192,8 @@ public final class SceneMonsterOuterClass { cachedSize = -1; bitField0_ = 0; monsterId = 0; - curHp = 0; maxHp = 0; + curHp = 0; return this; } @@ -218,23 +218,23 @@ public final class SceneMonsterOuterClass { SceneMonster other = (SceneMonster) o; return bitField0_ == other.bitField0_ && (!hasMonsterId() || monsterId == other.monsterId) - && (!hasCurHp() || curHp == other.curHp) - && (!hasMaxHp() || maxHp == other.maxHp); + && (!hasMaxHp() || maxHp == other.maxHp) + && (!hasCurHp() || curHp == other.curHp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curHp); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(maxHp); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curHp); } } @@ -245,10 +245,10 @@ public final class SceneMonsterOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } return size; } @@ -260,27 +260,27 @@ public final class SceneMonsterOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 80: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { - // curHp - curHp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 112: { // maxHp maxHp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // curHp + curHp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class SceneMonsterOuterClass { output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curHp, curHp); + output.writeUInt32(FieldNames.maxHp, maxHp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.maxHp, maxHp); + output.writeUInt32(FieldNames.curHp, curHp); } output.endObject(); } @@ -335,11 +335,11 @@ public final class SceneMonsterOuterClass { } break; } - case 95026024: - case -1349138585: { - if (input.isAtField(FieldNames.curHp)) { + case 103671180: + case -1081138749: { + if (input.isAtField(FieldNames.maxHp)) { if (!input.trySkipNullValue()) { - curHp = input.readUInt32(); + maxHp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class SceneMonsterOuterClass { } break; } - case 103671180: - case -1081138749: { - if (input.isAtField(FieldNames.maxHp)) { + case 95026024: + case -1349138585: { + if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { - maxHp = input.readUInt32(); + curHp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class SceneMonsterOuterClass { static class FieldNames { static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); - static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); - static final FieldName maxHp = FieldName.forField("maxHp", "max_hp"); + + static final FieldName curHp = FieldName.forField("curHp", "cur_hp"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java index 58c4341..f62726f 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java @@ -20,30 +20,30 @@ public final class SceneMonsterWaveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 8; */ private int stageId; /** - * optional uint32 wave_id = 14; + * optional uint32 wave_id = 9; */ private int waveId; /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 6; */ private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance(); /** - * repeated .SceneMonster monster_list = 3; - */ - private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); - - /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 5; */ private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); + /** + * repeated .SceneMonster monster_list = 12; + */ + private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); + private SceneMonsterWave() { } @@ -55,7 +55,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 8; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -63,7 +63,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 8; * @return this */ public SceneMonsterWave clearStageId() { @@ -73,7 +73,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 8; * @return the stageId */ public int getStageId() { @@ -81,7 +81,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 1; + * optional uint32 stage_id = 8; * @param value the stageId to set * @return this */ @@ -92,7 +92,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 14; + * optional uint32 wave_id = 9; * @return whether the waveId field is set */ public boolean hasWaveId() { @@ -100,7 +100,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 14; + * optional uint32 wave_id = 9; * @return this */ public SceneMonsterWave clearWaveId() { @@ -110,7 +110,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 14; + * optional uint32 wave_id = 9; * @return the waveId */ public int getWaveId() { @@ -118,7 +118,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 14; + * optional uint32 wave_id = 9; * @param value the waveId to set * @return this */ @@ -129,7 +129,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 6; * @return whether the waveParam field is set */ public boolean hasWaveParam() { @@ -137,7 +137,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 6; * @return this */ public SceneMonsterWave clearWaveParam() { @@ -147,7 +147,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 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. @@ -161,7 +161,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 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 @@ -175,7 +175,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional .SceneMonsterWaveParam wave_param = 8; + * optional .SceneMonsterWaveParam wave_param = 6; * @param value the waveParam to set * @return this */ @@ -187,93 +187,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 3; - * @return whether the monsterList field is set + * repeated .ItemList drop_list = 5; + * @return whether the dropList field is set */ - public boolean hasMonsterList() { + public boolean hasDropList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .SceneMonster monster_list = 3; - * @return this - */ - public SceneMonsterWave clearMonsterList() { - bitField0_ &= ~0x00000008; - monsterList.clear(); - return this; - } - - /** - * repeated .SceneMonster monster_list = 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 #getMutableMonsterList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMonsterList() { - return monsterList; - } - - /** - * repeated .SceneMonster monster_list = 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 RepeatedMessage getMutableMonsterList() { - bitField0_ |= 0x00000008; - return monsterList; - } - - /** - * repeated .SceneMonster monster_list = 3; - * @param value the monsterList to add - * @return this - */ - public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) { - bitField0_ |= 0x00000008; - monsterList.add(value); - return this; - } - - /** - * repeated .SceneMonster monster_list = 3; - * @param values the monsterList to add - * @return this - */ - public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) { - bitField0_ |= 0x00000008; - monsterList.addAll(values); - return this; - } - - /** - * repeated .ItemList drop_list = 4; - * @return whether the dropList field is set - */ - public boolean hasDropList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 5; * @return this */ public SceneMonsterWave clearDropList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; dropList.clear(); return this; } /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 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. @@ -287,7 +219,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 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 @@ -296,32 +228,100 @@ public final class SceneMonsterWaveOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableDropList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return dropList; } /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 5; * @param value the dropList to add * @return this */ public SceneMonsterWave addDropList(final ItemListOuterClass.ItemList value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; dropList.add(value); return this; } /** - * repeated .ItemList drop_list = 4; + * repeated .ItemList drop_list = 5; * @param values the dropList to add * @return this */ public SceneMonsterWave addAllDropList(final ItemListOuterClass.ItemList... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; dropList.addAll(values); return this; } + /** + * repeated .SceneMonster monster_list = 12; + * @return whether the monsterList field is set + */ + public boolean hasMonsterList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .SceneMonster monster_list = 12; + * @return this + */ + public SceneMonsterWave clearMonsterList() { + bitField0_ &= ~0x00000010; + monsterList.clear(); + return this; + } + + /** + * repeated .SceneMonster monster_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. + * + * Use {@link #getMutableMonsterList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMonsterList() { + return monsterList; + } + + /** + * repeated .SceneMonster monster_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableMonsterList() { + bitField0_ |= 0x00000010; + return monsterList; + } + + /** + * repeated .SceneMonster monster_list = 12; + * @param value the monsterList to add + * @return this + */ + public SceneMonsterWave addMonsterList(final SceneMonsterOuterClass.SceneMonster value) { + bitField0_ |= 0x00000010; + monsterList.add(value); + return this; + } + + /** + * repeated .SceneMonster monster_list = 12; + * @param values the monsterList to add + * @return this + */ + public SceneMonsterWave addAllMonsterList(final SceneMonsterOuterClass.SceneMonster... values) { + bitField0_ |= 0x00000010; + monsterList.addAll(values); + return this; + } + @Override public SceneMonsterWave copyFrom(final SceneMonsterWave other) { cachedSize = other.cachedSize; @@ -330,8 +330,8 @@ public final class SceneMonsterWaveOuterClass { stageId = other.stageId; waveId = other.waveId; waveParam.copyFrom(other.waveParam); - monsterList.copyFrom(other.monsterList); dropList.copyFrom(other.dropList); + monsterList.copyFrom(other.monsterList); } return this; } @@ -351,12 +351,12 @@ public final class SceneMonsterWaveOuterClass { if (other.hasWaveParam()) { getMutableWaveParam().mergeFrom(other.waveParam); } - if (other.hasMonsterList()) { - getMutableMonsterList().addAll(other.monsterList); - } if (other.hasDropList()) { getMutableDropList().addAll(other.dropList); } + if (other.hasMonsterList()) { + getMutableMonsterList().addAll(other.monsterList); + } return this; } @@ -370,8 +370,8 @@ public final class SceneMonsterWaveOuterClass { stageId = 0; waveId = 0; waveParam.clear(); - monsterList.clear(); dropList.clear(); + monsterList.clear(); return this; } @@ -383,8 +383,8 @@ public final class SceneMonsterWaveOuterClass { cachedSize = -1; bitField0_ = 0; waveParam.clearQuick(); - monsterList.clearQuick(); dropList.clearQuick(); + monsterList.clearQuick(); return this; } @@ -401,34 +401,34 @@ public final class SceneMonsterWaveOuterClass { && (!hasStageId() || stageId == other.stageId) && (!hasWaveId() || waveId == other.waveId) && (!hasWaveParam() || waveParam.equals(other.waveParam)) - && (!hasMonsterList() || monsterList.equals(other.monsterList)) - && (!hasDropList() || dropList.equals(other.dropList)); + && (!hasDropList() || dropList.equals(other.dropList)) + && (!hasMonsterList() || monsterList.equals(other.monsterList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(waveId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < monsterList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(monsterList.get(i)); + for (int i = 0; i < dropList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(dropList.get(i)); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < dropList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(dropList.get(i)); + for (int i = 0; i < monsterList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(monsterList.get(i)); } } } @@ -446,10 +446,10 @@ public final class SceneMonsterWaveOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); + size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * dropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dropList); + size += (1 * monsterList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterList); } return size; } @@ -461,44 +461,44 @@ public final class SceneMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // stageId stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { + case 72: { // waveId waveId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 50) { break; } } - case 66: { + case 50: { // waveParam input.readMessage(waveParam); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 42) { break; } } - case 26: { - // monsterList - tag = input.readRepeatedMessage(monsterList, tag); - bitField0_ |= 0x00000008; - if (tag != 34) { - break; - } - } - case 34: { + case 42: { // dropList tag = input.readRepeatedMessage(dropList, tag); + bitField0_ |= 0x00000008; + if (tag != 98) { + break; + } + } + case 98: { + // monsterList + tag = input.readRepeatedMessage(monsterList, tag); bitField0_ |= 0x00000010; if (tag != 0) { break; @@ -531,10 +531,10 @@ public final class SceneMonsterWaveOuterClass { output.writeMessage(FieldNames.waveParam, waveParam); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.monsterList, monsterList); + output.writeRepeatedMessage(FieldNames.dropList, dropList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.dropList, dropList); + output.writeRepeatedMessage(FieldNames.monsterList, monsterList); } output.endObject(); } @@ -582,11 +582,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case 1541271448: - case 552401379: { - if (input.isAtField(FieldNames.monsterList)) { + case -432782291: + case -513722386: { + if (input.isAtField(FieldNames.dropList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(monsterList); + input.readRepeatedMessage(dropList); bitField0_ |= 0x00000008; } } else { @@ -594,11 +594,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case -432782291: - case -513722386: { - if (input.isAtField(FieldNames.dropList)) { + case 1541271448: + case 552401379: { + if (input.isAtField(FieldNames.monsterList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(dropList); + input.readRepeatedMessage(monsterList); bitField0_ |= 0x00000010; } } else { @@ -665,9 +665,9 @@ public final class SceneMonsterWaveOuterClass { static final FieldName waveParam = FieldName.forField("waveParam", "wave_param"); - static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); - static final FieldName dropList = FieldName.forField("dropList", "drop_list"); + + static final FieldName monsterList = FieldName.forField("monsterList", "monster_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java index 529be43..5872af8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveParamOuterClass.java @@ -19,7 +19,7 @@ public final class SceneMonsterWaveParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 level = 2; + * optional uint32 level = 4; */ private int level; @@ -34,7 +34,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 4; * @return whether the level field is set */ public boolean hasLevel() { @@ -42,7 +42,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 4; * @return this */ public SceneMonsterWaveParam clearLevel() { @@ -52,7 +52,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 4; * @return the level */ public int getLevel() { @@ -60,7 +60,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 4; * @param value the level to set * @return this */ @@ -129,7 +129,7 @@ public final class SceneMonsterWaveParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(level); } } @@ -150,7 +150,7 @@ public final class SceneMonsterWaveParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // level level = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java index 10d28f8..ab6ef35 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java @@ -19,12 +19,12 @@ public final class SceneNpcInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 10; + * optional uint32 npc_id = 15; */ private int npcId; /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 7; */ private final NpcExtraInfoOuterClass.NpcExtraInfo extraInfo = NpcExtraInfoOuterClass.NpcExtraInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 10; + * optional uint32 npc_id = 15; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 10; + * optional uint32 npc_id = 15; * @return this */ public SceneNpcInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 10; + * optional uint32 npc_id = 15; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 10; + * optional uint32 npc_id = 15; * @param value the npcId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 7; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -84,7 +84,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 7; * @return this */ public SceneNpcInfo clearExtraInfo() { @@ -94,7 +94,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_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. @@ -108,7 +108,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_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 @@ -122,7 +122,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional .NpcExtraInfo extra_info = 4; + * optional .NpcExtraInfo extra_info = 7; * @param value the extraInfo to set * @return this */ @@ -198,11 +198,11 @@ public final class SceneNpcInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 58); output.writeMessageNoTag(extraInfo); } } @@ -226,16 +226,16 @@ public final class SceneNpcInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 120: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { + case 58: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java index bc8775c..58a66e7 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -19,20 +19,20 @@ public final class SceneNpcMonsterInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 8; */ private int worldLevel; /** - * optional uint32 event_id = 11; - */ - private int eventId; - - /** - * optional uint32 monster_id = 12; + * optional uint32 monster_id = 10; */ private int monsterId; + /** + * optional uint32 event_id = 13; + */ + private int eventId; + private SceneNpcMonsterInfo() { } @@ -44,7 +44,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 8; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -52,7 +52,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 8; * @return this */ public SceneNpcMonsterInfo clearWorldLevel() { @@ -62,7 +62,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 8; * @return the worldLevel */ public int getWorldLevel() { @@ -70,7 +70,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 world_level = 6; + * optional uint32 world_level = 8; * @param value the worldLevel to set * @return this */ @@ -81,62 +81,25 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 11; - * @return whether the eventId field is set + * optional uint32 monster_id = 10; + * @return whether the monsterId field is set */ - public boolean hasEventId() { + public boolean hasMonsterId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 event_id = 11; - * @return this - */ - public SceneNpcMonsterInfo clearEventId() { - bitField0_ &= ~0x00000002; - eventId = 0; - return this; - } - - /** - * optional uint32 event_id = 11; - * @return the eventId - */ - public int getEventId() { - return eventId; - } - - /** - * optional uint32 event_id = 11; - * @param value the eventId to set - * @return this - */ - public SceneNpcMonsterInfo setEventId(final int value) { - bitField0_ |= 0x00000002; - eventId = value; - return this; - } - - /** - * optional uint32 monster_id = 12; - * @return whether the monsterId field is set - */ - public boolean hasMonsterId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 monster_id = 12; + * optional uint32 monster_id = 10; * @return this */ public SceneNpcMonsterInfo clearMonsterId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; monsterId = 0; return this; } /** - * optional uint32 monster_id = 12; + * optional uint32 monster_id = 10; * @return the monsterId */ public int getMonsterId() { @@ -144,24 +107,61 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 monster_id = 12; + * optional uint32 monster_id = 10; * @param value the monsterId to set * @return this */ public SceneNpcMonsterInfo setMonsterId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; monsterId = value; return this; } + /** + * optional uint32 event_id = 13; + * @return whether the eventId field is set + */ + public boolean hasEventId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 event_id = 13; + * @return this + */ + public SceneNpcMonsterInfo clearEventId() { + bitField0_ &= ~0x00000004; + eventId = 0; + return this; + } + + /** + * optional uint32 event_id = 13; + * @return the eventId + */ + public int getEventId() { + return eventId; + } + + /** + * optional uint32 event_id = 13; + * @param value the eventId to set + * @return this + */ + public SceneNpcMonsterInfo setEventId(final int value) { + bitField0_ |= 0x00000004; + eventId = value; + return this; + } + @Override public SceneNpcMonsterInfo copyFrom(final SceneNpcMonsterInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; worldLevel = other.worldLevel; - eventId = other.eventId; monsterId = other.monsterId; + eventId = other.eventId; } return this; } @@ -175,12 +175,12 @@ public final class SceneNpcMonsterInfoOuterClass { if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasEventId()) { - setEventId(other.eventId); - } if (other.hasMonsterId()) { setMonsterId(other.monsterId); } + if (other.hasEventId()) { + setEventId(other.eventId); + } return this; } @@ -192,8 +192,8 @@ public final class SceneNpcMonsterInfoOuterClass { cachedSize = -1; bitField0_ = 0; worldLevel = 0; - eventId = 0; monsterId = 0; + eventId = 0; return this; } @@ -218,23 +218,23 @@ public final class SceneNpcMonsterInfoOuterClass { SceneNpcMonsterInfo other = (SceneNpcMonsterInfo) o; return bitField0_ == other.bitField0_ && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEventId() || eventId == other.eventId) - && (!hasMonsterId() || monsterId == other.monsterId); + && (!hasMonsterId() || monsterId == other.monsterId) + && (!hasEventId() || eventId == other.eventId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(eventId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(monsterId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(eventId); } } @@ -245,10 +245,10 @@ public final class SceneNpcMonsterInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } return size; } @@ -260,27 +260,27 @@ public final class SceneNpcMonsterInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { - // eventId - eventId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 80: { // monsterId monsterId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class SceneNpcMonsterInfoOuterClass { output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.eventId, eventId); + output.writeUInt32(FieldNames.monsterId, monsterId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.monsterId, monsterId); + output.writeUInt32(FieldNames.eventId, eventId); } output.endObject(); } @@ -335,11 +335,11 @@ public final class SceneNpcMonsterInfoOuterClass { } break; } - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { + case -1316830571: + case 2127946656: { + if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); + monsterId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,11 +347,11 @@ public final class SceneNpcMonsterInfoOuterClass { } break; } - case -1316830571: - case 2127946656: { - if (input.isAtField(FieldNames.monsterId)) { + case -1376502443: + case 278118624: { + if (input.isAtField(FieldNames.eventId)) { if (!input.trySkipNullValue()) { - monsterId = input.readUInt32(); + eventId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -414,9 +414,9 @@ public final class SceneNpcMonsterInfoOuterClass { static class FieldNames { static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName eventId = FieldName.forField("eventId", "event_id"); - static final FieldName monsterId = FieldName.forField("monsterId", "monster_id"); + + static final FieldName eventId = FieldName.forField("eventId", "event_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java index 5583854..3376d7a 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class ScenePlaneEventScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_list = 12; */ private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance(); @@ -34,7 +34,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_list = 12; * @return whether the getItemList field is set */ public boolean hasGetItemList() { @@ -42,7 +42,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_list = 12; * @return this */ public ScenePlaneEventScNotify clearGetItemList() { @@ -52,7 +52,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_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. @@ -66,7 +66,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_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 @@ -80,7 +80,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 7; + * optional .ItemList get_item_list = 12; * @param value the getItemList to set * @return this */ @@ -150,7 +150,7 @@ public final class ScenePlaneEventScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 98); output.writeMessageNoTag(getItemList); } } @@ -171,7 +171,7 @@ public final class ScenePlaneEventScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 98: { // getItemList input.readMessage(getItemList); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java index 2ef968d..df77219 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.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.RepeatedString; public final class ScenePropInfoOuterClass { /** @@ -19,30 +20,35 @@ public final class ScenePropInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 1; + * optional uint64 create_time_ms = 2; */ private long createTimeMs; /** - * optional uint32 prop_id = 5; - */ - private int propId; - - /** - * optional uint32 life_time_ms = 6; + * optional uint32 life_time_ms = 4; */ private int lifeTimeMs; /** - * optional uint32 prop_state = 11; + * optional uint32 prop_id = 6; + */ + private int propId; + + /** + * optional uint32 prop_state = 9; */ private int propState; /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 7; */ private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance(); + /** + * repeated string trigger_name_list = 15; + */ + private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); + private ScenePropInfo() { } @@ -54,7 +60,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 1; + * optional uint64 create_time_ms = 2; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -62,7 +68,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 1; + * optional uint64 create_time_ms = 2; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -72,7 +78,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 1; + * optional uint64 create_time_ms = 2; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -80,7 +86,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 1; + * optional uint64 create_time_ms = 2; * @param value the createTimeMs to set * @return this */ @@ -91,62 +97,25 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 5; - * @return whether the propId field is set + * optional uint32 life_time_ms = 4; + * @return whether the lifeTimeMs field is set */ - public boolean hasPropId() { + public boolean hasLifeTimeMs() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 prop_id = 5; - * @return this - */ - public ScenePropInfo clearPropId() { - bitField0_ &= ~0x00000002; - propId = 0; - return this; - } - - /** - * optional uint32 prop_id = 5; - * @return the propId - */ - public int getPropId() { - return propId; - } - - /** - * optional uint32 prop_id = 5; - * @param value the propId to set - * @return this - */ - public ScenePropInfo setPropId(final int value) { - bitField0_ |= 0x00000002; - propId = value; - return this; - } - - /** - * optional uint32 life_time_ms = 6; - * @return whether the lifeTimeMs field is set - */ - public boolean hasLifeTimeMs() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 life_time_ms = 6; + * optional uint32 life_time_ms = 4; * @return this */ public ScenePropInfo clearLifeTimeMs() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; lifeTimeMs = 0; return this; } /** - * optional uint32 life_time_ms = 6; + * optional uint32 life_time_ms = 4; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -154,18 +123,55 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 6; + * optional uint32 life_time_ms = 4; * @param value the lifeTimeMs to set * @return this */ public ScenePropInfo setLifeTimeMs(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; lifeTimeMs = value; return this; } /** - * optional uint32 prop_state = 11; + * optional uint32 prop_id = 6; + * @return whether the propId field is set + */ + public boolean hasPropId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 prop_id = 6; + * @return this + */ + public ScenePropInfo clearPropId() { + bitField0_ &= ~0x00000004; + propId = 0; + return this; + } + + /** + * optional uint32 prop_id = 6; + * @return the propId + */ + public int getPropId() { + return propId; + } + + /** + * optional uint32 prop_id = 6; + * @param value the propId to set + * @return this + */ + public ScenePropInfo setPropId(final int value) { + bitField0_ |= 0x00000004; + propId = value; + return this; + } + + /** + * optional uint32 prop_state = 9; * @return whether the propState field is set */ public boolean hasPropState() { @@ -173,7 +179,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 11; + * optional uint32 prop_state = 9; * @return this */ public ScenePropInfo clearPropState() { @@ -183,7 +189,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 11; + * optional uint32 prop_state = 9; * @return the propState */ public int getPropState() { @@ -191,7 +197,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 11; + * optional uint32 prop_state = 9; * @param value the propState to set * @return this */ @@ -202,7 +208,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 7; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -210,7 +216,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 7; * @return this */ public ScenePropInfo clearExtraInfo() { @@ -220,7 +226,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_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. @@ -234,7 +240,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_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 @@ -248,7 +254,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 15; + * optional .PropExtraInfo extra_info = 7; * @param value the extraInfo to set * @return this */ @@ -258,16 +264,85 @@ public final class ScenePropInfoOuterClass { return this; } + /** + * repeated string trigger_name_list = 15; + * @return whether the triggerNameList field is set + */ + public boolean hasTriggerNameList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated string trigger_name_list = 15; + * @return this + */ + public ScenePropInfo clearTriggerNameList() { + bitField0_ &= ~0x00000020; + triggerNameList.clear(); + return this; + } + + /** + * repeated string trigger_name_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 #getMutableTriggerNameList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedString getTriggerNameList() { + return triggerNameList; + } + + /** + * repeated string trigger_name_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 RepeatedString getMutableTriggerNameList() { + bitField0_ |= 0x00000020; + return triggerNameList; + } + + /** + * repeated string trigger_name_list = 15; + * @param value the triggerNameList to add + * @return this + */ + public ScenePropInfo addTriggerNameList(final CharSequence value) { + bitField0_ |= 0x00000020; + triggerNameList.add(value); + return this; + } + + /** + * repeated string trigger_name_list = 15; + * @param values the triggerNameList to add + * @return this + */ + public ScenePropInfo addAllTriggerNameList(final CharSequence... values) { + bitField0_ |= 0x00000020; + triggerNameList.addAll(values); + return this; + } + @Override public ScenePropInfo copyFrom(final ScenePropInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - propId = other.propId; lifeTimeMs = other.lifeTimeMs; + propId = other.propId; propState = other.propState; extraInfo.copyFrom(other.extraInfo); + triggerNameList.copyFrom(other.triggerNameList); } return this; } @@ -281,18 +356,21 @@ public final class ScenePropInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasPropId()) { - setPropId(other.propId); - } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } + if (other.hasPropId()) { + setPropId(other.propId); + } if (other.hasPropState()) { setPropState(other.propState); } if (other.hasExtraInfo()) { getMutableExtraInfo().mergeFrom(other.extraInfo); } + if (other.hasTriggerNameList()) { + getMutableTriggerNameList().addAll(other.triggerNameList); + } return this; } @@ -304,10 +382,11 @@ public final class ScenePropInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - propId = 0; lifeTimeMs = 0; + propId = 0; propState = 0; extraInfo.clear(); + triggerNameList.clear(); return this; } @@ -319,6 +398,7 @@ public final class ScenePropInfoOuterClass { cachedSize = -1; bitField0_ = 0; extraInfo.clearQuick(); + triggerNameList.clear(); return this; } @@ -333,34 +413,41 @@ public final class ScenePropInfoOuterClass { ScenePropInfo other = (ScenePropInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasPropId() || propId == other.propId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) + && (!hasPropId() || propId == other.propId) && (!hasPropState() || propState == other.propState) - && (!hasExtraInfo() || extraInfo.equals(other.extraInfo)); + && (!hasExtraInfo() || extraInfo.equals(other.extraInfo)) + && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(propId); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(lifeTimeMs); + output.writeUInt32NoTag(propId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeMessageNoTag(extraInfo); } + if ((bitField0_ & 0x00000020) != 0) { + for (int i = 0; i < triggerNameList.length(); i++) { + output.writeRawByte((byte) 122); + output.writeStringNoTag(triggerNameList.get(i)); + } + } } @Override @@ -370,10 +457,10 @@ public final class ScenePropInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lifeTimeMs); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); @@ -381,6 +468,9 @@ public final class ScenePropInfoOuterClass { if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(extraInfo); } + if ((bitField0_ & 0x00000020) != 0) { + size += (1 * triggerNameList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(triggerNameList); + } return size; } @@ -391,18 +481,18 @@ public final class ScenePropInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { - // propId - propId = input.readUInt32(); + case 32: { + // lifeTimeMs + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 48) { @@ -410,28 +500,36 @@ public final class ScenePropInfoOuterClass { } } case 48: { - // lifeTimeMs - lifeTimeMs = input.readUInt32(); + // propId + propId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // propState propState = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // extraInfo + input.readMessage(extraInfo); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 122) { break; } } case 122: { - // extraInfo - input.readMessage(extraInfo); - bitField0_ |= 0x00000010; - tag = input.readTag(); + // triggerNameList + tag = input.readRepeatedString(triggerNameList, tag); + bitField0_ |= 0x00000020; if (tag != 0) { break; } @@ -457,10 +555,10 @@ public final class ScenePropInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propId, propId); + output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lifeTimeMs, lifeTimeMs); + output.writeUInt32(FieldNames.propId, propId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.propState, propState); @@ -468,6 +566,9 @@ public final class ScenePropInfoOuterClass { if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.extraInfo, extraInfo); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRepeatedString(FieldNames.triggerNameList, triggerNameList); + } output.endObject(); } @@ -490,11 +591,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -979804194: - case -309137545: { - if (input.isAtField(FieldNames.propId)) { + case -1226028177: + case 1665182229: { + if (input.isAtField(FieldNames.lifeTimeMs)) { if (!input.trySkipNullValue()) { - propId = input.readUInt32(); + lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -502,11 +603,11 @@ public final class ScenePropInfoOuterClass { } break; } - case -1226028177: - case 1665182229: { - if (input.isAtField(FieldNames.lifeTimeMs)) { + case -979804194: + case -309137545: { + if (input.isAtField(FieldNames.propId)) { if (!input.trySkipNullValue()) { - lifeTimeMs = input.readUInt32(); + propId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -538,6 +639,18 @@ public final class ScenePropInfoOuterClass { } break; } + case -110500959: + case -107587573: { + if (input.isAtField(FieldNames.triggerNameList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedString(triggerNameList); + bitField0_ |= 0x00000020; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -592,13 +705,15 @@ public final class ScenePropInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName propId = FieldName.forField("propId", "prop_id"); - static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); + static final FieldName propId = FieldName.forField("propId", "prop_id"); + static final FieldName propState = FieldName.forField("propState", "prop_state"); static final FieldName extraInfo = FieldName.forField("extraInfo", "extra_info"); + + static final FieldName triggerNameList = FieldName.forField("triggerNameList", "trigger_name_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java index b66e896..62c4cb3 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -20,44 +20,44 @@ public final class SceneSummonUnitInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 12; */ private long createTimeMs; /** * 
-     *  caster_entity_id
+     *  KADBHDIAEOE
      *
* - * optional uint32 summon_unit_id = 5; - */ - private int summonUnitId; - - /** - * 
-     *  attach_entity_id
-     *
- * - * optional uint32 caster_entity_id = 6; + * optional uint32 caster_entity_id = 4; */ private int casterEntityId; /** * 
-     *  summon_unit_id
+     *  GEOEIBPBPLA
      *
* - * optional uint32 attach_entity_id = 9; + * optional uint32 attach_entity_id = 10; */ private int attachEntityId; /** - * optional sint32 life_time_ms = 14; + * 
+     *  GEEKOBFDDCK summon_unit_id
+     *
+ * + * optional uint32 summon_unit_id = 14; + */ + private int summonUnitId; + + /** + * optional sint32 life_time_ms = 15; */ private int lifeTimeMs; /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 6; */ private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); @@ -72,7 +72,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 12; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -80,7 +80,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 12; * @return this */ public SceneSummonUnitInfo clearCreateTimeMs() { @@ -90,7 +90,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 12; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -98,7 +98,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 2; + * optional uint64 create_time_ms = 12; * @param value the createTimeMs to set * @return this */ @@ -110,89 +110,36 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  KADBHDIAEOE
      *
* - * optional uint32 summon_unit_id = 5; - * @return whether the summonUnitId field is set + * optional uint32 caster_entity_id = 4; + * @return whether the casterEntityId field is set */ - public boolean hasSummonUnitId() { + public boolean hasCasterEntityId() { return (bitField0_ & 0x00000002) != 0; } /** * 
-     *  caster_entity_id
+     *  KADBHDIAEOE
      *
* - * optional uint32 summon_unit_id = 5; - * @return this - */ - public SceneSummonUnitInfo clearSummonUnitId() { - bitField0_ &= ~0x00000002; - summonUnitId = 0; - return this; - } - - /** - * 
-     *  caster_entity_id
-     *
- * - * optional uint32 summon_unit_id = 5; - * @return the summonUnitId - */ - public int getSummonUnitId() { - return summonUnitId; - } - - /** - * 
-     *  caster_entity_id
-     *
- * - * optional uint32 summon_unit_id = 5; - * @param value the summonUnitId to set - * @return this - */ - public SceneSummonUnitInfo setSummonUnitId(final int value) { - bitField0_ |= 0x00000002; - summonUnitId = value; - return this; - } - - /** - * 
-     *  attach_entity_id
-     *
- * - * optional uint32 caster_entity_id = 6; - * @return whether the casterEntityId field is set - */ - public boolean hasCasterEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  attach_entity_id
-     *
- * - * optional uint32 caster_entity_id = 6; + * optional uint32 caster_entity_id = 4; * @return this */ public SceneSummonUnitInfo clearCasterEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; casterEntityId = 0; return this; } /** * 
-     *  attach_entity_id
+     *  KADBHDIAEOE
      *
* - * optional uint32 caster_entity_id = 6; + * optional uint32 caster_entity_id = 4; * @return the casterEntityId */ public int getCasterEntityId() { @@ -201,51 +148,51 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  attach_entity_id
+     *  KADBHDIAEOE
      *
* - * optional uint32 caster_entity_id = 6; + * optional uint32 caster_entity_id = 4; * @param value the casterEntityId to set * @return this */ public SceneSummonUnitInfo setCasterEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; casterEntityId = value; return this; } /** * 
-     *  summon_unit_id
+     *  GEOEIBPBPLA
      *
* - * optional uint32 attach_entity_id = 9; + * optional uint32 attach_entity_id = 10; * @return whether the attachEntityId field is set */ public boolean hasAttachEntityId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** * 
-     *  summon_unit_id
+     *  GEOEIBPBPLA
      *
* - * optional uint32 attach_entity_id = 9; + * optional uint32 attach_entity_id = 10; * @return this */ public SceneSummonUnitInfo clearAttachEntityId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; attachEntityId = 0; return this; } /** * 
-     *  summon_unit_id
+     *  GEOEIBPBPLA
      *
* - * optional uint32 attach_entity_id = 9; + * optional uint32 attach_entity_id = 10; * @return the attachEntityId */ public int getAttachEntityId() { @@ -254,21 +201,74 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  summon_unit_id
+     *  GEOEIBPBPLA
      *
* - * optional uint32 attach_entity_id = 9; + * optional uint32 attach_entity_id = 10; * @param value the attachEntityId to set * @return this */ public SceneSummonUnitInfo setAttachEntityId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; attachEntityId = value; return this; } /** - * optional sint32 life_time_ms = 14; + * 
+     *  GEEKOBFDDCK summon_unit_id
+     *
+ * + * optional uint32 summon_unit_id = 14; + * @return whether the summonUnitId field is set + */ + public boolean hasSummonUnitId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * 
+     *  GEEKOBFDDCK summon_unit_id
+     *
+ * + * optional uint32 summon_unit_id = 14; + * @return this + */ + public SceneSummonUnitInfo clearSummonUnitId() { + bitField0_ &= ~0x00000008; + summonUnitId = 0; + return this; + } + + /** + * 
+     *  GEEKOBFDDCK summon_unit_id
+     *
+ * + * optional uint32 summon_unit_id = 14; + * @return the summonUnitId + */ + public int getSummonUnitId() { + return summonUnitId; + } + + /** + * 
+     *  GEEKOBFDDCK summon_unit_id
+     *
+ * + * optional uint32 summon_unit_id = 14; + * @param value the summonUnitId to set + * @return this + */ + public SceneSummonUnitInfo setSummonUnitId(final int value) { + bitField0_ |= 0x00000008; + summonUnitId = value; + return this; + } + + /** + * optional sint32 life_time_ms = 15; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -276,7 +276,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 14; + * optional sint32 life_time_ms = 15; * @return this */ public SceneSummonUnitInfo clearLifeTimeMs() { @@ -286,7 +286,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 14; + * optional sint32 life_time_ms = 15; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -294,7 +294,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 14; + * optional sint32 life_time_ms = 15; * @param value the lifeTimeMs to set * @return this */ @@ -305,7 +305,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 6; * @return whether the triggerNameList field is set */ public boolean hasTriggerNameList() { @@ -313,7 +313,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 6; * @return this */ public SceneSummonUnitInfo clearTriggerNameList() { @@ -323,7 +323,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_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. @@ -337,7 +337,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_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 @@ -351,7 +351,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 6; * @param value the triggerNameList to add * @return this */ @@ -362,7 +362,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 15; + * repeated string trigger_name_list = 6; * @param values the triggerNameList to add * @return this */ @@ -378,9 +378,9 @@ public final class SceneSummonUnitInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; createTimeMs = other.createTimeMs; - summonUnitId = other.summonUnitId; casterEntityId = other.casterEntityId; attachEntityId = other.attachEntityId; + summonUnitId = other.summonUnitId; lifeTimeMs = other.lifeTimeMs; triggerNameList.copyFrom(other.triggerNameList); } @@ -396,15 +396,15 @@ public final class SceneSummonUnitInfoOuterClass { if (other.hasCreateTimeMs()) { setCreateTimeMs(other.createTimeMs); } - if (other.hasSummonUnitId()) { - setSummonUnitId(other.summonUnitId); - } if (other.hasCasterEntityId()) { setCasterEntityId(other.casterEntityId); } if (other.hasAttachEntityId()) { setAttachEntityId(other.attachEntityId); } + if (other.hasSummonUnitId()) { + setSummonUnitId(other.summonUnitId); + } if (other.hasLifeTimeMs()) { setLifeTimeMs(other.lifeTimeMs); } @@ -422,9 +422,9 @@ public final class SceneSummonUnitInfoOuterClass { cachedSize = -1; bitField0_ = 0; createTimeMs = 0L; - summonUnitId = 0; casterEntityId = 0; attachEntityId = 0; + summonUnitId = 0; lifeTimeMs = 0; triggerNameList.clear(); return this; @@ -452,9 +452,9 @@ public final class SceneSummonUnitInfoOuterClass { SceneSummonUnitInfo other = (SceneSummonUnitInfo) o; return bitField0_ == other.bitField0_ && (!hasCreateTimeMs() || createTimeMs == other.createTimeMs) - && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) && (!hasCasterEntityId() || casterEntityId == other.casterEntityId) && (!hasAttachEntityId() || attachEntityId == other.attachEntityId) + && (!hasSummonUnitId() || summonUnitId == other.summonUnitId) && (!hasLifeTimeMs() || lifeTimeMs == other.lifeTimeMs) && (!hasTriggerNameList() || triggerNameList.equals(other.triggerNameList)); } @@ -462,28 +462,28 @@ public final class SceneSummonUnitInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(casterEntityId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attachEntityId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 112); + output.writeUInt32NoTag(summonUnitId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < triggerNameList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeStringNoTag(triggerNameList.get(i)); } } @@ -496,14 +496,14 @@ public final class SceneSummonUnitInfoOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(casterEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(attachEntityId); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(summonUnitId); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(lifeTimeMs); } @@ -520,52 +520,52 @@ public final class SceneSummonUnitInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 96: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 32) { break; } } - case 40: { - // summonUnitId - summonUnitId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 32: { // casterEntityId casterEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { + case 80: { // attachEntityId attachEntityId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 112) { break; } } case 112: { + // summonUnitId + summonUnitId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // lifeTimeMs lifeTimeMs = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // triggerNameList tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; @@ -594,14 +594,14 @@ public final class SceneSummonUnitInfoOuterClass { output.writeUInt64(FieldNames.createTimeMs, createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.summonUnitId, summonUnitId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.casterEntityId, casterEntityId); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.attachEntityId, attachEntityId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.summonUnitId, summonUnitId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeSInt32(FieldNames.lifeTimeMs, lifeTimeMs); } @@ -630,24 +630,12 @@ public final class SceneSummonUnitInfoOuterClass { } break; } - case 43438592: - case 1094873176: { - if (input.isAtField(FieldNames.summonUnitId)) { - if (!input.trySkipNullValue()) { - summonUnitId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1831162710: case -1550367068: { if (input.isAtField(FieldNames.casterEntityId)) { if (!input.trySkipNullValue()) { casterEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -659,6 +647,18 @@ public final class SceneSummonUnitInfoOuterClass { if (input.isAtField(FieldNames.attachEntityId)) { if (!input.trySkipNullValue()) { attachEntityId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 43438592: + case 1094873176: { + if (input.isAtField(FieldNames.summonUnitId)) { + if (!input.trySkipNullValue()) { + summonUnitId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -745,12 +745,12 @@ public final class SceneSummonUnitInfoOuterClass { static class FieldNames { static final FieldName createTimeMs = FieldName.forField("createTimeMs", "create_time_ms"); - static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id"); - static final FieldName casterEntityId = FieldName.forField("casterEntityId", "caster_entity_id"); static final FieldName attachEntityId = FieldName.forField("attachEntityId", "attach_entity_id"); + static final FieldName summonUnitId = FieldName.forField("summonUnitId", "summon_unit_id"); + static final FieldName lifeTimeMs = FieldName.forField("lifeTimeMs", "life_time_ms"); static final FieldName triggerNameList = FieldName.forField("triggerNameList", "trigger_name_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java index 6000cf1..abb6fea 100644 --- a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SearchPlayerCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_list = 7; */ private final RepeatedInt searchUidList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_list = 7; * @return whether the searchUidList field is set */ public boolean hasSearchUidList() { @@ -43,7 +43,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_list = 7; * @return this */ public SearchPlayerCsReq clearSearchUidList() { @@ -53,7 +53,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_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. @@ -67,7 +67,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_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 @@ -81,7 +81,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_list = 7; * @param value the searchUidList to add * @return this */ @@ -92,7 +92,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 6; + * repeated uint32 search_uid_list = 7; * @param values the searchUidList to add * @return this */ @@ -163,7 +163,7 @@ public final class SearchPlayerCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < searchUidList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(searchUidList.array()[i]); } } @@ -185,7 +185,7 @@ public final class SearchPlayerCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 58: { // searchUidList [packed=true] input.readPackedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class SearchPlayerCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 56: { // searchUidList [packed=false] tag = input.readRepeatedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java index 9c29edc..cd57701 100644 --- a/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SearchPlayerScRspOuterClass.java @@ -20,12 +20,12 @@ public final class SearchPlayerScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; */ private int retcode; /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_list = 15; */ private final RepeatedMessage searchResultList = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return this */ public SearchPlayerScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_list = 15; * @return whether the searchResultList field is set */ public boolean hasSearchResultList() { @@ -85,7 +85,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_list = 15; * @return this */ public SearchPlayerScRsp clearSearchResultList() { @@ -95,7 +95,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_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. @@ -109,7 +109,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_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 @@ -123,7 +123,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_list = 15; * @param value the searchResultList to add * @return this */ @@ -134,7 +134,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 9; + * repeated .SimpleInfo search_result_list = 15; * @param values the searchResultList to add * @return this */ @@ -211,12 +211,12 @@ public final class SearchPlayerScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < searchResultList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(searchResultList.get(i)); } } @@ -241,16 +241,16 @@ public final class SearchPlayerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // searchResultList tag = input.readRepeatedMessage(searchResultList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java index fe885d0..7b87f47 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SelectChatBubbleCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 9; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 9; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 9; * @return this */ public SelectChatBubbleCsReq clearBubbleId() { @@ -52,7 +52,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 9; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 10; + * optional uint32 bubble_id = 9; * @param value the bubbleId to set * @return this */ @@ -129,7 +129,7 @@ public final class SelectChatBubbleCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class SelectChatBubbleCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java index a7ca006..7fc1b33 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java @@ -19,15 +19,20 @@ public final class SelectChatBubbleScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_chat_bubble = 3; - */ - private int curChatBubble; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; */ private int retcode; + /** + * optional uint32 BDDJODIMMGO = 6; + */ + private int bDDJODIMMGO; + + /** + * optional uint32 cur_chat_bubble = 15; + */ + private int curChatBubble; + private SelectChatBubbleScRsp() { } @@ -39,62 +44,25 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 3; - * @return whether the curChatBubble field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasCurChatBubble() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_chat_bubble = 3; - * @return this - */ - public SelectChatBubbleScRsp clearCurChatBubble() { - bitField0_ &= ~0x00000001; - curChatBubble = 0; - return this; - } - - /** - * optional uint32 cur_chat_bubble = 3; - * @return the curChatBubble - */ - public int getCurChatBubble() { - return curChatBubble; - } - - /** - * optional uint32 cur_chat_bubble = 3; - * @param value the curChatBubble to set - * @return this - */ - public SelectChatBubbleScRsp setCurChatBubble(final int value) { - bitField0_ |= 0x00000001; - curChatBubble = value; - return this; - } - - /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return this */ public SelectChatBubbleScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -102,23 +70,98 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public SelectChatBubbleScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 BDDJODIMMGO = 6; + * @return whether the bDDJODIMMGO field is set + */ + public boolean hasBDDJODIMMGO() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 BDDJODIMMGO = 6; + * @return this + */ + public SelectChatBubbleScRsp clearBDDJODIMMGO() { + bitField0_ &= ~0x00000002; + bDDJODIMMGO = 0; + return this; + } + + /** + * optional uint32 BDDJODIMMGO = 6; + * @return the bDDJODIMMGO + */ + public int getBDDJODIMMGO() { + return bDDJODIMMGO; + } + + /** + * optional uint32 BDDJODIMMGO = 6; + * @param value the bDDJODIMMGO to set + * @return this + */ + public SelectChatBubbleScRsp setBDDJODIMMGO(final int value) { + bitField0_ |= 0x00000002; + bDDJODIMMGO = value; + return this; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return whether the curChatBubble field is set + */ + public boolean hasCurChatBubble() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return this + */ + public SelectChatBubbleScRsp clearCurChatBubble() { + bitField0_ &= ~0x00000004; + curChatBubble = 0; + return this; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @return the curChatBubble + */ + public int getCurChatBubble() { + return curChatBubble; + } + + /** + * optional uint32 cur_chat_bubble = 15; + * @param value the curChatBubble to set + * @return this + */ + public SelectChatBubbleScRsp setCurChatBubble(final int value) { + bitField0_ |= 0x00000004; + curChatBubble = value; + return this; + } + @Override public SelectChatBubbleScRsp copyFrom(final SelectChatBubbleScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curChatBubble = other.curChatBubble; retcode = other.retcode; + bDDJODIMMGO = other.bDDJODIMMGO; + curChatBubble = other.curChatBubble; } return this; } @@ -129,12 +172,15 @@ public final class SelectChatBubbleScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCurChatBubble()) { - setCurChatBubble(other.curChatBubble); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasBDDJODIMMGO()) { + setBDDJODIMMGO(other.bDDJODIMMGO); + } + if (other.hasCurChatBubble()) { + setCurChatBubble(other.curChatBubble); + } return this; } @@ -145,8 +191,9 @@ public final class SelectChatBubbleScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - curChatBubble = 0; retcode = 0; + bDDJODIMMGO = 0; + curChatBubble = 0; return this; } @@ -170,19 +217,24 @@ public final class SelectChatBubbleScRspOuterClass { } SelectChatBubbleScRsp other = (SelectChatBubbleScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasBDDJODIMMGO() || bDDJODIMMGO == other.bDDJODIMMGO) + && (!hasCurChatBubble() || curChatBubble == other.curChatBubble); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curChatBubble); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(bDDJODIMMGO); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(curChatBubble); } } @@ -190,10 +242,13 @@ public final class SelectChatBubbleScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bDDJODIMMGO); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } return size; } @@ -205,19 +260,28 @@ public final class SelectChatBubbleScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // curChatBubble - curChatBubble = input.readUInt32(); + case 16: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // bDDJODIMMGO + bDDJODIMMGO = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + // curChatBubble + curChatBubble = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -241,10 +305,13 @@ public final class SelectChatBubbleScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.bDDJODIMMGO, bDDJODIMMGO); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } output.endObject(); } @@ -256,11 +323,10 @@ public final class SelectChatBubbleScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94167140: - case 1828957140: { - if (input.isAtField(FieldNames.curChatBubble)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curChatBubble = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +334,10 @@ public final class SelectChatBubbleScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 2063288404: { + if (input.isAtField(FieldNames.bDDJODIMMGO)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + bDDJODIMMGO = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -279,6 +345,18 @@ public final class SelectChatBubbleScRspOuterClass { } break; } + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { + if (!input.trySkipNullValue()) { + curChatBubble = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -332,9 +410,11 @@ public final class SelectChatBubbleScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName bDDJODIMMGO = FieldName.forField("BDDJODIMMGO"); + + static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java index 80be496..ec0e39e 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SelectPhoneThemeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 theme_id = 1; + * optional uint32 theme_id = 8; */ private int themeId; @@ -34,7 +34,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 1; + * optional uint32 theme_id = 8; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 1; + * optional uint32 theme_id = 8; * @return this */ public SelectPhoneThemeCsReq clearThemeId() { @@ -52,7 +52,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 1; + * optional uint32 theme_id = 8; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class SelectPhoneThemeCsReqOuterClass { } /** - * optional uint32 theme_id = 1; + * optional uint32 theme_id = 8; * @param value the themeId to set * @return this */ @@ -129,7 +129,7 @@ public final class SelectPhoneThemeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class SelectPhoneThemeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 64: { // themeId themeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java index 8033616..f4d6519 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java @@ -18,13 +18,18 @@ public final class SelectPhoneThemeScRspOuterClass { public static final class SelectPhoneThemeScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 NNKFBKLCDDF = 3; + */ + private int nNKFBKLCDDF; + /** * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 9; */ private int curPhoneTheme; @@ -38,12 +43,49 @@ public final class SelectPhoneThemeScRspOuterClass { return new SelectPhoneThemeScRsp(); } + /** + * optional uint32 NNKFBKLCDDF = 3; + * @return whether the nNKFBKLCDDF field is set + */ + public boolean hasNNKFBKLCDDF() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 NNKFBKLCDDF = 3; + * @return this + */ + public SelectPhoneThemeScRsp clearNNKFBKLCDDF() { + bitField0_ &= ~0x00000001; + nNKFBKLCDDF = 0; + return this; + } + + /** + * optional uint32 NNKFBKLCDDF = 3; + * @return the nNKFBKLCDDF + */ + public int getNNKFBKLCDDF() { + return nNKFBKLCDDF; + } + + /** + * optional uint32 NNKFBKLCDDF = 3; + * @param value the nNKFBKLCDDF to set + * @return this + */ + public SelectPhoneThemeScRsp setNNKFBKLCDDF(final int value) { + bitField0_ |= 0x00000001; + nNKFBKLCDDF = value; + return this; + } + /** * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +93,7 @@ public final class SelectPhoneThemeScRspOuterClass { * @return this */ public SelectPhoneThemeScRsp clearRetcode() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; retcode = 0; return this; } @@ -70,31 +112,31 @@ public final class SelectPhoneThemeScRspOuterClass { * @return this */ public SelectPhoneThemeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 9; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 9; * @return this */ public SelectPhoneThemeScRsp clearCurPhoneTheme() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; curPhoneTheme = 0; return this; } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 9; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -102,12 +144,12 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 14; + * optional uint32 cur_phone_theme = 9; * @param value the curPhoneTheme to set * @return this */ public SelectPhoneThemeScRsp setCurPhoneTheme(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; curPhoneTheme = value; return this; } @@ -117,6 +159,7 @@ public final class SelectPhoneThemeScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + nNKFBKLCDDF = other.nNKFBKLCDDF; retcode = other.retcode; curPhoneTheme = other.curPhoneTheme; } @@ -129,6 +172,9 @@ public final class SelectPhoneThemeScRspOuterClass { return this; } cachedSize = -1; + if (other.hasNNKFBKLCDDF()) { + setNNKFBKLCDDF(other.nNKFBKLCDDF); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -145,6 +191,7 @@ public final class SelectPhoneThemeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + nNKFBKLCDDF = 0; retcode = 0; curPhoneTheme = 0; return this; @@ -170,6 +217,7 @@ public final class SelectPhoneThemeScRspOuterClass { } SelectPhoneThemeScRsp other = (SelectPhoneThemeScRsp) o; return bitField0_ == other.bitField0_ + && (!hasNNKFBKLCDDF() || nNKFBKLCDDF == other.nNKFBKLCDDF) && (!hasRetcode() || retcode == other.retcode) && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme); } @@ -177,11 +225,15 @@ public final class SelectPhoneThemeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(nNKFBKLCDDF); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(curPhoneTheme); } } @@ -190,9 +242,12 @@ public final class SelectPhoneThemeScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(nNKFBKLCDDF); } if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); } return size; @@ -205,19 +260,28 @@ public final class SelectPhoneThemeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); + case 24: { + // nNKFBKLCDDF + nNKFBKLCDDF = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 56) { break; } } - case 112: { + case 56: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // curPhoneTheme curPhoneTheme = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +305,12 @@ public final class SelectPhoneThemeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.nNKFBKLCDDF, nNKFBKLCDDF); } if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); } output.endObject(); @@ -256,11 +323,22 @@ public final class SelectPhoneThemeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -883757877: { + if (input.isAtField(FieldNames.nNKFBKLCDDF)) { + if (!input.trySkipNullValue()) { + nNKFBKLCDDF = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -272,7 +350,7 @@ public final class SelectPhoneThemeScRspOuterClass { if (input.isAtField(FieldNames.curPhoneTheme)) { if (!input.trySkipNullValue()) { curPhoneTheme = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -332,6 +410,8 @@ public final class SelectPhoneThemeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName nNKFBKLCDDF = FieldName.forField("NNKFBKLCDDF"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index 91851e5..4896fa1 100644 --- a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class SellItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool to_material = 5; + * optional bool to_material = 6; */ private boolean toMaterial; /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_list = 7; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 5; + * optional bool to_material = 6; * @return whether the toMaterial field is set */ public boolean hasToMaterial() { @@ -47,7 +47,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 5; + * optional bool to_material = 6; * @return this */ public SellItemCsReq clearToMaterial() { @@ -57,7 +57,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 5; + * optional bool to_material = 6; * @return the toMaterial */ public boolean getToMaterial() { @@ -65,7 +65,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 5; + * optional bool to_material = 6; * @param value the toMaterial to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_list = 7; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_list = 7; * @return this */ public SellItemCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 15; + * optional .ItemCostList item_cost_list = 7; * @param value the itemCostList to set * @return this */ @@ -198,11 +198,11 @@ public final class SellItemCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeBoolNoTag(toMaterial); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class SellItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // toMaterial toMaterial = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { + case 58: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java index f85bec5..82b9b79 100644 --- a/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SellItemScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SellItemScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_list = 4; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_list = 4; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -84,7 +84,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_list = 4; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_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. @@ -108,7 +108,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_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 @@ -122,7 +122,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 11; + * optional .ItemList return_item_list = 4; * @param value the returnItemList to set * @return this */ @@ -198,11 +198,11 @@ public final class SellItemScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public final class SellItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 34) { break; } } - case 90: { + case 34: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java index 74cc808..5e857ac 100644 --- a/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SendMsgCsReqOuterClass.java @@ -21,27 +21,27 @@ public final class SendMsgCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 emote = 11; + * optional uint32 emote = 12; */ private int emote; /** - * optional .MsgType msg_type = 7; - */ - private int msgType; - - /** - * optional .ChatType chat_type = 12; + * optional .ChatType chat_type = 3; */ private int chatType; /** - * optional string text = 2; + * optional .MsgType msg_type = 8; + */ + private int msgType; + + /** + * optional string text = 7; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 11; */ private final RepeatedInt toUidList = RepeatedInt.newEmptyInstance(); @@ -56,7 +56,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 12; * @return whether the emote field is set */ public boolean hasEmote() { @@ -64,7 +64,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 12; * @return this */ public SendMsgCsReq clearEmote() { @@ -74,7 +74,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 12; * @return the emote */ public int getEmote() { @@ -82,7 +82,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 12; * @param value the emote to set * @return this */ @@ -93,87 +93,25 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .MsgType msg_type = 7; - * @return whether the msgType field is set + * optional .ChatType chat_type = 3; + * @return whether the chatType field is set */ - public boolean hasMsgType() { + public boolean hasChatType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .MsgType msg_type = 7; - * @return this - */ - public SendMsgCsReq clearMsgType() { - bitField0_ &= ~0x00000002; - msgType = 0; - return this; - } - - /** - * optional .MsgType msg_type = 7; - * @return the msgType - */ - public MsgTypeOuterClass.MsgType getMsgType() { - return MsgTypeOuterClass.MsgType.forNumber(msgType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link SendMsgCsReq#getMsgType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getMsgTypeValue() { - return msgType; - } - - /** - * 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 MsgTypeOuterClass.MsgType}. Setting an invalid value - * can cause {@link SendMsgCsReq#getMsgType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public SendMsgCsReq setMsgTypeValue(final int value) { - bitField0_ |= 0x00000002; - msgType = value; - return this; - } - - /** - * optional .MsgType msg_type = 7; - * @param value the msgType to set - * @return this - */ - public SendMsgCsReq setMsgType(final MsgTypeOuterClass.MsgType value) { - bitField0_ |= 0x00000002; - msgType = value.getNumber(); - return this; - } - - /** - * optional .ChatType chat_type = 12; - * @return whether the chatType field is set - */ - public boolean hasChatType() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .ChatType chat_type = 12; + * optional .ChatType chat_type = 3; * @return this */ public SendMsgCsReq clearChatType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; chatType = 0; return this; } /** - * optional .ChatType chat_type = 12; + * optional .ChatType chat_type = 3; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -200,24 +138,86 @@ public final class SendMsgCsReqOuterClass { * @return this */ public SendMsgCsReq setChatTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; chatType = value; return this; } /** - * optional .ChatType chat_type = 12; + * optional .ChatType chat_type = 3; * @param value the chatType to set * @return this */ public SendMsgCsReq setChatType(final ChatTypeOuterClass.ChatType value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; chatType = value.getNumber(); return this; } /** - * optional string text = 2; + * optional .MsgType msg_type = 8; + * @return whether the msgType field is set + */ + public boolean hasMsgType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .MsgType msg_type = 8; + * @return this + */ + public SendMsgCsReq clearMsgType() { + bitField0_ &= ~0x00000004; + msgType = 0; + return this; + } + + /** + * optional .MsgType msg_type = 8; + * @return the msgType + */ + public MsgTypeOuterClass.MsgType getMsgType() { + return MsgTypeOuterClass.MsgType.forNumber(msgType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SendMsgCsReq#getMsgType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getMsgTypeValue() { + return msgType; + } + + /** + * 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 MsgTypeOuterClass.MsgType}. Setting an invalid value + * can cause {@link SendMsgCsReq#getMsgType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SendMsgCsReq setMsgTypeValue(final int value) { + bitField0_ |= 0x00000004; + msgType = value; + return this; + } + + /** + * optional .MsgType msg_type = 8; + * @param value the msgType to set + * @return this + */ + public SendMsgCsReq setMsgType(final MsgTypeOuterClass.MsgType value) { + bitField0_ |= 0x00000004; + msgType = value.getNumber(); + return this; + } + + /** + * optional string text = 7; * @return whether the text field is set */ public boolean hasText() { @@ -225,7 +225,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @return this */ public SendMsgCsReq clearText() { @@ -235,7 +235,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @return the text */ public String getText() { @@ -243,7 +243,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -251,7 +251,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -260,7 +260,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @param value the text to set * @return this */ @@ -271,7 +271,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional string text = 2; + * optional string text = 7; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 11; * @return whether the toUidList field is set */ public boolean hasToUidList() { @@ -290,7 +290,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 11; * @return this */ public SendMsgCsReq clearToUidList() { @@ -300,7 +300,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 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. @@ -314,7 +314,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 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 @@ -328,7 +328,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 11; * @param value the toUidList to add * @return this */ @@ -339,7 +339,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 15; + * repeated uint32 to_uid_list = 11; * @param values the toUidList to add * @return this */ @@ -355,8 +355,8 @@ public final class SendMsgCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; emote = other.emote; - msgType = other.msgType; chatType = other.chatType; + msgType = other.msgType; text.copyFrom(other.text); toUidList.copyFrom(other.toUidList); } @@ -372,12 +372,12 @@ public final class SendMsgCsReqOuterClass { if (other.hasEmote()) { setEmote(other.emote); } - if (other.hasMsgType()) { - setMsgTypeValue(other.msgType); - } if (other.hasChatType()) { setChatTypeValue(other.chatType); } + if (other.hasMsgType()) { + setMsgTypeValue(other.msgType); + } if (other.hasText()) { getMutableTextBytes().copyFrom(other.text); } @@ -395,8 +395,8 @@ public final class SendMsgCsReqOuterClass { cachedSize = -1; bitField0_ = 0; emote = 0; - msgType = 0; chatType = 0; + msgType = 0; text.clear(); toUidList.clear(); return this; @@ -425,8 +425,8 @@ public final class SendMsgCsReqOuterClass { SendMsgCsReq other = (SendMsgCsReq) o; return bitField0_ == other.bitField0_ && (!hasEmote() || emote == other.emote) - && (!hasMsgType() || msgType == other.msgType) && (!hasChatType() || chatType == other.chatType) + && (!hasMsgType() || msgType == other.msgType) && (!hasText() || text.equals(other.text)) && (!hasToUidList() || toUidList.equals(other.toUidList)); } @@ -434,24 +434,24 @@ public final class SendMsgCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(msgType); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeEnumNoTag(chatType); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeEnumNoTag(msgType); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 58); output.writeStringNoTag(text); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUidList.length(); i++) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(toUidList.array()[i]); } } @@ -464,10 +464,10 @@ public final class SendMsgCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); + size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); + size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(text); @@ -485,49 +485,49 @@ public final class SendMsgCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 96: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 24) { break; } } - case 56: { - // msgType - final int value = input.readInt32(); - if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { - msgType = value; - bitField0_ |= 0x00000002; - } - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 24: { // chatType final int value = input.readInt32(); if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { chatType = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 18) { + if (tag != 64) { break; } } - case 18: { + case 64: { + // msgType + final int value = input.readInt32(); + if (MsgTypeOuterClass.MsgType.forNumber(value) != null) { + msgType = value; + bitField0_ |= 0x00000004; + } + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // text input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // toUidList [packed=true] input.readPackedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public final class SendMsgCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 88: { // toUidList [packed=false] tag = input.readRepeatedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -563,10 +563,10 @@ public final class SendMsgCsReqOuterClass { output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); + output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); } if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); + output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); } if ((bitField0_ & 0x00000008) != 0) { output.writeString(FieldNames.text, text); @@ -595,13 +595,13 @@ public final class SendMsgCsReqOuterClass { } break; } - case 1343750747: - case -1283380936: { - if (input.isAtField(FieldNames.msgType)) { + case 1437412018: + case 1620118465: { + if (input.isAtField(FieldNames.chatType)) { if (!input.trySkipNullValue()) { - final MsgTypeOuterClass.MsgType value = input.readEnum(MsgTypeOuterClass.MsgType.converter()); + final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter()); if (value != null) { - msgType = value.getNumber(); + chatType = value.getNumber(); bitField0_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -612,13 +612,13 @@ public final class SendMsgCsReqOuterClass { } break; } - case 1437412018: - case 1620118465: { - if (input.isAtField(FieldNames.chatType)) { + case 1343750747: + case -1283380936: { + if (input.isAtField(FieldNames.msgType)) { if (!input.trySkipNullValue()) { - final ChatTypeOuterClass.ChatType value = input.readEnum(ChatTypeOuterClass.ChatType.converter()); + final MsgTypeOuterClass.MsgType value = input.readEnum(MsgTypeOuterClass.MsgType.converter()); if (value != null) { - chatType = value.getNumber(); + msgType = value.getNumber(); bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -706,10 +706,10 @@ public final class SendMsgCsReqOuterClass { static class FieldNames { static final FieldName emote = FieldName.forField("emote"); - static final FieldName msgType = FieldName.forField("msgType", "msg_type"); - static final FieldName chatType = FieldName.forField("chatType", "chat_type"); + static final FieldName msgType = FieldName.forField("msgType", "msg_type"); + static final FieldName text = FieldName.forField("text"); static final FieldName toUidList = FieldName.forField("toUidList", "to_uid_list"); diff --git a/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java b/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java index e1d0496..dfaf9d3 100644 --- a/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ServerPrefsOuterClass.java @@ -20,12 +20,12 @@ public final class ServerPrefsOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 server_prefs_id = 4; + * optional uint32 server_prefs_id = 12; */ private int serverPrefsId; /** - * optional bytes data = 9; + * optional bytes data = 15; */ private final RepeatedByte data = RepeatedByte.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 4; + * optional uint32 server_prefs_id = 12; * @return whether the serverPrefsId field is set */ public boolean hasServerPrefsId() { @@ -48,7 +48,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 4; + * optional uint32 server_prefs_id = 12; * @return this */ public ServerPrefs clearServerPrefsId() { @@ -58,7 +58,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 4; + * optional uint32 server_prefs_id = 12; * @return the serverPrefsId */ public int getServerPrefsId() { @@ -66,7 +66,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 4; + * optional uint32 server_prefs_id = 12; * @param value the serverPrefsId to set * @return this */ @@ -77,7 +77,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 15; * @return whether the data field is set */ public boolean hasData() { @@ -85,7 +85,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 15; * @return this */ public ServerPrefs clearData() { @@ -95,7 +95,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 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. @@ -109,7 +109,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 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 @@ -123,7 +123,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 15; * @param value the data to add * @return this */ @@ -134,7 +134,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 15; * @param values the data to add * @return this */ @@ -145,7 +145,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 9; + * optional bytes data = 15; * @param values the data to set * @return this */ @@ -221,11 +221,11 @@ public final class ServerPrefsOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeBytesNoTag(data); } } @@ -249,16 +249,16 @@ public final class ServerPrefsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 96: { // serverPrefsId serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // data input.readBytes(data); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetAssistAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAssistAvatarCsReqOuterClass.java index c5686aa..cfb1f41 100644 --- a/src/generated/main/emu/lunarcore/proto/SetAssistAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetAssistAvatarCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class SetAssistAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 10; + * optional uint32 avatar_id = 2; */ private int avatarId; /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 10; */ private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 10; + * optional uint32 avatar_id = 2; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -48,7 +48,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 10; + * optional uint32 avatar_id = 2; * @return this */ public SetAssistAvatarCsReq clearAvatarId() { @@ -58,7 +58,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 10; + * optional uint32 avatar_id = 2; * @return the avatarId */ public int getAvatarId() { @@ -66,7 +66,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 10; + * optional uint32 avatar_id = 2; * @param value the avatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 10; * @return whether the avatarIdList field is set */ public boolean hasAvatarIdList() { @@ -85,7 +85,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 10; * @return this */ public SetAssistAvatarCsReq clearAvatarIdList() { @@ -95,7 +95,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 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. @@ -109,7 +109,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 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 @@ -123,7 +123,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 10; * @param value the avatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 14; + * repeated uint32 avatar_id_list = 10; * @param values the avatarIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class SetAssistAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < avatarIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(avatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class SetAssistAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 82) { break; } } - case 114: { + case 82: { // avatarIdList [packed=true] input.readPackedUInt32(avatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class SetAssistAvatarCsReqOuterClass { tag = input.readTag(); break; } - case 112: { + case 80: { // avatarIdList [packed=false] tag = input.readRepeatedUInt32(avatarIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java index 0f6f9b2..a1e72d7 100644 --- a/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetAssistAvatarScRspOuterClass.java @@ -20,17 +20,17 @@ public final class SetAssistAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 avatar_id = 12; + * optional uint32 avatar_id = 9; */ private int avatarId; /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_list = 7; */ private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return this */ public SetAssistAvatarScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 12; + * optional uint32 avatar_id = 9; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -90,7 +90,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 12; + * optional uint32 avatar_id = 9; * @return this */ public SetAssistAvatarScRsp clearAvatarId() { @@ -100,7 +100,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 12; + * optional uint32 avatar_id = 9; * @return the avatarId */ public int getAvatarId() { @@ -108,7 +108,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 12; + * optional uint32 avatar_id = 9; * @param value the avatarId to set * @return this */ @@ -119,7 +119,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_list = 7; * @return whether the avatarIdList field is set */ public boolean hasAvatarIdList() { @@ -127,7 +127,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_list = 7; * @return this */ public SetAssistAvatarScRsp clearAvatarIdList() { @@ -137,7 +137,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_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. @@ -151,7 +151,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_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 @@ -165,7 +165,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_list = 7; * @param value the avatarIdList to add * @return this */ @@ -176,7 +176,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 1; + * repeated uint32 avatar_id_list = 7; * @param values the avatarIdList to add * @return this */ @@ -258,16 +258,16 @@ public final class SetAssistAvatarScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(avatarIdList.array()[i]); } } @@ -295,25 +295,25 @@ public final class SetAssistAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { + case 72: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 58) { break; } } - case 10: { + case 58: { // avatarIdList [packed=true] input.readPackedUInt32(avatarIdList, tag); bitField0_ |= 0x00000004; @@ -332,7 +332,7 @@ public final class SetAssistAvatarScRspOuterClass { tag = input.readTag(); break; } - case 8: { + case 56: { // avatarIdList [packed=false] tag = input.readRepeatedUInt32(avatarIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java new file mode 100644 index 0000000..1554386 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetAvatarPathCsReqOuterClass.java @@ -0,0 +1,294 @@ +// 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 SetAvatarPathCsReqOuterClass { + /** + * Protobuf type {@code SetAvatarPathCsReq} + */ + public static final class SetAvatarPathCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .MultiPathAvatarType avatar_id = 7; + */ + private int avatarId; + + private SetAvatarPathCsReq() { + } + + /** + * @return a new empty instance of {@code SetAvatarPathCsReq} + */ + public static SetAvatarPathCsReq newInstance() { + return new SetAvatarPathCsReq(); + } + + /** + * optional .MultiPathAvatarType avatar_id = 7; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .MultiPathAvatarType avatar_id = 7; + * @return this + */ + public SetAvatarPathCsReq clearAvatarId() { + bitField0_ &= ~0x00000001; + avatarId = 0; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 7; + * @return the avatarId + */ + public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() { + return MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(avatarId); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SetAvatarPathCsReq#getAvatarId()}.getNumber(). + * + * @return numeric wire representation + */ + public int getAvatarIdValue() { + return avatarId; + } + + /** + * 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 MultiPathAvatarTypeOuterClass.MultiPathAvatarType}. Setting an invalid value + * can cause {@link SetAvatarPathCsReq#getAvatarId()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SetAvatarPathCsReq setAvatarIdValue(final int value) { + bitField0_ |= 0x00000001; + avatarId = value; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 7; + * @param value the avatarId to set + * @return this + */ + public SetAvatarPathCsReq setAvatarId( + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value) { + bitField0_ |= 0x00000001; + avatarId = value.getNumber(); + return this; + } + + @Override + public SetAvatarPathCsReq copyFrom(final SetAvatarPathCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + avatarId = other.avatarId; + } + return this; + } + + @Override + public SetAvatarPathCsReq mergeFrom(final SetAvatarPathCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasAvatarId()) { + setAvatarIdValue(other.avatarId); + } + return this; + } + + @Override + public SetAvatarPathCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + avatarId = 0; + return this; + } + + @Override + public SetAvatarPathCsReq 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 SetAvatarPathCsReq)) { + return false; + } + SetAvatarPathCsReq other = (SetAvatarPathCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasAvatarId() || avatarId == other.avatarId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 56); + output.writeEnumNoTag(avatarId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetAvatarPathCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 56: { + // avatarId + final int value = input.readInt32(); + if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { + avatarId = value; + bitField0_ |= 0x00000001; + } + 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.writeEnum(FieldNames.avatarId, avatarId, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + } + output.endObject(); + } + + @Override + public SetAvatarPathCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value = input.readEnum(MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + if (value != null) { + avatarId = value.getNumber(); + bitField0_ |= 0x00000001; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetAvatarPathCsReq clone() { + return new SetAvatarPathCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetAvatarPathCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetAvatarPathCsReq(), data).checkInitialized(); + } + + public static SetAvatarPathCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetAvatarPathCsReq(), input).checkInitialized(); + } + + public static SetAvatarPathCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetAvatarPathCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SetAvatarPathCsReq messages + */ + public static MessageFactory getFactory() { + return SetAvatarPathCsReqFactory.INSTANCE; + } + + private enum SetAvatarPathCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SetAvatarPathCsReq create() { + return SetAvatarPathCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java new file mode 100644 index 0000000..50bafe1 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetAvatarPathScRspOuterClass.java @@ -0,0 +1,374 @@ +// 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 SetAvatarPathScRspOuterClass { + /** + * Protobuf type {@code SetAvatarPathScRsp} + */ + public static final class SetAvatarPathScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 10; + */ + private int retcode; + + /** + * optional .MultiPathAvatarType avatar_id = 9; + */ + private int avatarId; + + private SetAvatarPathScRsp() { + } + + /** + * @return a new empty instance of {@code SetAvatarPathScRsp} + */ + public static SetAvatarPathScRsp newInstance() { + return new SetAvatarPathScRsp(); + } + + /** + * optional uint32 retcode = 10; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public SetAvatarPathScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 10; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 10; + * @param value the retcode to set + * @return this + */ + public SetAvatarPathScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 9; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .MultiPathAvatarType avatar_id = 9; + * @return this + */ + public SetAvatarPathScRsp clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 9; + * @return the avatarId + */ + public MultiPathAvatarTypeOuterClass.MultiPathAvatarType getAvatarId() { + return MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(avatarId); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SetAvatarPathScRsp#getAvatarId()}.getNumber(). + * + * @return numeric wire representation + */ + public int getAvatarIdValue() { + return avatarId; + } + + /** + * 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 MultiPathAvatarTypeOuterClass.MultiPathAvatarType}. Setting an invalid value + * can cause {@link SetAvatarPathScRsp#getAvatarId()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SetAvatarPathScRsp setAvatarIdValue(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + + /** + * optional .MultiPathAvatarType avatar_id = 9; + * @param value the avatarId to set + * @return this + */ + public SetAvatarPathScRsp setAvatarId( + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value) { + bitField0_ |= 0x00000002; + avatarId = value.getNumber(); + return this; + } + + @Override + public SetAvatarPathScRsp copyFrom(final SetAvatarPathScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + avatarId = other.avatarId; + } + return this; + } + + @Override + public SetAvatarPathScRsp mergeFrom(final SetAvatarPathScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasAvatarId()) { + setAvatarIdValue(other.avatarId); + } + return this; + } + + @Override + public SetAvatarPathScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + avatarId = 0; + return this; + } + + @Override + public SetAvatarPathScRsp 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 SetAvatarPathScRsp)) { + return false; + } + SetAvatarPathScRsp other = (SetAvatarPathScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasAvatarId() || avatarId == other.avatarId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeEnumNoTag(avatarId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetAvatarPathScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // avatarId + final int value = input.readInt32(); + if (MultiPathAvatarTypeOuterClass.MultiPathAvatarType.forNumber(value) != null) { + avatarId = value; + bitField0_ |= 0x00000002; + } + 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.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeEnum(FieldNames.avatarId, avatarId, MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + } + output.endObject(); + } + + @Override + public SetAvatarPathScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { + if (!input.trySkipNullValue()) { + final MultiPathAvatarTypeOuterClass.MultiPathAvatarType value = input.readEnum(MultiPathAvatarTypeOuterClass.MultiPathAvatarType.converter()); + if (value != null) { + avatarId = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetAvatarPathScRsp clone() { + return new SetAvatarPathScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetAvatarPathScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetAvatarPathScRsp(), data).checkInitialized(); + } + + public static SetAvatarPathScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetAvatarPathScRsp(), input).checkInitialized(); + } + + public static SetAvatarPathScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetAvatarPathScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SetAvatarPathScRsp messages + */ + public static MessageFactory getFactory() { + return SetAvatarPathScRspFactory.INSTANCE; + } + + private enum SetAvatarPathScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SetAvatarPathScRsp create() { + return SetAvatarPathScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index 50cfb15..fc4e222 100644 --- a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetClientPausedCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional bool paused = 2; + * optional bool paused = 11; */ private boolean paused; @@ -34,7 +34,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 2; + * optional bool paused = 11; * @return whether the paused field is set */ public boolean hasPaused() { @@ -42,7 +42,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 2; + * optional bool paused = 11; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 2; + * optional bool paused = 11; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 2; + * optional bool paused = 11; * @param value the paused to set * @return this */ @@ -129,7 +129,7 @@ public final class SetClientPausedCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 88); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public final class SetClientPausedCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 88: { // paused paused = input.readBool(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java index f17e1f8..b8f2ea8 100644 --- a/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetClientPausedScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SetClientPausedScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional bool paused = 1; + * optional bool paused = 8; */ private boolean paused; @@ -39,7 +39,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 8; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 8; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 8; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 1; + * optional bool paused = 8; * @param value the paused to set * @return this */ @@ -177,11 +177,11 @@ public final class SetClientPausedScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public final class SetClientPausedScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 64) { break; } } - case 8: { + case 64: { // paused paused = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarCsReqOuterClass.java index 8249831..0ce668f 100644 --- a/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SetDisplayAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_avatar_list = 7; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -35,7 +35,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_avatar_list = 7; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -43,7 +43,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_avatar_list = 7; * @return this */ public SetDisplayAvatarCsReq clearDisplayAvatarList() { @@ -53,7 +53,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_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. @@ -67,7 +67,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_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 @@ -81,7 +81,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_avatar_list = 7; * @param value the displayAvatarList to add * @return this */ @@ -93,7 +93,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 10; + * repeated .DisplayAvatar display_avatar_list = 7; * @param values the displayAvatarList to add * @return this */ @@ -165,7 +165,7 @@ public final class SetDisplayAvatarCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 58); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -187,7 +187,7 @@ public final class SetDisplayAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 58: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarScRspOuterClass.java index d79bcbc..7c0647c 100644 --- a/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetDisplayAvatarScRspOuterClass.java @@ -20,12 +20,12 @@ public final class SetDisplayAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 2; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 3; * @return this */ public SetDisplayAvatarScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 2; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 2; * @return this */ public SetDisplayAvatarScRsp clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 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. @@ -109,7 +109,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 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 @@ -123,7 +123,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 2; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 15; + * repeated .DisplayAvatar display_avatar_list = 2; * @param values the displayAvatarList to add * @return this */ @@ -212,12 +212,12 @@ public final class SetDisplayAvatarScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 18); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class SetDisplayAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 18) { break; } } - case 122: { + case 18: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java index c1083c8..e8fc65d 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 birthday = 2; + * optional uint32 birthday = 3; */ private int birthday; @@ -34,7 +34,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 2; + * optional uint32 birthday = 3; * @return whether the birthday field is set */ public boolean hasBirthday() { @@ -42,7 +42,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 2; + * optional uint32 birthday = 3; * @return this */ public SetGameplayBirthdayCsReq clearBirthday() { @@ -52,7 +52,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 2; + * optional uint32 birthday = 3; * @return the birthday */ public int getBirthday() { @@ -60,7 +60,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 2; + * optional uint32 birthday = 3; * @param value the birthday to set * @return this */ @@ -129,7 +129,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(birthday); } } @@ -150,7 +150,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // birthday birthday = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java index 2487be6..23fa976 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGameplayBirthdayScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SetGameplayBirthdayScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 birthday = 8; - */ - private int birthday; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; */ private int retcode; + /** + * optional uint32 birthday = 11; + */ + private int birthday; + private SetGameplayBirthdayScRsp() { } @@ -39,62 +39,25 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 birthday = 8; - * @return whether the birthday field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasBirthday() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 birthday = 8; - * @return this - */ - public SetGameplayBirthdayScRsp clearBirthday() { - bitField0_ &= ~0x00000001; - birthday = 0; - return this; - } - - /** - * optional uint32 birthday = 8; - * @return the birthday - */ - public int getBirthday() { - return birthday; - } - - /** - * optional uint32 birthday = 8; - * @param value the birthday to set - * @return this - */ - public SetGameplayBirthdayScRsp setBirthday(final int value) { - bitField0_ |= 0x00000001; - birthday = value; - return this; - } - - /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return this */ public SetGameplayBirthdayScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public SetGameplayBirthdayScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 birthday = 11; + * @return whether the birthday field is set + */ + public boolean hasBirthday() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 birthday = 11; + * @return this + */ + public SetGameplayBirthdayScRsp clearBirthday() { + bitField0_ &= ~0x00000002; + birthday = 0; + return this; + } + + /** + * optional uint32 birthday = 11; + * @return the birthday + */ + public int getBirthday() { + return birthday; + } + + /** + * optional uint32 birthday = 11; + * @param value the birthday to set + * @return this + */ + public SetGameplayBirthdayScRsp setBirthday(final int value) { + bitField0_ |= 0x00000002; + birthday = value; + return this; + } + @Override public SetGameplayBirthdayScRsp copyFrom(final SetGameplayBirthdayScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - birthday = other.birthday; retcode = other.retcode; + birthday = other.birthday; } return this; } @@ -129,12 +129,12 @@ public final class SetGameplayBirthdayScRspOuterClass { return this; } cachedSize = -1; - if (other.hasBirthday()) { - setBirthday(other.birthday); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasBirthday()) { + setBirthday(other.birthday); + } return this; } @@ -145,8 +145,8 @@ public final class SetGameplayBirthdayScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - birthday = 0; retcode = 0; + birthday = 0; return this; } @@ -170,19 +170,19 @@ public final class SetGameplayBirthdayScRspOuterClass { } SetGameplayBirthdayScRsp other = (SetGameplayBirthdayScRsp) o; return bitField0_ == other.bitField0_ - && (!hasBirthday() || birthday == other.birthday) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasBirthday() || birthday == other.birthday); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(birthday); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(birthday); } } @@ -190,10 +190,10 @@ public final class SetGameplayBirthdayScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); } return size; } @@ -205,18 +205,18 @@ public final class SetGameplayBirthdayScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // birthday - birthday = input.readUInt32(); + case 48: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { - // retcode - retcode = input.readUInt32(); + case 88: { + // birthday + birthday = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SetGameplayBirthdayScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.birthday, birthday); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.birthday, birthday); } output.endObject(); } @@ -256,10 +256,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1069376125: { - if (input.isAtField(FieldNames.birthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - birthday = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1069376125: { + if (input.isAtField(FieldNames.birthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + birthday = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class SetGameplayBirthdayScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName birthday = FieldName.forField("birthday"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName birthday = FieldName.forField("birthday"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java index 3336cb5..693efe3 100644 --- a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java @@ -19,20 +19,20 @@ public final class SetGroupCustomSaveDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 group_id = 7; - */ - private int groupId; - - /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; */ private int entryId; + /** + * optional uint32 group_id = 14; + */ + private int groupId; + private SetGroupCustomSaveDataScRsp() { } @@ -44,7 +44,7 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return this */ public SetGroupCustomSaveDataScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -81,62 +81,25 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 group_id = 7; - * @return whether the groupId field is set + * optional uint32 entry_id = 7; + * @return whether the entryId field is set */ - public boolean hasGroupId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 group_id = 7; - * @return this - */ - public SetGroupCustomSaveDataScRsp clearGroupId() { - bitField0_ &= ~0x00000002; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 7; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 7; - * @param value the groupId to set - * @return this - */ - public SetGroupCustomSaveDataScRsp setGroupId(final int value) { - bitField0_ |= 0x00000002; - groupId = value; - return this; - } - - /** - * optional uint32 entry_id = 13; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @return this */ public SetGroupCustomSaveDataScRsp clearEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entryId = 0; return this; } /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @return the entryId */ public int getEntryId() { @@ -144,24 +107,61 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } /** - * optional uint32 entry_id = 13; + * optional uint32 entry_id = 7; * @param value the entryId to set * @return this */ public SetGroupCustomSaveDataScRsp setEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entryId = value; return this; } + /** + * optional uint32 group_id = 14; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 group_id = 14; + * @return this + */ + public SetGroupCustomSaveDataScRsp clearGroupId() { + bitField0_ &= ~0x00000004; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 14; + * @param value the groupId to set + * @return this + */ + public SetGroupCustomSaveDataScRsp setGroupId(final int value) { + bitField0_ |= 0x00000004; + groupId = value; + return this; + } + @Override public SetGroupCustomSaveDataScRsp copyFrom(final SetGroupCustomSaveDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - groupId = other.groupId; entryId = other.entryId; + groupId = other.groupId; } return this; } @@ -175,12 +175,12 @@ public final class SetGroupCustomSaveDataScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasEntryId()) { setEntryId(other.entryId); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } return this; } @@ -192,8 +192,8 @@ public final class SetGroupCustomSaveDataScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - groupId = 0; entryId = 0; + groupId = 0; return this; } @@ -218,23 +218,23 @@ public final class SetGroupCustomSaveDataScRspOuterClass { SetGroupCustomSaveDataScRsp other = (SetGroupCustomSaveDataScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasGroupId() || groupId == other.groupId) - && (!hasEntryId() || entryId == other.entryId); + && (!hasEntryId() || entryId == other.entryId) + && (!hasGroupId() || groupId == other.groupId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 56); - output.writeUInt32NoTag(groupId); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(entryId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(groupId); } } @@ -245,10 +245,10 @@ public final class SetGroupCustomSaveDataScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } return size; } @@ -260,7 +260,7 @@ public final class SetGroupCustomSaveDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -270,17 +270,17 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } } case 56: { - // groupId - groupId = input.readUInt32(); + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 112) { break; } } - case 104: { - // entryId - entryId = input.readUInt32(); + case 112: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class SetGroupCustomSaveDataScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.groupId, groupId); } output.endObject(); } @@ -334,11 +334,11 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -346,11 +346,11 @@ public final class SetGroupCustomSaveDataScRspOuterClass { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -414,9 +414,9 @@ public final class SetGroupCustomSaveDataScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index 22cef88..f0a935f 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetHeadIconCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 8; + * optional uint32 id = 2; */ private int id; @@ -34,7 +34,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 2; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 2; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 2; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 2; * @param value the id to set * @return this */ @@ -129,7 +129,7 @@ public final class SetHeadIconCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class SetHeadIconCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 16: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java index e1bfe20..0f6e291 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SetHeadIconScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; - */ - private int retcode; - - /** - * optional uint32 current_head_icon_id = 14; + * optional uint32 current_head_icon_id = 2; */ private int currentHeadIconId; + /** + * optional uint32 retcode = 13; + */ + private int retcode; + private SetHeadIconScRsp() { } @@ -39,62 +39,25 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 retcode = 9; - * @return whether the retcode field is set + * optional uint32 current_head_icon_id = 2; + * @return whether the currentHeadIconId field is set */ - public boolean hasRetcode() { + public boolean hasCurrentHeadIconId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 9; - * @return this - */ - public SetHeadIconScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 9; - * @param value the retcode to set - * @return this - */ - public SetHeadIconScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 current_head_icon_id = 14; - * @return whether the currentHeadIconId field is set - */ - public boolean hasCurrentHeadIconId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 current_head_icon_id = 14; + * optional uint32 current_head_icon_id = 2; * @return this */ public SetHeadIconScRsp clearCurrentHeadIconId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; currentHeadIconId = 0; return this; } /** - * optional uint32 current_head_icon_id = 14; + * optional uint32 current_head_icon_id = 2; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -102,23 +65,60 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 14; + * optional uint32 current_head_icon_id = 2; * @param value the currentHeadIconId to set * @return this */ public SetHeadIconScRsp setCurrentHeadIconId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; currentHeadIconId = value; return this; } + /** + * optional uint32 retcode = 13; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 13; + * @return this + */ + public SetHeadIconScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 13; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 13; + * @param value the retcode to set + * @return this + */ + public SetHeadIconScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SetHeadIconScRsp copyFrom(final SetHeadIconScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; currentHeadIconId = other.currentHeadIconId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SetHeadIconScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurrentHeadIconId()) { setCurrentHeadIconId(other.currentHeadIconId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SetHeadIconScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; currentHeadIconId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SetHeadIconScRspOuterClass { } SetHeadIconScRsp other = (SetHeadIconScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId); + && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(currentHeadIconId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SetHeadIconScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(currentHeadIconId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class SetHeadIconScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // retcode - retcode = input.readUInt32(); + case 16: { + // currentHeadIconId + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // currentHeadIconId - currentHeadIconId = input.readUInt32(); + case 104: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SetHeadIconScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.currentHeadIconId, currentHeadIconId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class SetHeadIconScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 2107487181: + case -1003133880: { + if (input.isAtField(FieldNames.currentHeadIconId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class SetHeadIconScRspOuterClass { } break; } - case 2107487181: - case -1003133880: { - if (input.isAtField(FieldNames.currentHeadIconId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - currentHeadIconId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class SetHeadIconScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName currentHeadIconId = FieldName.forField("currentHeadIconId", "current_head_icon_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java index 6c66b2c..4171cf2 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class SetLineupNameCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 5; + * optional uint32 index = 9; */ private int index; /** - * optional string name = 13; + * optional string name = 2; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 5; + * optional uint32 index = 9; * @return whether the index field is set */ public boolean hasIndex() { @@ -48,7 +48,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 5; + * optional uint32 index = 9; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 5; + * optional uint32 index = 9; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 5; + * optional uint32 index = 9; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 13; + * optional string name = 2; * @param value the name to set * @return this */ @@ -207,11 +207,11 @@ public final class SetLineupNameCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 18); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public final class SetLineupNameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 72: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 18) { break; } } - case 106: { + case 18: { // name input.readString(name); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java index 649900a..867a394 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java @@ -19,18 +19,18 @@ public final class SetLineupNameScRspOuterClass { public static final class SetLineupNameScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 index = 4; - */ - private int index; - /** * optional uint32 retcode = 5; */ private int retcode; /** - * optional string name = 10; + * optional uint32 index = 9; + */ + private int index; + + /** + * optional string name = 8; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -44,49 +44,12 @@ public final class SetLineupNameScRspOuterClass { return new SetLineupNameScRsp(); } - /** - * optional uint32 index = 4; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 index = 4; - * @return this - */ - public SetLineupNameScRsp clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 4; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 4; - * @param value the index to set - * @return this - */ - public SetLineupNameScRsp setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - /** * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -94,7 +57,7 @@ public final class SetLineupNameScRspOuterClass { * @return this */ public SetLineupNameScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } @@ -113,13 +76,50 @@ public final class SetLineupNameScRspOuterClass { * @return this */ public SetLineupNameScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional string name = 10; + * optional uint32 index = 9; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 index = 9; + * @return this + */ + public SetLineupNameScRsp clearIndex() { + bitField0_ &= ~0x00000002; + index = 0; + return this; + } + + /** + * optional uint32 index = 9; + * @return the index + */ + public int getIndex() { + return index; + } + + /** + * optional uint32 index = 9; + * @param value the index to set + * @return this + */ + public SetLineupNameScRsp setIndex(final int value) { + bitField0_ |= 0x00000002; + index = value; + return this; + } + + /** + * optional string name = 8; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 10; + * optional string name = 8; * @param value the name to set * @return this */ @@ -188,8 +188,8 @@ public final class SetLineupNameScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; retcode = other.retcode; + index = other.index; name.copyFrom(other.name); } return this; @@ -201,12 +201,12 @@ public final class SetLineupNameScRspOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasName()) { getMutableNameBytes().copyFrom(other.name); } @@ -220,8 +220,8 @@ public final class SetLineupNameScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; retcode = 0; + index = 0; name.clear(); return this; } @@ -247,23 +247,23 @@ public final class SetLineupNameScRspOuterClass { } SetLineupNameScRsp other = (SetLineupNameScRsp) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) && (!hasRetcode() || retcode == other.retcode) + && (!hasIndex() || index == other.index) && (!hasName() || name.equals(other.name)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(index); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 66); output.writeStringNoTag(name); } } @@ -272,10 +272,10 @@ public final class SetLineupNameScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(name); @@ -290,25 +290,25 @@ public final class SetLineupNameScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 72) { break; } } - case 82: { + case 72: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // name input.readString(name); bitField0_ |= 0x00000004; @@ -335,10 +335,10 @@ public final class SetLineupNameScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000004) != 0) { output.writeString(FieldNames.name, name); @@ -353,10 +353,10 @@ public final class SetLineupNameScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -364,10 +364,10 @@ public final class SetLineupNameScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -439,10 +439,10 @@ public final class SetLineupNameScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName index = FieldName.forField("index"); + static final FieldName name = FieldName.forField("name"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java index 3c1cb8d..7b2a1f9 100644 --- a/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetNicknameCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SetNicknameCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional string nickname = 12; + * optional string nickname = 15; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -43,7 +43,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @return this */ public SetNicknameCsReq clearNickname() { @@ -53,7 +53,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @return the nickname */ public String getNickname() { @@ -61,7 +61,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -69,7 +69,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -78,7 +78,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @param value the nickname to set * @return this */ @@ -89,7 +89,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 12; + * optional string nickname = 15; * @param value the nickname to set * @return this */ @@ -159,7 +159,7 @@ public final class SetNicknameCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeStringNoTag(nickname); } } @@ -180,7 +180,7 @@ public final class SetNicknameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 122: { // nickname input.readString(nickname); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java index 1f44d2e..7d70254 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class SetSignatureCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional string signature = 11; + * optional string signature = 14; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 11; + * optional string signature = 14; * @param value the signature to set * @return this */ @@ -159,7 +159,7 @@ public final class SetSignatureCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 114); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public final class SetSignatureCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 114: { // signature input.readString(signature); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java index 8bf6ab2..a2fffcb 100644 --- a/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetSignatureScRspOuterClass.java @@ -20,12 +20,12 @@ public final class SetSignatureScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional string signature = 4; + * optional string signature = 7; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 4; + * optional string signature = 7; * @param value the signature to set * @return this */ @@ -207,11 +207,11 @@ public final class SetSignatureScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 58); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public final class SetSignatureScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { + case 58: { // signature input.readString(signature); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java index 0662ee1..2697692 100644 --- a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java @@ -20,7 +20,7 @@ public final class ShopOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 6; */ private long beginTime; @@ -30,27 +30,27 @@ public final class ShopOuterClass { private long endTime; /** - * optional uint64 city_taken_level_reward = 4; + * optional uint64 city_taken_level_reward = 2; */ private long cityTakenLevelReward; /** - * optional uint32 city_exp = 2; - */ - private int cityExp; - - /** - * optional uint32 city_level = 8; + * optional uint32 city_level = 5; */ private int cityLevel; + /** + * optional uint32 city_exp = 7; + */ + private int cityExp; + /** * optional uint32 shop_id = 14; */ private int shopId; /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_list = 8; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -65,7 +65,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 6; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -73,7 +73,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 6; * @return this */ public Shop clearBeginTime() { @@ -83,7 +83,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 6; * @return the beginTime */ public long getBeginTime() { @@ -91,7 +91,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 10; + * optional int64 begin_time = 6; * @param value the beginTime to set * @return this */ @@ -139,7 +139,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 4; + * optional uint64 city_taken_level_reward = 2; * @return whether the cityTakenLevelReward field is set */ public boolean hasCityTakenLevelReward() { @@ -147,7 +147,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 4; + * optional uint64 city_taken_level_reward = 2; * @return this */ public Shop clearCityTakenLevelReward() { @@ -157,7 +157,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 4; + * optional uint64 city_taken_level_reward = 2; * @return the cityTakenLevelReward */ public long getCityTakenLevelReward() { @@ -165,7 +165,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 4; + * optional uint64 city_taken_level_reward = 2; * @param value the cityTakenLevelReward to set * @return this */ @@ -176,62 +176,25 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 2; - * @return whether the cityExp field is set + * optional uint32 city_level = 5; + * @return whether the cityLevel field is set */ - public boolean hasCityExp() { + public boolean hasCityLevel() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 city_exp = 2; - * @return this - */ - public Shop clearCityExp() { - bitField0_ &= ~0x00000008; - cityExp = 0; - return this; - } - - /** - * optional uint32 city_exp = 2; - * @return the cityExp - */ - public int getCityExp() { - return cityExp; - } - - /** - * optional uint32 city_exp = 2; - * @param value the cityExp to set - * @return this - */ - public Shop setCityExp(final int value) { - bitField0_ |= 0x00000008; - cityExp = value; - return this; - } - - /** - * optional uint32 city_level = 8; - * @return whether the cityLevel field is set - */ - public boolean hasCityLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 city_level = 8; + * optional uint32 city_level = 5; * @return this */ public Shop clearCityLevel() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; cityLevel = 0; return this; } /** - * optional uint32 city_level = 8; + * optional uint32 city_level = 5; * @return the cityLevel */ public int getCityLevel() { @@ -239,16 +202,53 @@ public final class ShopOuterClass { } /** - * optional uint32 city_level = 8; + * optional uint32 city_level = 5; * @param value the cityLevel to set * @return this */ public Shop setCityLevel(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; cityLevel = value; return this; } + /** + * optional uint32 city_exp = 7; + * @return whether the cityExp field is set + */ + public boolean hasCityExp() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 city_exp = 7; + * @return this + */ + public Shop clearCityExp() { + bitField0_ &= ~0x00000010; + cityExp = 0; + return this; + } + + /** + * optional uint32 city_exp = 7; + * @return the cityExp + */ + public int getCityExp() { + return cityExp; + } + + /** + * optional uint32 city_exp = 7; + * @param value the cityExp to set + * @return this + */ + public Shop setCityExp(final int value) { + bitField0_ |= 0x00000010; + cityExp = value; + return this; + } + /** * optional uint32 shop_id = 14; * @return whether the shopId field is set @@ -287,7 +287,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_list = 8; * @return whether the goodsList field is set */ public boolean hasGoodsList() { @@ -295,7 +295,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_list = 8; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_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. @@ -319,7 +319,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_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 @@ -333,7 +333,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_list = 8; * @param value the goodsList to add * @return this */ @@ -344,7 +344,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 9; + * repeated .Goods goods_list = 8; * @param values the goodsList to add * @return this */ @@ -362,8 +362,8 @@ public final class ShopOuterClass { beginTime = other.beginTime; endTime = other.endTime; cityTakenLevelReward = other.cityTakenLevelReward; - cityExp = other.cityExp; cityLevel = other.cityLevel; + cityExp = other.cityExp; shopId = other.shopId; goodsList.copyFrom(other.goodsList); } @@ -385,12 +385,12 @@ public final class ShopOuterClass { if (other.hasCityTakenLevelReward()) { setCityTakenLevelReward(other.cityTakenLevelReward); } - if (other.hasCityExp()) { - setCityExp(other.cityExp); - } if (other.hasCityLevel()) { setCityLevel(other.cityLevel); } + if (other.hasCityExp()) { + setCityExp(other.cityExp); + } if (other.hasShopId()) { setShopId(other.shopId); } @@ -410,8 +410,8 @@ public final class ShopOuterClass { beginTime = 0L; endTime = 0L; cityTakenLevelReward = 0L; - cityExp = 0; cityLevel = 0; + cityExp = 0; shopId = 0; goodsList.clear(); return this; @@ -441,8 +441,8 @@ public final class ShopOuterClass { && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) && (!hasCityTakenLevelReward() || cityTakenLevelReward == other.cityTakenLevelReward) - && (!hasCityExp() || cityExp == other.cityExp) && (!hasCityLevel() || cityLevel == other.cityLevel) + && (!hasCityExp() || cityExp == other.cityExp) && (!hasShopId() || shopId == other.shopId) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @@ -450,7 +450,7 @@ public final class ShopOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { @@ -458,16 +458,16 @@ public final class ShopOuterClass { output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt64NoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(cityExp); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(cityLevel); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(cityLevel); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(cityExp); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 112); @@ -475,7 +475,7 @@ public final class ShopOuterClass { } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 66); output.writeMessageNoTag(goodsList.get(i)); } } @@ -494,10 +494,10 @@ public final class ShopOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); @@ -515,7 +515,7 @@ public final class ShopOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -529,31 +529,31 @@ public final class ShopOuterClass { endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // cityTakenLevelReward - cityTakenLevelReward = input.readUInt64(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 16) { break; } } case 16: { - // cityExp - cityExp = input.readUInt32(); - bitField0_ |= 0x00000008; + // cityTakenLevelReward + cityTakenLevelReward = input.readUInt64(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { + case 40: { // cityLevel cityLevel = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // cityExp + cityExp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 112) { @@ -565,11 +565,11 @@ public final class ShopOuterClass { shopId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 74) { + if (tag != 66) { break; } } - case 74: { + case 66: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -604,10 +604,10 @@ public final class ShopOuterClass { output.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.cityExp, cityExp); + output.writeUInt32(FieldNames.cityLevel, cityLevel); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.cityLevel, cityLevel); + output.writeUInt32(FieldNames.cityExp, cityExp); } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.shopId, shopId); @@ -661,11 +661,11 @@ public final class ShopOuterClass { } break; } - case 785415346: - case -1421171383: { - if (input.isAtField(FieldNames.cityExp)) { + case -1124188967: + case 59808688: { + if (input.isAtField(FieldNames.cityLevel)) { if (!input.trySkipNullValue()) { - cityExp = input.readUInt32(); + cityLevel = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -673,11 +673,11 @@ public final class ShopOuterClass { } break; } - case -1124188967: - case 59808688: { - if (input.isAtField(FieldNames.cityLevel)) { + case 785415346: + case -1421171383: { + if (input.isAtField(FieldNames.cityExp)) { if (!input.trySkipNullValue()) { - cityLevel = input.readUInt32(); + cityExp = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -767,10 +767,10 @@ public final class ShopOuterClass { static final FieldName cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); - static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); - static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); + static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); + static final FieldName shopId = FieldName.forField("shopId", "shop_id"); static final FieldName goodsList = FieldName.forField("goodsList", "goods_list"); diff --git a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java index 41c8816..75adb28 100644 --- a/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SimpleInfoOuterClass.java @@ -21,57 +21,57 @@ public final class SimpleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 10; */ private long lastActiveTime; /** - * optional uint32 chat_bubble_id = 1; + * optional uint32 chat_bubble_id = 2; */ private int chatBubbleId; /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; */ private int uid; /** - * optional uint32 head_icon = 7; - */ - private int headIcon; - - /** - * optional uint32 level = 11; + * optional uint32 level = 8; */ private int level; /** - * optional .PlatformType platform_type = 9; + * optional uint32 head_icon = 9; */ - private int platformType; + private int headIcon; /** - * optional .FriendOnlineStatus online_status = 10; + * optional .FriendOnlineStatus online_status = 7; */ private int onlineStatus; /** - * optional bool is_banned = 6; + * optional .PlatformType platform_type = 15; + */ + private int platformType; + + /** + * optional bool is_banned = 5; */ private boolean isBanned; /** - * optional string signature = 3; + * optional string signature = 6; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * optional string nickname = 4; + * optional string nickname = 13; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 1; */ private final RepeatedMessage assistSimpleInfo = RepeatedMessage.newEmptyInstance(AssistSimpleInfoOuterClass.AssistSimpleInfo.getFactory()); @@ -86,7 +86,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 10; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -94,7 +94,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 10; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -104,7 +104,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 10; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -112,7 +112,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 8; + * optional int64 last_active_time = 10; * @param value the lastActiveTime to set * @return this */ @@ -123,7 +123,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 1; + * optional uint32 chat_bubble_id = 2; * @return whether the chatBubbleId field is set */ public boolean hasChatBubbleId() { @@ -131,7 +131,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 1; + * optional uint32 chat_bubble_id = 2; * @return this */ public SimpleInfo clearChatBubbleId() { @@ -141,7 +141,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 1; + * optional uint32 chat_bubble_id = 2; * @return the chatBubbleId */ public int getChatBubbleId() { @@ -149,7 +149,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 1; + * optional uint32 chat_bubble_id = 2; * @param value the chatBubbleId to set * @return this */ @@ -160,7 +160,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return whether the uid field is set */ public boolean hasUid() { @@ -168,7 +168,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return this */ public SimpleInfo clearUid() { @@ -178,7 +178,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return the uid */ public int getUid() { @@ -186,7 +186,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @param value the uid to set * @return this */ @@ -197,62 +197,25 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 7; - * @return whether the headIcon field is set + * optional uint32 level = 8; + * @return whether the level field is set */ - public boolean hasHeadIcon() { + public boolean hasLevel() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 head_icon = 7; - * @return this - */ - public SimpleInfo clearHeadIcon() { - bitField0_ &= ~0x00000008; - headIcon = 0; - return this; - } - - /** - * optional uint32 head_icon = 7; - * @return the headIcon - */ - public int getHeadIcon() { - return headIcon; - } - - /** - * optional uint32 head_icon = 7; - * @param value the headIcon to set - * @return this - */ - public SimpleInfo setHeadIcon(final int value) { - bitField0_ |= 0x00000008; - headIcon = value; - return this; - } - - /** - * optional uint32 level = 11; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @return this */ public SimpleInfo clearLevel() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; level = 0; return this; } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -260,98 +223,73 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @param value the level to set * @return this */ public SimpleInfo setLevel(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; level = value; return this; } /** - * optional .PlatformType platform_type = 9; - * @return whether the platformType field is set + * optional uint32 head_icon = 9; + * @return whether the headIcon field is set */ - public boolean hasPlatformType() { + public boolean hasHeadIcon() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 head_icon = 9; + * @return this + */ + public SimpleInfo clearHeadIcon() { + bitField0_ &= ~0x00000010; + headIcon = 0; + return this; + } + + /** + * optional uint32 head_icon = 9; + * @return the headIcon + */ + public int getHeadIcon() { + return headIcon; + } + + /** + * optional uint32 head_icon = 9; + * @param value the headIcon to set + * @return this + */ + public SimpleInfo setHeadIcon(final int value) { + bitField0_ |= 0x00000010; + headIcon = value; + return this; + } + + /** + * optional .FriendOnlineStatus online_status = 7; + * @return whether the onlineStatus field is set + */ + public boolean hasOnlineStatus() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .PlatformType platform_type = 9; - * @return this - */ - public SimpleInfo clearPlatformType() { - bitField0_ &= ~0x00000020; - platformType = 0; - return this; - } - - /** - * optional .PlatformType platform_type = 9; - * @return the platformType - */ - public PlatformTypeOuterClass.PlatformType getPlatformType() { - return PlatformTypeOuterClass.PlatformType.forNumber(platformType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link SimpleInfo#getPlatformType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getPlatformTypeValue() { - return platformType; - } - - /** - * 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 PlatformTypeOuterClass.PlatformType}. Setting an invalid value - * can cause {@link SimpleInfo#getPlatformType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public SimpleInfo setPlatformTypeValue(final int value) { - bitField0_ |= 0x00000020; - platformType = value; - return this; - } - - /** - * optional .PlatformType platform_type = 9; - * @param value the platformType to set - * @return this - */ - public SimpleInfo setPlatformType(final PlatformTypeOuterClass.PlatformType value) { - bitField0_ |= 0x00000020; - platformType = value.getNumber(); - return this; - } - - /** - * optional .FriendOnlineStatus online_status = 10; - * @return whether the onlineStatus field is set - */ - public boolean hasOnlineStatus() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .FriendOnlineStatus online_status = 10; + * optional .FriendOnlineStatus online_status = 7; * @return this */ public SimpleInfo clearOnlineStatus() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; onlineStatus = 0; return this; } /** - * optional .FriendOnlineStatus online_status = 10; + * optional .FriendOnlineStatus online_status = 7; * @return the onlineStatus */ public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { @@ -378,24 +316,86 @@ public final class SimpleInfoOuterClass { * @return this */ public SimpleInfo setOnlineStatusValue(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; onlineStatus = value; return this; } /** - * optional .FriendOnlineStatus online_status = 10; + * optional .FriendOnlineStatus online_status = 7; * @param value the onlineStatus to set * @return this */ public SimpleInfo setOnlineStatus(final FriendOnlineStatusOuterClass.FriendOnlineStatus value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; onlineStatus = value.getNumber(); return this; } /** - * optional bool is_banned = 6; + * optional .PlatformType platform_type = 15; + * @return whether the platformType field is set + */ + public boolean hasPlatformType() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .PlatformType platform_type = 15; + * @return this + */ + public SimpleInfo clearPlatformType() { + bitField0_ &= ~0x00000040; + platformType = 0; + return this; + } + + /** + * optional .PlatformType platform_type = 15; + * @return the platformType + */ + public PlatformTypeOuterClass.PlatformType getPlatformType() { + return PlatformTypeOuterClass.PlatformType.forNumber(platformType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SimpleInfo#getPlatformType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getPlatformTypeValue() { + return platformType; + } + + /** + * 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 PlatformTypeOuterClass.PlatformType}. Setting an invalid value + * can cause {@link SimpleInfo#getPlatformType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SimpleInfo setPlatformTypeValue(final int value) { + bitField0_ |= 0x00000040; + platformType = value; + return this; + } + + /** + * optional .PlatformType platform_type = 15; + * @param value the platformType to set + * @return this + */ + public SimpleInfo setPlatformType(final PlatformTypeOuterClass.PlatformType value) { + bitField0_ |= 0x00000040; + platformType = value.getNumber(); + return this; + } + + /** + * optional bool is_banned = 5; * @return whether the isBanned field is set */ public boolean hasIsBanned() { @@ -403,7 +403,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 6; + * optional bool is_banned = 5; * @return this */ public SimpleInfo clearIsBanned() { @@ -413,7 +413,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 6; + * optional bool is_banned = 5; * @return the isBanned */ public boolean getIsBanned() { @@ -421,7 +421,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 6; + * optional bool is_banned = 5; * @param value the isBanned to set * @return this */ @@ -432,7 +432,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @return whether the signature field is set */ public boolean hasSignature() { @@ -440,7 +440,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @return this */ public SimpleInfo clearSignature() { @@ -450,7 +450,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @return the signature */ public String getSignature() { @@ -458,7 +458,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -466,7 +466,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -475,7 +475,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @param value the signature to set * @return this */ @@ -486,7 +486,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 6; * @param value the signature to set * @return this */ @@ -497,7 +497,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -505,7 +505,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @return this */ public SimpleInfo clearNickname() { @@ -515,7 +515,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @return the nickname */ public String getNickname() { @@ -523,7 +523,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -531,7 +531,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -540,7 +540,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @param value the nickname to set * @return this */ @@ -551,7 +551,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 13; * @param value the nickname to set * @return this */ @@ -562,7 +562,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 1; * @return whether the assistSimpleInfo field is set */ public boolean hasAssistSimpleInfo() { @@ -570,7 +570,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 1; * @return this */ public SimpleInfo clearAssistSimpleInfo() { @@ -580,7 +580,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 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. @@ -594,7 +594,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 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 @@ -609,7 +609,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 1; * @param value the assistSimpleInfo to add * @return this */ @@ -620,7 +620,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 15; + * repeated .AssistSimpleInfo assist_simple_info = 1; * @param values the assistSimpleInfo to add * @return this */ @@ -639,10 +639,10 @@ public final class SimpleInfoOuterClass { lastActiveTime = other.lastActiveTime; chatBubbleId = other.chatBubbleId; uid = other.uid; - headIcon = other.headIcon; level = other.level; - platformType = other.platformType; + headIcon = other.headIcon; onlineStatus = other.onlineStatus; + platformType = other.platformType; isBanned = other.isBanned; signature.copyFrom(other.signature); nickname.copyFrom(other.nickname); @@ -666,18 +666,18 @@ public final class SimpleInfoOuterClass { if (other.hasUid()) { setUid(other.uid); } - if (other.hasHeadIcon()) { - setHeadIcon(other.headIcon); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasPlatformType()) { - setPlatformTypeValue(other.platformType); + if (other.hasHeadIcon()) { + setHeadIcon(other.headIcon); } if (other.hasOnlineStatus()) { setOnlineStatusValue(other.onlineStatus); } + if (other.hasPlatformType()) { + setPlatformTypeValue(other.platformType); + } if (other.hasIsBanned()) { setIsBanned(other.isBanned); } @@ -703,10 +703,10 @@ public final class SimpleInfoOuterClass { lastActiveTime = 0L; chatBubbleId = 0; uid = 0; - headIcon = 0; level = 0; - platformType = 0; + headIcon = 0; onlineStatus = 0; + platformType = 0; isBanned = false; signature.clear(); nickname.clear(); @@ -740,10 +740,10 @@ public final class SimpleInfoOuterClass { && (!hasLastActiveTime() || lastActiveTime == other.lastActiveTime) && (!hasChatBubbleId() || chatBubbleId == other.chatBubbleId) && (!hasUid() || uid == other.uid) - && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasLevel() || level == other.level) - && (!hasPlatformType() || platformType == other.platformType) + && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) + && (!hasPlatformType() || platformType == other.platformType) && (!hasIsBanned() || isBanned == other.isBanned) && (!hasSignature() || signature.equals(other.signature)) && (!hasNickname() || nickname.equals(other.nickname)) @@ -753,48 +753,48 @@ public final class SimpleInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(headIcon); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 72); - output.writeEnumNoTag(platformType); + output.writeUInt32NoTag(headIcon); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 56); output.writeEnumNoTag(onlineStatus); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 120); + output.writeEnumNoTag(platformType); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 106); output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < assistSimpleInfo.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 10); output.writeMessageNoTag(assistSimpleInfo.get(i)); } } @@ -813,16 +813,16 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); - } - if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); + } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); + size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); + size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); } if ((bitField0_ & 0x00000080) != 0) { size += 2; @@ -846,103 +846,103 @@ public final class SimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 80: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 8) { + if (tag != 16) { break; } } - case 8: { + case 16: { // chatBubbleId chatBubbleId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 24) { break; } } - case 40: { + case 24: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 64) { break; } } - case 56: { - // headIcon - headIcon = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 64: { // level level = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // platformType - final int value = input.readInt32(); - if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { - platformType = value; - bitField0_ |= 0x00000020; - } + // headIcon + headIcon = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { + case 56: { // onlineStatus final int value = input.readInt32(); if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { onlineStatus = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { + // platformType + final int value = input.readInt32(); + if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { + platformType = value; + bitField0_ |= 0x00000040; + } + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // isBanned isBanned = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // signature input.readString(signature); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 34) { + if (tag != 106) { break; } } - case 34: { + case 106: { // nickname input.readString(nickname); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 122) { + if (tag != 10) { break; } } - case 122: { + case 10: { // assistSimpleInfo tag = input.readRepeatedMessage(assistSimpleInfo, tag); bitField0_ |= 0x00000400; @@ -977,16 +977,16 @@ public final class SimpleInfoOuterClass { output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.headIcon, headIcon); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.headIcon, headIcon); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); + output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); } if ((bitField0_ & 0x00000040) != 0) { - output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); + output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isBanned, isBanned); @@ -1045,11 +1045,10 @@ public final class SimpleInfoOuterClass { } break; } - case -1116107143: - case -219098248: { - if (input.isAtField(FieldNames.headIcon)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - headIcon = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1057,10 +1056,11 @@ public final class SimpleInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -1116107143: + case -219098248: { + if (input.isAtField(FieldNames.headIcon)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + headIcon = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1068,23 +1068,6 @@ public final class SimpleInfoOuterClass { } break; } - case 155581005: - case 538062726: { - if (input.isAtField(FieldNames.platformType)) { - if (!input.trySkipNullValue()) { - final PlatformTypeOuterClass.PlatformType value = input.readEnum(PlatformTypeOuterClass.PlatformType.converter()); - if (value != null) { - platformType = value.getNumber(); - bitField0_ |= 0x00000020; - } else { - input.skipUnknownEnumValue(); - } - } - } else { - input.skipUnknownField(); - } - break; - } case 1159866405: case -650386594: { if (input.isAtField(FieldNames.onlineStatus)) { @@ -1092,6 +1075,23 @@ public final class SimpleInfoOuterClass { final FriendOnlineStatusOuterClass.FriendOnlineStatus value = input.readEnum(FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); if (value != null) { onlineStatus = value.getNumber(); + bitField0_ |= 0x00000020; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case 155581005: + case 538062726: { + if (input.isAtField(FieldNames.platformType)) { + if (!input.trySkipNullValue()) { + final PlatformTypeOuterClass.PlatformType value = input.readEnum(PlatformTypeOuterClass.PlatformType.converter()); + if (value != null) { + platformType = value.getNumber(); bitField0_ |= 0x00000040; } else { input.skipUnknownEnumValue(); @@ -1206,14 +1206,14 @@ public final class SimpleInfoOuterClass { static final FieldName uid = FieldName.forField("uid"); - static final FieldName headIcon = FieldName.forField("headIcon", "head_icon"); - static final FieldName level = FieldName.forField("level"); - static final FieldName platformType = FieldName.forField("platformType", "platform_type"); + static final FieldName headIcon = FieldName.forField("headIcon", "head_icon"); static final FieldName onlineStatus = FieldName.forField("onlineStatus", "online_status"); + static final FieldName platformType = FieldName.forField("platformType", "platform_type"); + static final FieldName isBanned = FieldName.forField("isBanned", "is_banned"); static final FieldName signature = FieldName.forField("signature"); diff --git a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java index 4e33af7..5cfae6d 100644 --- a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java @@ -24,17 +24,17 @@ public final class StaminaInfoScNotifyOuterClass { private long nextRecoverTime; /** - * optional int64 next_reserve_time = 15; + * optional int64 next_reserve_time = 14; */ private long nextReserveTime; /** - * optional uint32 stamina = 1; + * optional uint32 stamina = 2; */ private int stamina; /** - * optional uint32 reserve_stamina = 2; + * optional uint32 reserve_stamina = 12; */ private int reserveStamina; @@ -86,7 +86,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 15; + * optional int64 next_reserve_time = 14; * @return whether the nextReserveTime field is set */ public boolean hasNextReserveTime() { @@ -94,7 +94,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 15; + * optional int64 next_reserve_time = 14; * @return this */ public StaminaInfoScNotify clearNextReserveTime() { @@ -104,7 +104,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 15; + * optional int64 next_reserve_time = 14; * @return the nextReserveTime */ public long getNextReserveTime() { @@ -112,7 +112,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_reserve_time = 15; + * optional int64 next_reserve_time = 14; * @param value the nextReserveTime to set * @return this */ @@ -123,7 +123,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 1; + * optional uint32 stamina = 2; * @return whether the stamina field is set */ public boolean hasStamina() { @@ -131,7 +131,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 1; + * optional uint32 stamina = 2; * @return this */ public StaminaInfoScNotify clearStamina() { @@ -141,7 +141,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 1; + * optional uint32 stamina = 2; * @return the stamina */ public int getStamina() { @@ -149,7 +149,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 1; + * optional uint32 stamina = 2; * @param value the stamina to set * @return this */ @@ -160,7 +160,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 2; + * optional uint32 reserve_stamina = 12; * @return whether the reserveStamina field is set */ public boolean hasReserveStamina() { @@ -168,7 +168,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 2; + * optional uint32 reserve_stamina = 12; * @return this */ public StaminaInfoScNotify clearReserveStamina() { @@ -178,7 +178,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 2; + * optional uint32 reserve_stamina = 12; * @return the reserveStamina */ public int getReserveStamina() { @@ -186,7 +186,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 2; + * optional uint32 reserve_stamina = 12; * @param value the reserveStamina to set * @return this */ @@ -277,15 +277,15 @@ public final class StaminaInfoScNotifyOuterClass { output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeInt64NoTag(nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(reserveStamina); } } @@ -320,29 +320,29 @@ public final class StaminaInfoScNotifyOuterClass { nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // nextReserveTime nextReserveTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { - break; - } - } - case 8: { - // stamina - stamina = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 16) { break; } } case 16: { + // stamina + stamina = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // reserveStamina reserveStamina = input.readUInt32(); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java index acde4cd..ea1c5d6 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java @@ -20,24 +20,24 @@ public final class StartChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 3; */ private int challengeId; /** - * optional .StartChallengeStoryInfo story_info = 3; + * optional .StartChallengeStoryInfo ext_info = 2; */ - private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo storyInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); + private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo extInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); /** - * repeated uint32 lineup1 = 7; + * repeated uint32 first_half_lineup = 5; */ - private final RepeatedInt lineup1 = RepeatedInt.newEmptyInstance(); + private final RepeatedInt firstHalfLineup = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 lineup2 = 14; + * repeated uint32 second_half_lineup = 12; */ - private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); + private final RepeatedInt secondHalfLineup = RepeatedInt.newEmptyInstance(); private StartChallengeCsReq() { } @@ -50,7 +50,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 3; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -58,7 +58,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 3; * @return this */ public StartChallengeCsReq clearChallengeId() { @@ -68,7 +68,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 3; * @return the challengeId */ public int getChallengeId() { @@ -76,7 +76,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 15; + * optional uint32 challenge_id = 3; * @param value the challengeId to set * @return this */ @@ -87,39 +87,39 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 3; - * @return whether the storyInfo field is set + * optional .StartChallengeStoryInfo ext_info = 2; + * @return whether the extInfo field is set */ - public boolean hasStoryInfo() { + public boolean hasExtInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .StartChallengeStoryInfo story_info = 3; + * optional .StartChallengeStoryInfo ext_info = 2; * @return this */ - public StartChallengeCsReq clearStoryInfo() { + public StartChallengeCsReq clearExtInfo() { bitField0_ &= ~0x00000002; - storyInfo.clear(); + extInfo.clear(); return this; } /** - * optional .StartChallengeStoryInfo story_info = 3; + * optional .StartChallengeStoryInfo ext_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 #getMutableStoryInfo()} if you want to modify it. + * Use {@link #getMutableExtInfo()} if you want to modify it. * * @return internal storage object for reading */ - public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getStoryInfo() { - return storyInfo; + public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getExtInfo() { + return extInfo; } /** - * optional .StartChallengeStoryInfo story_info = 3; + * optional .StartChallengeStoryInfo ext_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 @@ -127,57 +127,57 @@ public final class StartChallengeCsReqOuterClass { * * @return internal storage object for modifications */ - public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getMutableStoryInfo() { + public StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo getMutableExtInfo() { bitField0_ |= 0x00000002; - return storyInfo; + return extInfo; } /** - * optional .StartChallengeStoryInfo story_info = 3; - * @param value the storyInfo to set + * optional .StartChallengeStoryInfo ext_info = 2; + * @param value the extInfo to set * @return this */ - public StartChallengeCsReq setStoryInfo( + public StartChallengeCsReq setExtInfo( final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo value) { bitField0_ |= 0x00000002; - storyInfo.copyFrom(value); + extInfo.copyFrom(value); return this; } /** - * repeated uint32 lineup1 = 7; - * @return whether the lineup1 field is set + * repeated uint32 first_half_lineup = 5; + * @return whether the firstHalfLineup field is set */ - public boolean hasLineup1() { + public boolean hasFirstHalfLineup() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 lineup1 = 7; + * repeated uint32 first_half_lineup = 5; * @return this */ - public StartChallengeCsReq clearLineup1() { + public StartChallengeCsReq clearFirstHalfLineup() { bitField0_ &= ~0x00000004; - lineup1.clear(); + firstHalfLineup.clear(); return this; } /** - * repeated uint32 lineup1 = 7; + * repeated uint32 first_half_lineup = 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 #getMutableLineup1()} if you want to modify it. + * Use {@link #getMutableFirstHalfLineup()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getLineup1() { - return lineup1; + public RepeatedInt getFirstHalfLineup() { + return firstHalfLineup; } /** - * repeated uint32 lineup1 = 7; + * repeated uint32 first_half_lineup = 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 @@ -185,67 +185,67 @@ public final class StartChallengeCsReqOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutableLineup1() { + public RepeatedInt getMutableFirstHalfLineup() { bitField0_ |= 0x00000004; - return lineup1; + return firstHalfLineup; } /** - * repeated uint32 lineup1 = 7; - * @param value the lineup1 to add + * repeated uint32 first_half_lineup = 5; + * @param value the firstHalfLineup to add * @return this */ - public StartChallengeCsReq addLineup1(final int value) { + public StartChallengeCsReq addFirstHalfLineup(final int value) { bitField0_ |= 0x00000004; - lineup1.add(value); + firstHalfLineup.add(value); return this; } /** - * repeated uint32 lineup1 = 7; - * @param values the lineup1 to add + * repeated uint32 first_half_lineup = 5; + * @param values the firstHalfLineup to add * @return this */ - public StartChallengeCsReq addAllLineup1(final int... values) { + public StartChallengeCsReq addAllFirstHalfLineup(final int... values) { bitField0_ |= 0x00000004; - lineup1.addAll(values); + firstHalfLineup.addAll(values); return this; } /** - * repeated uint32 lineup2 = 14; - * @return whether the lineup2 field is set + * repeated uint32 second_half_lineup = 12; + * @return whether the secondHalfLineup field is set */ - public boolean hasLineup2() { + public boolean hasSecondHalfLineup() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 lineup2 = 14; + * repeated uint32 second_half_lineup = 12; * @return this */ - public StartChallengeCsReq clearLineup2() { + public StartChallengeCsReq clearSecondHalfLineup() { bitField0_ &= ~0x00000008; - lineup2.clear(); + secondHalfLineup.clear(); return this; } /** - * repeated uint32 lineup2 = 14; + * repeated uint32 second_half_lineup = 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 #getMutableLineup2()} if you want to modify it. + * Use {@link #getMutableSecondHalfLineup()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedInt getLineup2() { - return lineup2; + public RepeatedInt getSecondHalfLineup() { + return secondHalfLineup; } /** - * repeated uint32 lineup2 = 14; + * repeated uint32 second_half_lineup = 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 @@ -253,30 +253,30 @@ public final class StartChallengeCsReqOuterClass { * * @return internal storage object for modifications */ - public RepeatedInt getMutableLineup2() { + public RepeatedInt getMutableSecondHalfLineup() { bitField0_ |= 0x00000008; - return lineup2; + return secondHalfLineup; } /** - * repeated uint32 lineup2 = 14; - * @param value the lineup2 to add + * repeated uint32 second_half_lineup = 12; + * @param value the secondHalfLineup to add * @return this */ - public StartChallengeCsReq addLineup2(final int value) { + public StartChallengeCsReq addSecondHalfLineup(final int value) { bitField0_ |= 0x00000008; - lineup2.add(value); + secondHalfLineup.add(value); return this; } /** - * repeated uint32 lineup2 = 14; - * @param values the lineup2 to add + * repeated uint32 second_half_lineup = 12; + * @param values the secondHalfLineup to add * @return this */ - public StartChallengeCsReq addAllLineup2(final int... values) { + public StartChallengeCsReq addAllSecondHalfLineup(final int... values) { bitField0_ |= 0x00000008; - lineup2.addAll(values); + secondHalfLineup.addAll(values); return this; } @@ -286,9 +286,9 @@ public final class StartChallengeCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; challengeId = other.challengeId; - storyInfo.copyFrom(other.storyInfo); - lineup1.copyFrom(other.lineup1); - lineup2.copyFrom(other.lineup2); + extInfo.copyFrom(other.extInfo); + firstHalfLineup.copyFrom(other.firstHalfLineup); + secondHalfLineup.copyFrom(other.secondHalfLineup); } return this; } @@ -302,14 +302,14 @@ public final class StartChallengeCsReqOuterClass { if (other.hasChallengeId()) { setChallengeId(other.challengeId); } - if (other.hasStoryInfo()) { - getMutableStoryInfo().mergeFrom(other.storyInfo); + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); } - if (other.hasLineup1()) { - getMutableLineup1().addAll(other.lineup1); + if (other.hasFirstHalfLineup()) { + getMutableFirstHalfLineup().addAll(other.firstHalfLineup); } - if (other.hasLineup2()) { - getMutableLineup2().addAll(other.lineup2); + if (other.hasSecondHalfLineup()) { + getMutableSecondHalfLineup().addAll(other.secondHalfLineup); } return this; } @@ -322,9 +322,9 @@ public final class StartChallengeCsReqOuterClass { cachedSize = -1; bitField0_ = 0; challengeId = 0; - storyInfo.clear(); - lineup1.clear(); - lineup2.clear(); + extInfo.clear(); + firstHalfLineup.clear(); + secondHalfLineup.clear(); return this; } @@ -335,9 +335,9 @@ public final class StartChallengeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - storyInfo.clearQuick(); - lineup1.clear(); - lineup2.clear(); + extInfo.clearQuick(); + firstHalfLineup.clear(); + secondHalfLineup.clear(); return this; } @@ -352,31 +352,31 @@ public final class StartChallengeCsReqOuterClass { StartChallengeCsReq other = (StartChallengeCsReq) o; return bitField0_ == other.bitField0_ && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)) - && (!hasLineup1() || lineup1.equals(other.lineup1)) - && (!hasLineup2() || lineup2.equals(other.lineup2)); + && (!hasExtInfo() || extInfo.equals(other.extInfo)) + && (!hasFirstHalfLineup() || firstHalfLineup.equals(other.firstHalfLineup)) + && (!hasSecondHalfLineup() || secondHalfLineup.equals(other.secondHalfLineup)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(storyInfo); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(extInfo); } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < lineup1.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(lineup1.array()[i]); + for (int i = 0; i < firstHalfLineup.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(firstHalfLineup.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lineup2.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(lineup2.array()[i]); + for (int i = 0; i < secondHalfLineup.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(secondHalfLineup.array()[i]); } } } @@ -388,13 +388,13 @@ public final class StartChallengeCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * lineup1.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup1); + size += (1 * firstHalfLineup.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(firstHalfLineup); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); + size += (1 * secondHalfLineup.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(secondHalfLineup); } return size; } @@ -406,36 +406,36 @@ public final class StartChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 24: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 18) { break; } } - case 26: { - // storyInfo - input.readMessage(storyInfo); + case 18: { + // extInfo + input.readMessage(extInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { - // lineup1 [packed=true] - input.readPackedUInt32(lineup1, tag); + case 42: { + // firstHalfLineup [packed=true] + input.readPackedUInt32(firstHalfLineup, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 114) { + if (tag != 98) { break; } } - case 114: { - // lineup2 [packed=true] - input.readPackedUInt32(lineup2, tag); + case 98: { + // secondHalfLineup [packed=true] + input.readPackedUInt32(secondHalfLineup, tag); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -452,15 +452,15 @@ public final class StartChallengeCsReqOuterClass { tag = input.readTag(); break; } - case 56: { - // lineup1 [packed=false] - tag = input.readRepeatedUInt32(lineup1, tag); + case 40: { + // firstHalfLineup [packed=false] + tag = input.readRepeatedUInt32(firstHalfLineup, tag); bitField0_ |= 0x00000004; break; } - case 112: { - // lineup2 [packed=false] - tag = input.readRepeatedUInt32(lineup2, tag); + case 96: { + // secondHalfLineup [packed=false] + tag = input.readRepeatedUInt32(secondHalfLineup, tag); bitField0_ |= 0x00000008; break; } @@ -475,13 +475,13 @@ public final class StartChallengeCsReqOuterClass { output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.storyInfo, storyInfo); + output.writeMessage(FieldNames.extInfo, extInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.lineup1, lineup1); + output.writeRepeatedUInt32(FieldNames.firstHalfLineup, firstHalfLineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); + output.writeRepeatedUInt32(FieldNames.secondHalfLineup, secondHalfLineup); } output.endObject(); } @@ -505,11 +505,11 @@ public final class StartChallengeCsReqOuterClass { } break; } - case 1710116675: - case 1494185400: { - if (input.isAtField(FieldNames.storyInfo)) { + case -1306498449: + case -1826570228: { + if (input.isAtField(FieldNames.extInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(storyInfo); + input.readMessage(extInfo); bitField0_ |= 0x00000002; } } else { @@ -517,10 +517,11 @@ public final class StartChallengeCsReqOuterClass { } break; } - case 176922754: { - if (input.isAtField(FieldNames.lineup1)) { + case -450421134: + case 1848535052: { + if (input.isAtField(FieldNames.firstHalfLineup)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lineup1); + input.readRepeatedUInt32(firstHalfLineup); bitField0_ |= 0x00000004; } } else { @@ -528,10 +529,11 @@ public final class StartChallengeCsReqOuterClass { } break; } - case 176922755: { - if (input.isAtField(FieldNames.lineup2)) { + case 1414736694: + case -1031121968: { + if (input.isAtField(FieldNames.secondHalfLineup)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(lineup2); + input.readRepeatedUInt32(secondHalfLineup); bitField0_ |= 0x00000008; } } else { @@ -594,11 +596,11 @@ public final class StartChallengeCsReqOuterClass { static class FieldNames { static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); - static final FieldName lineup1 = FieldName.forField("lineup1"); + static final FieldName firstHalfLineup = FieldName.forField("firstHalfLineup", "first_half_lineup"); - static final FieldName lineup2 = FieldName.forField("lineup2"); + static final FieldName secondHalfLineup = FieldName.forField("secondHalfLineup", "second_half_lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index 906044e..d551ba3 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java @@ -20,27 +20,27 @@ public final class StartChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .ChallengeExtInfo ext_info = 8; - */ - private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); - - /** - * optional .SceneInfo scene = 10; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 8; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); /** - * repeated .LineupInfo lineup_list = 5; + * optional .SceneInfo scene = 11; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + + /** + * optional .ChallengeExtInfo ext_info = 12; + */ + private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); + + /** + * repeated .LineupInfo lineup_list = 14; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -55,7 +55,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -63,7 +63,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 7; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -73,7 +73,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -81,7 +81,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -92,139 +92,25 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeExtInfo ext_info = 8; - * @return whether the extInfo field is set + * optional .ChallengeInfo challenge_info = 8; + * @return whether the challengeInfo field is set */ - public boolean hasExtInfo() { + public boolean hasChallengeInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ChallengeExtInfo ext_info = 8; - * @return this - */ - public StartChallengeScRsp clearExtInfo() { - bitField0_ &= ~0x00000002; - extInfo.clear(); - return this; - } - - /** - * optional .ChallengeExtInfo ext_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. - * - * Use {@link #getMutableExtInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { - return extInfo; - } - - /** - * optional .ChallengeExtInfo ext_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { - bitField0_ |= 0x00000002; - return extInfo; - } - - /** - * optional .ChallengeExtInfo ext_info = 8; - * @param value the extInfo to set - * @return this - */ - public StartChallengeScRsp setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { - bitField0_ |= 0x00000002; - extInfo.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 10; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .SceneInfo scene = 10; - * @return this - */ - public StartChallengeScRsp clearScene() { - bitField0_ &= ~0x00000004; - scene.clear(); - return this; - } - - /** - * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000004; - return scene; - } - - /** - * optional .SceneInfo scene = 10; - * @param value the scene to set - * @return this - */ - public StartChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; - scene.copyFrom(value); - return this; - } - - /** - * optional .ChallengeInfo challenge_info = 11; - * @return whether the challengeInfo field is set - */ - public boolean hasChallengeInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 8; * @return this */ public StartChallengeScRsp clearChallengeInfo() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; challengeInfo.clear(); return this; } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_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. @@ -238,7 +124,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_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 @@ -247,23 +133,137 @@ public final class StartChallengeScRspOuterClass { * @return internal storage object for modifications */ public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return challengeInfo; } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 8; * @param value the challengeInfo to set * @return this */ public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; challengeInfo.copyFrom(value); return this; } /** - * repeated .LineupInfo lineup_list = 5; + * optional .SceneInfo scene = 11; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .SceneInfo scene = 11; + * @return this + */ + public StartChallengeScRsp clearScene() { + bitField0_ &= ~0x00000004; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000004; + return scene; + } + + /** + * optional .SceneInfo scene = 11; + * @param value the scene to set + * @return this + */ + public StartChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000004; + scene.copyFrom(value); + return this; + } + + /** + * optional .ChallengeExtInfo ext_info = 12; + * @return whether the extInfo field is set + */ + public boolean hasExtInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .ChallengeExtInfo ext_info = 12; + * @return this + */ + public StartChallengeScRsp clearExtInfo() { + bitField0_ &= ~0x00000008; + extInfo.clear(); + return this; + } + + /** + * optional .ChallengeExtInfo ext_info = 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 #getMutableExtInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_info = 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 ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { + bitField0_ |= 0x00000008; + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_info = 12; + * @param value the extInfo to set + * @return this + */ + public StartChallengeScRsp setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { + bitField0_ |= 0x00000008; + extInfo.copyFrom(value); + return this; + } + + /** + * repeated .LineupInfo lineup_list = 14; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -271,7 +271,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 14; * @return this */ public StartChallengeScRsp clearLineupList() { @@ -281,7 +281,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_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. @@ -295,7 +295,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_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 @@ -309,7 +309,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 14; * @param value the lineupList to add * @return this */ @@ -320,7 +320,7 @@ public final class StartChallengeScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 5; + * repeated .LineupInfo lineup_list = 14; * @param values the lineupList to add * @return this */ @@ -336,9 +336,9 @@ public final class StartChallengeScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - extInfo.copyFrom(other.extInfo); - scene.copyFrom(other.scene); challengeInfo.copyFrom(other.challengeInfo); + scene.copyFrom(other.scene); + extInfo.copyFrom(other.extInfo); lineupList.copyFrom(other.lineupList); } return this; @@ -353,14 +353,14 @@ public final class StartChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasExtInfo()) { - getMutableExtInfo().mergeFrom(other.extInfo); + if (other.hasChallengeInfo()) { + getMutableChallengeInfo().mergeFrom(other.challengeInfo); } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } - if (other.hasChallengeInfo()) { - getMutableChallengeInfo().mergeFrom(other.challengeInfo); + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); } if (other.hasLineupList()) { getMutableLineupList().addAll(other.lineupList); @@ -376,9 +376,9 @@ public final class StartChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - extInfo.clear(); - scene.clear(); challengeInfo.clear(); + scene.clear(); + extInfo.clear(); lineupList.clear(); return this; } @@ -390,9 +390,9 @@ public final class StartChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - extInfo.clearQuick(); - scene.clearQuick(); challengeInfo.clearQuick(); + scene.clearQuick(); + extInfo.clearQuick(); lineupList.clearQuick(); return this; } @@ -408,33 +408,33 @@ public final class StartChallengeScRspOuterClass { StartChallengeScRsp other = (StartChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasExtInfo() || extInfo.equals(other.extInfo)) - && (!hasScene() || scene.equals(other.scene)) && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)) + && (!hasScene() || scene.equals(other.scene)) + && (!hasExtInfo() || extInfo.equals(other.extInfo)) && (!hasLineupList() || lineupList.equals(other.lineupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 66); - output.writeMessageNoTag(extInfo); + output.writeMessageNoTag(challengeInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(challengeInfo); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(extInfo); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 114); output.writeMessageNoTag(lineupList.get(i)); } } @@ -447,13 +447,13 @@ public final class StartChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); @@ -468,7 +468,7 @@ public final class StartChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -478,33 +478,33 @@ public final class StartChallengeScRspOuterClass { } } case 66: { - // extInfo - input.readMessage(extInfo); + // challengeInfo + input.readMessage(challengeInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // scene - input.readMessage(scene); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 90) { break; } } case 90: { - // challengeInfo - input.readMessage(challengeInfo); - bitField0_ |= 0x00000008; + // scene + input.readMessage(scene); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 98) { break; } } - case 42: { + case 98: { + // extInfo + input.readMessage(extInfo); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000010; @@ -533,13 +533,13 @@ public final class StartChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.extInfo, extInfo); + output.writeMessage(FieldNames.challengeInfo, challengeInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.challengeInfo, challengeInfo); + output.writeMessage(FieldNames.extInfo, extInfo); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.lineupList, lineupList); @@ -565,11 +565,11 @@ public final class StartChallengeScRspOuterClass { } break; } - case -1306498449: - case -1826570228: { - if (input.isAtField(FieldNames.extInfo)) { + case -812487759: + case 602859274: { + if (input.isAtField(FieldNames.challengeInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(extInfo); + input.readMessage(challengeInfo); bitField0_ |= 0x00000002; } } else { @@ -588,11 +588,11 @@ public final class StartChallengeScRspOuterClass { } break; } - case -812487759: - case 602859274: { - if (input.isAtField(FieldNames.challengeInfo)) { + case -1306498449: + case -1826570228: { + if (input.isAtField(FieldNames.extInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(challengeInfo); + input.readMessage(extInfo); bitField0_ |= 0x00000008; } } else { @@ -667,11 +667,11 @@ public final class StartChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); + static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); static final FieldName scene = FieldName.forField("scene"); - static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java index 57cfbe4..ee09606 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java @@ -19,15 +19,15 @@ public final class StartChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; - */ - private final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo newStoryBuffInfo = StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo.newInstance(); - - /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 15; + * optional .StartChallengeStoryBuffInfo story_buff_info = 6; */ private final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo storyBuffInfo = StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo.newInstance(); + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + */ + private final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo newStoryBuffInfo = StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo.newInstance(); + private StartChallengeStoryInfo() { } @@ -38,50 +38,85 @@ public final class StartChallengeStoryInfoOuterClass { return new StartChallengeStoryInfo(); } - public boolean hasBuffInfo() { - return (((bitField0_ & 0x00000003)) != 0); - } - - public StartChallengeStoryInfo clearBuffInfo() { - if (hasBuffInfo()) { - clearNewStoryBuffInfo(); - clearStoryBuffInfo(); - } - return this; - } - - private void clearBuffInfoOtherNewStoryBuffInfo() { - if ((((bitField0_ & 0x00000002)) != 0)) { - clearStoryBuffInfo(); - } - } - - private void clearBuffInfoOtherStoryBuffInfo() { - if ((((bitField0_ & 0x00000001)) != 0)) { - clearNewStoryBuffInfo(); - } - } - /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; - * @return whether the newStoryBuffInfo field is set + * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * @return whether the storyBuffInfo field is set */ - public boolean hasNewStoryBuffInfo() { + public boolean hasStoryBuffInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * @return this + */ + public StartChallengeStoryInfo clearStoryBuffInfo() { + bitField0_ &= ~0x00000001; + storyBuffInfo.clear(); + return this; + } + + /** + * optional .StartChallengeStoryBuffInfo story_buff_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. + * + * Use {@link #getMutableStoryBuffInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getStoryBuffInfo() { + return storyBuffInfo; + } + + /** + * optional .StartChallengeStoryBuffInfo story_buff_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getMutableStoryBuffInfo( + ) { + bitField0_ |= 0x00000001; + return storyBuffInfo; + } + + /** + * optional .StartChallengeStoryBuffInfo story_buff_info = 6; + * @param value the storyBuffInfo to set + * @return this + */ + public StartChallengeStoryInfo setStoryBuffInfo( + final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo value) { + bitField0_ |= 0x00000001; + storyBuffInfo.copyFrom(value); + return this; + } + + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; + * @return whether the newStoryBuffInfo field is set + */ + public boolean hasNewStoryBuffInfo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; * @return this */ public StartChallengeStoryInfo clearNewStoryBuffInfo() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; newStoryBuffInfo.clear(); return this; } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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. @@ -96,7 +131,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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 @@ -106,92 +141,29 @@ public final class StartChallengeStoryInfoOuterClass { */ public StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo getMutableNewStoryBuffInfo( ) { - clearBuffInfoOtherNewStoryBuffInfo(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return newStoryBuffInfo; } /** - * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 13; * @param value the newStoryBuffInfo to set * @return this */ public StartChallengeStoryInfo setNewStoryBuffInfo( final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo value) { - clearBuffInfoOtherNewStoryBuffInfo(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; newStoryBuffInfo.copyFrom(value); return this; } - /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 15; - * @return whether the storyBuffInfo field is set - */ - public boolean hasStoryBuffInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 15; - * @return this - */ - public StartChallengeStoryInfo clearStoryBuffInfo() { - bitField0_ &= ~0x00000002; - storyBuffInfo.clear(); - return this; - } - - /** - * optional .StartChallengeStoryBuffInfo story_buff_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. - * - * Use {@link #getMutableStoryBuffInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getStoryBuffInfo() { - return storyBuffInfo; - } - - /** - * optional .StartChallengeStoryBuffInfo story_buff_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getMutableStoryBuffInfo( - ) { - clearBuffInfoOtherStoryBuffInfo(); - bitField0_ |= 0x00000002; - return storyBuffInfo; - } - - /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 15; - * @param value the storyBuffInfo to set - * @return this - */ - public StartChallengeStoryInfo setStoryBuffInfo( - final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo value) { - clearBuffInfoOtherStoryBuffInfo(); - bitField0_ |= 0x00000002; - storyBuffInfo.copyFrom(value); - return this; - } - @Override public StartChallengeStoryInfo copyFrom(final StartChallengeStoryInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - newStoryBuffInfo.copyFrom(other.newStoryBuffInfo); storyBuffInfo.copyFrom(other.storyBuffInfo); + newStoryBuffInfo.copyFrom(other.newStoryBuffInfo); } return this; } @@ -202,12 +174,12 @@ public final class StartChallengeStoryInfoOuterClass { return this; } cachedSize = -1; - if (other.hasNewStoryBuffInfo()) { - getMutableNewStoryBuffInfo().mergeFrom(other.newStoryBuffInfo); - } if (other.hasStoryBuffInfo()) { getMutableStoryBuffInfo().mergeFrom(other.storyBuffInfo); } + if (other.hasNewStoryBuffInfo()) { + getMutableNewStoryBuffInfo().mergeFrom(other.newStoryBuffInfo); + } return this; } @@ -218,8 +190,8 @@ public final class StartChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - newStoryBuffInfo.clear(); storyBuffInfo.clear(); + newStoryBuffInfo.clear(); return this; } @@ -230,8 +202,8 @@ public final class StartChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - newStoryBuffInfo.clearQuick(); storyBuffInfo.clearQuick(); + newStoryBuffInfo.clearQuick(); return this; } @@ -245,19 +217,19 @@ public final class StartChallengeStoryInfoOuterClass { } StartChallengeStoryInfo other = (StartChallengeStoryInfo) o; return bitField0_ == other.bitField0_ - && (!hasNewStoryBuffInfo() || newStoryBuffInfo.equals(other.newStoryBuffInfo)) - && (!hasStoryBuffInfo() || storyBuffInfo.equals(other.storyBuffInfo)); + && (!hasStoryBuffInfo() || storyBuffInfo.equals(other.storyBuffInfo)) + && (!hasNewStoryBuffInfo() || newStoryBuffInfo.equals(other.newStoryBuffInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(newStoryBuffInfo); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(storyBuffInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(storyBuffInfo); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(newStoryBuffInfo); } } @@ -265,10 +237,10 @@ public final class StartChallengeStoryInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(newStoryBuffInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(storyBuffInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(storyBuffInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(newStoryBuffInfo); } return size; } @@ -280,20 +252,18 @@ public final class StartChallengeStoryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { - // newStoryBuffInfo - clearBuffInfoOtherNewStoryBuffInfo(); - input.readMessage(newStoryBuffInfo); + case 50: { + // storyBuffInfo + input.readMessage(storyBuffInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { - // storyBuffInfo - clearBuffInfoOtherStoryBuffInfo(); - input.readMessage(storyBuffInfo); + case 106: { + // newStoryBuffInfo + input.readMessage(newStoryBuffInfo); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -318,10 +288,10 @@ public final class StartChallengeStoryInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.newStoryBuffInfo, newStoryBuffInfo); + output.writeMessage(FieldNames.storyBuffInfo, storyBuffInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.storyBuffInfo, storyBuffInfo); + output.writeMessage(FieldNames.newStoryBuffInfo, newStoryBuffInfo); } output.endObject(); } @@ -333,12 +303,11 @@ public final class StartChallengeStoryInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1151109622: - case -1182609999: { - if (input.isAtField(FieldNames.newStoryBuffInfo)) { + case -1230610506: + case -1733882288: { + if (input.isAtField(FieldNames.storyBuffInfo)) { if (!input.trySkipNullValue()) { - clearBuffInfoOtherNewStoryBuffInfo(); - input.readMessage(newStoryBuffInfo); + input.readMessage(storyBuffInfo); bitField0_ |= 0x00000001; } } else { @@ -346,12 +315,11 @@ public final class StartChallengeStoryInfoOuterClass { } break; } - case -1230610506: - case -1733882288: { - if (input.isAtField(FieldNames.storyBuffInfo)) { + case 1151109622: + case -1182609999: { + if (input.isAtField(FieldNames.newStoryBuffInfo)) { if (!input.trySkipNullValue()) { - clearBuffInfoOtherStoryBuffInfo(); - input.readMessage(storyBuffInfo); + input.readMessage(newStoryBuffInfo); bitField0_ |= 0x00000002; } } else { @@ -412,9 +380,9 @@ public final class StartChallengeStoryInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName newStoryBuffInfo = FieldName.forField("newStoryBuffInfo", "new_story_buff_info"); - static final FieldName storyBuffInfo = FieldName.forField("storyBuffInfo", "story_buff_info"); + + static final FieldName newStoryBuffInfo = FieldName.forField("newStoryBuffInfo", "new_story_buff_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index d3f06ad..cdc8907 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java @@ -19,25 +19,25 @@ public final class StartCocoonStageCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 wave = 2; + * optional uint32 world_level = 2; + */ + private int worldLevel; + + /** + * optional uint32 wave = 6; */ private int wave; /** - * optional uint32 prop_entity_id = 7; + * optional uint32 prop_entity_id = 11; */ private int propEntityId; /** - * optional uint32 cocoon_id = 9; + * optional uint32 cocoon_id = 14; */ private int cocoonId; - /** - * optional uint32 world_level = 15; - */ - private int worldLevel; - private StartCocoonStageCsReq() { } @@ -49,136 +49,25 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 wave = 2; - * @return whether the wave field is set + * optional uint32 world_level = 2; + * @return whether the worldLevel field is set */ - public boolean hasWave() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 wave = 2; - * @return this - */ - public StartCocoonStageCsReq clearWave() { - bitField0_ &= ~0x00000001; - wave = 0; - return this; - } - - /** - * optional uint32 wave = 2; - * @return the wave - */ - public int getWave() { - return wave; - } - - /** - * optional uint32 wave = 2; - * @param value the wave to set - * @return this - */ - public StartCocoonStageCsReq setWave(final int value) { - bitField0_ |= 0x00000001; - wave = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 7; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 prop_entity_id = 7; - * @return this - */ - public StartCocoonStageCsReq clearPropEntityId() { - bitField0_ &= ~0x00000002; - propEntityId = 0; - return this; - } - - /** - * optional uint32 prop_entity_id = 7; - * @return the propEntityId - */ - public int getPropEntityId() { - return propEntityId; - } - - /** - * optional uint32 prop_entity_id = 7; - * @param value the propEntityId to set - * @return this - */ - public StartCocoonStageCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000002; - propEntityId = value; - return this; - } - - /** - * optional uint32 cocoon_id = 9; - * @return whether the cocoonId field is set - */ - public boolean hasCocoonId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cocoon_id = 9; - * @return this - */ - public StartCocoonStageCsReq clearCocoonId() { - bitField0_ &= ~0x00000004; - cocoonId = 0; - return this; - } - - /** - * optional uint32 cocoon_id = 9; - * @return the cocoonId - */ - public int getCocoonId() { - return cocoonId; - } - - /** - * optional uint32 cocoon_id = 9; - * @param value the cocoonId to set - * @return this - */ - public StartCocoonStageCsReq setCocoonId(final int value) { - bitField0_ |= 0x00000004; - cocoonId = value; - return this; - } - - /** - * optional uint32 world_level = 15; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 2; * @return this */ public StartCocoonStageCsReq clearWorldLevel() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 2; * @return the worldLevel */ public int getWorldLevel() { @@ -186,25 +75,136 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 world_level = 15; + * optional uint32 world_level = 2; * @param value the worldLevel to set * @return this */ public StartCocoonStageCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; worldLevel = value; return this; } + /** + * optional uint32 wave = 6; + * @return whether the wave field is set + */ + public boolean hasWave() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 wave = 6; + * @return this + */ + public StartCocoonStageCsReq clearWave() { + bitField0_ &= ~0x00000002; + wave = 0; + return this; + } + + /** + * optional uint32 wave = 6; + * @return the wave + */ + public int getWave() { + return wave; + } + + /** + * optional uint32 wave = 6; + * @param value the wave to set + * @return this + */ + public StartCocoonStageCsReq setWave(final int value) { + bitField0_ |= 0x00000002; + wave = value; + return this; + } + + /** + * optional uint32 prop_entity_id = 11; + * @return whether the propEntityId field is set + */ + public boolean hasPropEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 prop_entity_id = 11; + * @return this + */ + public StartCocoonStageCsReq clearPropEntityId() { + bitField0_ &= ~0x00000004; + propEntityId = 0; + return this; + } + + /** + * optional uint32 prop_entity_id = 11; + * @return the propEntityId + */ + public int getPropEntityId() { + return propEntityId; + } + + /** + * optional uint32 prop_entity_id = 11; + * @param value the propEntityId to set + * @return this + */ + public StartCocoonStageCsReq setPropEntityId(final int value) { + bitField0_ |= 0x00000004; + propEntityId = value; + return this; + } + + /** + * optional uint32 cocoon_id = 14; + * @return whether the cocoonId field is set + */ + public boolean hasCocoonId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 cocoon_id = 14; + * @return this + */ + public StartCocoonStageCsReq clearCocoonId() { + bitField0_ &= ~0x00000008; + cocoonId = 0; + return this; + } + + /** + * optional uint32 cocoon_id = 14; + * @return the cocoonId + */ + public int getCocoonId() { + return cocoonId; + } + + /** + * optional uint32 cocoon_id = 14; + * @param value the cocoonId to set + * @return this + */ + public StartCocoonStageCsReq setCocoonId(final int value) { + bitField0_ |= 0x00000008; + cocoonId = value; + return this; + } + @Override public StartCocoonStageCsReq copyFrom(final StartCocoonStageCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + worldLevel = other.worldLevel; wave = other.wave; propEntityId = other.propEntityId; cocoonId = other.cocoonId; - worldLevel = other.worldLevel; } return this; } @@ -215,6 +215,9 @@ public final class StartCocoonStageCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } if (other.hasWave()) { setWave(other.wave); } @@ -224,9 +227,6 @@ public final class StartCocoonStageCsReqOuterClass { if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } return this; } @@ -237,10 +237,10 @@ public final class StartCocoonStageCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + worldLevel = 0; wave = 0; propEntityId = 0; cocoonId = 0; - worldLevel = 0; return this; } @@ -264,29 +264,29 @@ public final class StartCocoonStageCsReqOuterClass { } StartCocoonStageCsReq other = (StartCocoonStageCsReq) o; return bitField0_ == other.bitField0_ + && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasWave() || wave == other.wave) && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasCocoonId() || cocoonId == other.cocoonId) - && (!hasWorldLevel() || worldLevel == other.worldLevel); + && (!hasCocoonId() || cocoonId == other.cocoonId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(wave); + output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(cocoonId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(cocoonId); } } @@ -294,16 +294,16 @@ public final class StartCocoonStageCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } return size; } @@ -316,35 +316,35 @@ public final class StartCocoonStageCsReqOuterClass { while (true) { switch (tag) { case 16: { - // wave - wave = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // propEntityId - propEntityId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // cocoonId - cocoonId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // worldLevel worldLevel = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // wave + wave = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // propEntityId + propEntityId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // cocoonId + cocoonId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class StartCocoonStageCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.cocoonId, cocoonId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.worldLevel, worldLevel); + output.writeUInt32(FieldNames.cocoonId, cocoonId); } output.endObject(); } @@ -390,11 +390,23 @@ public final class StartCocoonStageCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { + if (!input.trySkipNullValue()) { + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 3642105: { if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { wave = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -406,7 +418,7 @@ public final class StartCocoonStageCsReqOuterClass { if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { propEntityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -418,18 +430,6 @@ public final class StartCocoonStageCsReqOuterClass { if (input.isAtField(FieldNames.cocoonId)) { if (!input.trySkipNullValue()) { cocoonId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { - if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -490,13 +490,13 @@ public final class StartCocoonStageCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); + static final FieldName wave = FieldName.forField("wave"); static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); - - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java index 45dc6d1..99c4282 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageScRspOuterClass.java @@ -19,27 +19,27 @@ public final class StartCocoonStageScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; - */ - private int retcode; - - /** - * optional uint32 cocoon_id = 9; - */ - private int cocoonId; - - /** - * optional uint32 prop_entity_id = 12; - */ - private int propEntityId; - - /** - * optional uint32 wave = 15; + * optional uint32 wave = 1; */ private int wave; /** - * optional .SceneBattleInfo battle_info = 3; + * optional uint32 retcode = 10; + */ + private int retcode; + + /** + * optional uint32 cocoon_id = 14; + */ + private int cocoonId; + + /** + * optional uint32 prop_entity_id = 15; + */ + private int propEntityId; + + /** + * optional .SceneBattleInfo battle_info = 6; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,136 +54,25 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 wave = 1; + * @return whether the wave field is set */ - public boolean hasRetcode() { + public boolean hasWave() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; - * @return this - */ - public StartCocoonStageScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 7; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 7; - * @param value the retcode to set - * @return this - */ - public StartCocoonStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cocoon_id = 9; - * @return whether the cocoonId field is set - */ - public boolean hasCocoonId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cocoon_id = 9; - * @return this - */ - public StartCocoonStageScRsp clearCocoonId() { - bitField0_ &= ~0x00000002; - cocoonId = 0; - return this; - } - - /** - * optional uint32 cocoon_id = 9; - * @return the cocoonId - */ - public int getCocoonId() { - return cocoonId; - } - - /** - * optional uint32 cocoon_id = 9; - * @param value the cocoonId to set - * @return this - */ - public StartCocoonStageScRsp setCocoonId(final int value) { - bitField0_ |= 0x00000002; - cocoonId = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 12; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 prop_entity_id = 12; - * @return this - */ - public StartCocoonStageScRsp clearPropEntityId() { - bitField0_ &= ~0x00000004; - propEntityId = 0; - return this; - } - - /** - * optional uint32 prop_entity_id = 12; - * @return the propEntityId - */ - public int getPropEntityId() { - return propEntityId; - } - - /** - * optional uint32 prop_entity_id = 12; - * @param value the propEntityId to set - * @return this - */ - public StartCocoonStageScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000004; - propEntityId = value; - return this; - } - - /** - * optional uint32 wave = 15; - * @return whether the wave field is set - */ - public boolean hasWave() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 wave = 15; + * optional uint32 wave = 1; * @return this */ public StartCocoonStageScRsp clearWave() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; wave = 0; return this; } /** - * optional uint32 wave = 15; + * optional uint32 wave = 1; * @return the wave */ public int getWave() { @@ -191,18 +80,129 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 wave = 15; + * optional uint32 wave = 1; * @param value the wave to set * @return this */ public StartCocoonStageScRsp setWave(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; wave = value; return this; } /** - * optional .SceneBattleInfo battle_info = 3; + * optional uint32 retcode = 10; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public StartCocoonStageScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 10; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 10; + * @param value the retcode to set + * @return this + */ + public StartCocoonStageScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 cocoon_id = 14; + * @return whether the cocoonId field is set + */ + public boolean hasCocoonId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 cocoon_id = 14; + * @return this + */ + public StartCocoonStageScRsp clearCocoonId() { + bitField0_ &= ~0x00000004; + cocoonId = 0; + return this; + } + + /** + * optional uint32 cocoon_id = 14; + * @return the cocoonId + */ + public int getCocoonId() { + return cocoonId; + } + + /** + * optional uint32 cocoon_id = 14; + * @param value the cocoonId to set + * @return this + */ + public StartCocoonStageScRsp setCocoonId(final int value) { + bitField0_ |= 0x00000004; + cocoonId = value; + return this; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return whether the propEntityId field is set + */ + public boolean hasPropEntityId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return this + */ + public StartCocoonStageScRsp clearPropEntityId() { + bitField0_ &= ~0x00000008; + propEntityId = 0; + return this; + } + + /** + * optional uint32 prop_entity_id = 15; + * @return the propEntityId + */ + public int getPropEntityId() { + return propEntityId; + } + + /** + * optional uint32 prop_entity_id = 15; + * @param value the propEntityId to set + * @return this + */ + public StartCocoonStageScRsp setPropEntityId(final int value) { + bitField0_ |= 0x00000008; + propEntityId = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 6; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -210,7 +210,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 3; + * optional .SceneBattleInfo battle_info = 6; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 3; + * optional .SceneBattleInfo battle_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. @@ -234,7 +234,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 3; + * optional .SceneBattleInfo battle_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 @@ -248,7 +248,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 3; + * optional .SceneBattleInfo battle_info = 6; * @param value the battleInfo to set * @return this */ @@ -264,10 +264,10 @@ public final class StartCocoonStageScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + wave = other.wave; retcode = other.retcode; cocoonId = other.cocoonId; propEntityId = other.propEntityId; - wave = other.wave; battleInfo.copyFrom(other.battleInfo); } return this; @@ -279,6 +279,9 @@ public final class StartCocoonStageScRspOuterClass { return this; } cachedSize = -1; + if (other.hasWave()) { + setWave(other.wave); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -288,9 +291,6 @@ public final class StartCocoonStageScRspOuterClass { if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } - if (other.hasWave()) { - setWave(other.wave); - } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -304,10 +304,10 @@ public final class StartCocoonStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + wave = 0; retcode = 0; cocoonId = 0; propEntityId = 0; - wave = 0; battleInfo.clear(); return this; } @@ -333,33 +333,33 @@ public final class StartCocoonStageScRspOuterClass { } StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ + && (!hasWave() || wave == other.wave) && (!hasRetcode() || retcode == other.retcode) && (!hasCocoonId() || cocoonId == other.cocoonId) && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasWave() || wave == other.wave) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(cocoonId); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(wave); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 50); output.writeMessageNoTag(battleInfo); } } @@ -368,16 +368,16 @@ public final class StartCocoonStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(battleInfo); @@ -392,27 +392,27 @@ public final class StartCocoonStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // retcode - retcode = input.readUInt32(); + case 8: { + // wave + wave = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { - // cocoonId - cocoonId = input.readUInt32(); + case 80: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { - // propEntityId - propEntityId = input.readUInt32(); + case 112: { + // cocoonId + cocoonId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 120) { @@ -420,15 +420,15 @@ public final class StartCocoonStageScRspOuterClass { } } case 120: { - // wave - wave = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 50) { break; } } - case 26: { + case 50: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -455,16 +455,16 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.cocoonId, cocoonId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.cocoonId, cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -479,11 +479,22 @@ public final class StartCocoonStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 3642105: { + if (input.isAtField(FieldNames.wave)) { + if (!input.trySkipNullValue()) { + wave = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -495,7 +506,7 @@ public final class StartCocoonStageScRspOuterClass { if (input.isAtField(FieldNames.cocoonId)) { if (!input.trySkipNullValue()) { cocoonId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -507,17 +518,6 @@ public final class StartCocoonStageScRspOuterClass { if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { propEntityId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { - if (!input.trySkipNullValue()) { - wave = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -590,14 +590,14 @@ public final class StartCocoonStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName wave = FieldName.forField("wave"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); - static final FieldName wave = FieldName.forField("wave"); - static final FieldName battleInfo = FieldName.forField("battleInfo", "battle_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java index 850bf60..273d773 100644 --- a/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java @@ -19,12 +19,12 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 first_half = 1; + * optional uint32 first_half = 12; */ private int firstHalf; /** - * optional uint32 second_half = 2; + * optional uint32 second_half = 13; */ private int secondHalf; @@ -39,7 +39,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 first_half = 1; + * optional uint32 first_half = 12; * @return whether the firstHalf field is set */ public boolean hasFirstHalf() { @@ -47,7 +47,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 first_half = 1; + * optional uint32 first_half = 12; * @return this */ public StartNewChallengeStoryBuffInfo clearFirstHalf() { @@ -57,7 +57,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 first_half = 1; + * optional uint32 first_half = 12; * @return the firstHalf */ public int getFirstHalf() { @@ -65,7 +65,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 first_half = 1; + * optional uint32 first_half = 12; * @param value the firstHalf to set * @return this */ @@ -76,7 +76,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 second_half = 2; + * optional uint32 second_half = 13; * @return whether the secondHalf field is set */ public boolean hasSecondHalf() { @@ -84,7 +84,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 second_half = 2; + * optional uint32 second_half = 13; * @return this */ public StartNewChallengeStoryBuffInfo clearSecondHalf() { @@ -94,7 +94,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 second_half = 2; + * optional uint32 second_half = 13; * @return the secondHalf */ public int getSecondHalf() { @@ -102,7 +102,7 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { } /** - * optional uint32 second_half = 2; + * optional uint32 second_half = 13; * @param value the secondHalf to set * @return this */ @@ -177,11 +177,11 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(firstHalf); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(secondHalf); } } @@ -205,16 +205,16 @@ public final class StartNewChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 96: { // firstHalf firstHalf = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 104) { break; } } - case 16: { + case 104: { // secondHalf secondHalf = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java index 8a60403..adbb45f 100644 --- a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java @@ -19,17 +19,17 @@ public final class StartPartialChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 6; - */ - private int challengeId; - - /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 9; */ private int buffId; /** - * optional bool is_first_half = 12; + * optional uint32 challenge_id = 10; + */ + private int challengeId; + + /** + * optional bool is_first_half = 5; */ private boolean isFirstHalf; @@ -44,62 +44,25 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 6; - * @return whether the challengeId field is set + * optional uint32 buff_id = 9; + * @return whether the buffId field is set */ - public boolean hasChallengeId() { + public boolean hasBuffId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 challenge_id = 6; - * @return this - */ - public StartPartialChallengeCsReq clearChallengeId() { - bitField0_ &= ~0x00000001; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 6; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 6; - * @param value the challengeId to set - * @return this - */ - public StartPartialChallengeCsReq setChallengeId(final int value) { - bitField0_ |= 0x00000001; - challengeId = value; - return this; - } - - /** - * optional uint32 buff_id = 15; - * @return whether the buffId field is set - */ - public boolean hasBuffId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 9; * @return this */ public StartPartialChallengeCsReq clearBuffId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; buffId = 0; return this; } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 9; * @return the buffId */ public int getBuffId() { @@ -107,18 +70,55 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional uint32 buff_id = 15; + * optional uint32 buff_id = 9; * @param value the buffId to set * @return this */ public StartPartialChallengeCsReq setBuffId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; buffId = value; return this; } /** - * optional bool is_first_half = 12; + * optional uint32 challenge_id = 10; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 challenge_id = 10; + * @return this + */ + public StartPartialChallengeCsReq clearChallengeId() { + bitField0_ &= ~0x00000002; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 10; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 10; + * @param value the challengeId to set + * @return this + */ + public StartPartialChallengeCsReq setChallengeId(final int value) { + bitField0_ |= 0x00000002; + challengeId = value; + return this; + } + + /** + * optional bool is_first_half = 5; * @return whether the isFirstHalf field is set */ public boolean hasIsFirstHalf() { @@ -126,7 +126,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 12; + * optional bool is_first_half = 5; * @return this */ public StartPartialChallengeCsReq clearIsFirstHalf() { @@ -136,7 +136,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 12; + * optional bool is_first_half = 5; * @return the isFirstHalf */ public boolean getIsFirstHalf() { @@ -144,7 +144,7 @@ public final class StartPartialChallengeCsReqOuterClass { } /** - * optional bool is_first_half = 12; + * optional bool is_first_half = 5; * @param value the isFirstHalf to set * @return this */ @@ -159,8 +159,8 @@ public final class StartPartialChallengeCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - challengeId = other.challengeId; buffId = other.buffId; + challengeId = other.challengeId; isFirstHalf = other.isFirstHalf; } return this; @@ -172,12 +172,12 @@ public final class StartPartialChallengeCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); - } if (other.hasBuffId()) { setBuffId(other.buffId); } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } if (other.hasIsFirstHalf()) { setIsFirstHalf(other.isFirstHalf); } @@ -191,8 +191,8 @@ public final class StartPartialChallengeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeId = 0; buffId = 0; + challengeId = 0; isFirstHalf = false; return this; } @@ -217,23 +217,23 @@ public final class StartPartialChallengeCsReqOuterClass { } StartPartialChallengeCsReq other = (StartPartialChallengeCsReq) o; return bitField0_ == other.bitField0_ - && (!hasChallengeId() || challengeId == other.challengeId) && (!hasBuffId() || buffId == other.buffId) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasIsFirstHalf() || isFirstHalf == other.isFirstHalf); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(challengeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(buffId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(challengeId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isFirstHalf); } } @@ -242,10 +242,10 @@ public final class StartPartialChallengeCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class StartPartialChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // challengeId - challengeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 72: { // buffId buffId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // isFirstHalf isFirstHalf = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class StartPartialChallengeCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isFirstHalf, isFirstHalf); @@ -323,11 +323,11 @@ public final class StartPartialChallengeCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -689112866: - case 112359031: { - if (input.isAtField(FieldNames.challengeId)) { + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { if (!input.trySkipNullValue()) { - challengeId = input.readUInt32(); + buffId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class StartPartialChallengeCsReqOuterClass { } break; } - case -1378119474: - case 227990663: { - if (input.isAtField(FieldNames.buffId)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - buffId = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class StartPartialChallengeCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName isFirstHalf = FieldName.forField("isFirstHalf", "is_first_half"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java index a953ca7..584e26c 100644 --- a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java @@ -19,22 +19,22 @@ public final class StartPartialChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 1; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -49,7 +49,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return this */ public StartPartialChallengeScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -86,7 +86,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 1; * @return whether the scene field is set */ public boolean hasScene() { @@ -94,7 +94,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 1; * @return this */ public StartPartialChallengeScRsp clearScene() { @@ -104,7 +104,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 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. @@ -118,7 +118,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 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 @@ -132,7 +132,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 7; + * optional .SceneInfo scene = 1; * @param value the scene to set * @return this */ @@ -143,7 +143,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -151,7 +151,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @return this */ public StartPartialChallengeScRsp clearLineup() { @@ -161,7 +161,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 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. @@ -175,7 +175,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 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 @@ -189,7 +189,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 3; * @param value the lineup to set * @return this */ @@ -200,7 +200,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -208,7 +208,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; * @return this */ public StartPartialChallengeScRsp clearChallengeInfo() { @@ -218,7 +218,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; * * 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. @@ -232,7 +232,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -246,7 +246,7 @@ public final class StartPartialChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 12; + * optional .ChallengeInfo challenge_info = 9; * @param value the challengeInfo to set * @return this */ @@ -337,19 +337,19 @@ public final class StartPartialChallengeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 74); output.writeMessageNoTag(challengeInfo); } } @@ -379,34 +379,34 @@ public final class StartPartialChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { + // lineup + input.readMessage(lineup); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 74) { break; } } case 74: { - // lineup - input.readMessage(lineup); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 98) { - break; - } - } - case 98: { // challengeInfo input.readMessage(challengeInfo); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java index 23e90bd..fd4feb8 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java @@ -20,17 +20,17 @@ public final class StartRogueCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_aeon_id = 6; + * optional uint32 buff_aeon_id = 1; */ private int buffAeonId; /** - * optional uint32 area_id = 7; + * optional uint32 area_id = 15; */ private int areaId; /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_list = 4; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 6; + * optional uint32 buff_aeon_id = 1; * @return whether the buffAeonId field is set */ public boolean hasBuffAeonId() { @@ -53,7 +53,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 6; + * optional uint32 buff_aeon_id = 1; * @return this */ public StartRogueCsReq clearBuffAeonId() { @@ -63,7 +63,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 6; + * optional uint32 buff_aeon_id = 1; * @return the buffAeonId */ public int getBuffAeonId() { @@ -71,7 +71,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 6; + * optional uint32 buff_aeon_id = 1; * @param value the buffAeonId to set * @return this */ @@ -82,7 +82,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 7; + * optional uint32 area_id = 15; * @return whether the areaId field is set */ public boolean hasAreaId() { @@ -90,7 +90,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 7; + * optional uint32 area_id = 15; * @return this */ public StartRogueCsReq clearAreaId() { @@ -100,7 +100,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 7; + * optional uint32 area_id = 15; * @return the areaId */ public int getAreaId() { @@ -108,7 +108,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 7; + * optional uint32 area_id = 15; * @param value the areaId to set * @return this */ @@ -119,7 +119,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_list = 4; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -127,7 +127,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_list = 4; * @return this */ public StartRogueCsReq clearBaseAvatarIdList() { @@ -137,7 +137,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_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. @@ -151,7 +151,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_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 @@ -165,7 +165,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_list = 4; * @param value the baseAvatarIdList to add * @return this */ @@ -176,7 +176,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 13; + * repeated uint32 base_avatar_id_list = 4; * @param values the baseAvatarIdList to add * @return this */ @@ -258,16 +258,16 @@ public final class StartRogueCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(buffAeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -295,25 +295,25 @@ public final class StartRogueCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // buffAeonId buffAeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { + case 120: { // areaId areaId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 34) { break; } } - case 106: { + case 34: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000004; @@ -332,7 +332,7 @@ public final class StartRogueCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 32: { // baseAvatarIdList [packed=false] tag = input.readRepeatedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java index cdfb303..79d6de6 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java @@ -19,7 +19,7 @@ public final class StartRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; */ private int retcode; @@ -29,15 +29,15 @@ public final class StartRogueScRspOuterClass { private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .RogueInfo rogue_info = 14; - */ - private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 7; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + /** + * optional .RogueInfo rogue_info = 12; + */ + private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); + private StartRogueScRsp() { } @@ -49,7 +49,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return this */ public StartRogueScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -143,82 +143,25 @@ public final class StartRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 14; - * @return whether the rogueInfo field is set + * optional .LineupInfo lineup = 7; + * @return whether the lineup field is set */ - public boolean hasRogueInfo() { + public boolean hasLineup() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueInfo rogue_info = 14; - * @return this - */ - public StartRogueScRsp clearRogueInfo() { - bitField0_ &= ~0x00000004; - rogueInfo.clear(); - return this; - } - - /** - * optional .RogueInfo rogue_info = 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. - * - * Use {@link #getMutableRogueInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueInfoOuterClass.RogueInfo getRogueInfo() { - return rogueInfo; - } - - /** - * optional .RogueInfo rogue_info = 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000004; - return rogueInfo; - } - - /** - * optional .RogueInfo rogue_info = 14; - * @param value the rogueInfo to set - * @return this - */ - public StartRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000004; - rogueInfo.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 15; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 7; * @return this */ public StartRogueScRsp clearLineup() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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. @@ -232,7 +175,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 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 @@ -241,21 +184,78 @@ public final class StartRogueScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return lineup; } /** - * optional .LineupInfo lineup = 15; + * optional .LineupInfo lineup = 7; * @param value the lineup to set * @return this */ public StartRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; lineup.copyFrom(value); return this; } + /** + * optional .RogueInfo rogue_info = 12; + * @return whether the rogueInfo field is set + */ + public boolean hasRogueInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueInfo rogue_info = 12; + * @return this + */ + public StartRogueScRsp clearRogueInfo() { + bitField0_ &= ~0x00000008; + rogueInfo.clear(); + return this; + } + + /** + * optional .RogueInfo rogue_info = 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 #getMutableRogueInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueInfoOuterClass.RogueInfo getRogueInfo() { + return rogueInfo; + } + + /** + * optional .RogueInfo rogue_info = 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 RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { + bitField0_ |= 0x00000008; + return rogueInfo; + } + + /** + * optional .RogueInfo rogue_info = 12; + * @param value the rogueInfo to set + * @return this + */ + public StartRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { + bitField0_ |= 0x00000008; + rogueInfo.copyFrom(value); + return this; + } + @Override public StartRogueScRsp copyFrom(final StartRogueScRsp other) { cachedSize = other.cachedSize; @@ -263,8 +263,8 @@ public final class StartRogueScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; scene.copyFrom(other.scene); - rogueInfo.copyFrom(other.rogueInfo); lineup.copyFrom(other.lineup); + rogueInfo.copyFrom(other.rogueInfo); } return this; } @@ -281,12 +281,12 @@ public final class StartRogueScRspOuterClass { if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } - if (other.hasRogueInfo()) { - getMutableRogueInfo().mergeFrom(other.rogueInfo); - } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } + if (other.hasRogueInfo()) { + getMutableRogueInfo().mergeFrom(other.rogueInfo); + } return this; } @@ -299,8 +299,8 @@ public final class StartRogueScRspOuterClass { bitField0_ = 0; retcode = 0; scene.clear(); - rogueInfo.clear(); lineup.clear(); + rogueInfo.clear(); return this; } @@ -312,8 +312,8 @@ public final class StartRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; scene.clearQuick(); - rogueInfo.clearQuick(); lineup.clearQuick(); + rogueInfo.clearQuick(); return this; } @@ -329,14 +329,14 @@ public final class StartRogueScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasScene() || scene.equals(other.scene)) - && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) - && (!hasLineup() || lineup.equals(other.lineup)); + && (!hasLineup() || lineup.equals(other.lineup)) + && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -344,12 +344,12 @@ public final class StartRogueScRspOuterClass { output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(rogueInfo); + output.writeRawByte((byte) 58); + output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(rogueInfo); } } @@ -363,10 +363,10 @@ public final class StartRogueScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } return size; } @@ -378,7 +378,7 @@ public final class StartRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -392,22 +392,22 @@ public final class StartRogueScRspOuterClass { input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { - // rogueInfo - input.readMessage(rogueInfo); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 122) { - break; - } - } - case 122: { + case 58: { // lineup input.readMessage(lineup); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // rogueInfo + input.readMessage(rogueInfo); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -438,10 +438,10 @@ public final class StartRogueScRspOuterClass { output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueInfo, rogueInfo); + output.writeMessage(FieldNames.lineup, lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.rogueInfo, rogueInfo); } output.endObject(); } @@ -475,11 +475,10 @@ public final class StartRogueScRspOuterClass { } break; } - case 655808936: - case -1124583437: { - if (input.isAtField(FieldNames.rogueInfo)) { + case -1102671473: { + if (input.isAtField(FieldNames.lineup)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueInfo); + input.readMessage(lineup); bitField0_ |= 0x00000004; } } else { @@ -487,10 +486,11 @@ public final class StartRogueScRspOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { + case 655808936: + case -1124583437: { + if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(lineup); + input.readMessage(rogueInfo); bitField0_ |= 0x00000008; } } else { @@ -555,9 +555,9 @@ public final class StartRogueScRspOuterClass { static final FieldName scene = FieldName.forField("scene"); - static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); - static final FieldName lineup = FieldName.forField("lineup"); + + static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java index 2e6826e..a708666 100644 --- a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java @@ -24,27 +24,27 @@ public final class SwapLineupCsReqOuterClass { private int srcSlot; /** - * optional uint32 index = 4; - */ - private int index; - - /** - * optional uint32 plane_id = 8; - */ - private int planeId; - - /** - * optional uint32 dst_slot = 9; + * optional uint32 dst_slot = 4; */ private int dstSlot; /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional uint32 plane_id = 6; + */ + private int planeId; + + /** + * optional uint32 index = 7; + */ + private int index; + + /** + * optional .ExtraLineupType extra_lineup_type = 11; */ private int extraLineupType; /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 5; */ private boolean isVirtual; @@ -96,44 +96,44 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 4; - * @return whether the index field is set + * optional uint32 dst_slot = 4; + * @return whether the dstSlot field is set */ - public boolean hasIndex() { + public boolean hasDstSlot() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 index = 4; + * optional uint32 dst_slot = 4; * @return this */ - public SwapLineupCsReq clearIndex() { + public SwapLineupCsReq clearDstSlot() { bitField0_ &= ~0x00000002; - index = 0; + dstSlot = 0; return this; } /** - * optional uint32 index = 4; - * @return the index + * optional uint32 dst_slot = 4; + * @return the dstSlot */ - public int getIndex() { - return index; + public int getDstSlot() { + return dstSlot; } /** - * optional uint32 index = 4; - * @param value the index to set + * optional uint32 dst_slot = 4; + * @param value the dstSlot to set * @return this */ - public SwapLineupCsReq setIndex(final int value) { + public SwapLineupCsReq setDstSlot(final int value) { bitField0_ |= 0x00000002; - index = value; + dstSlot = value; return this; } /** - * optional uint32 plane_id = 8; + * optional uint32 plane_id = 6; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -141,7 +141,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 8; + * optional uint32 plane_id = 6; * @return this */ public SwapLineupCsReq clearPlaneId() { @@ -151,7 +151,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 8; + * optional uint32 plane_id = 6; * @return the planeId */ public int getPlaneId() { @@ -159,7 +159,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 8; + * optional uint32 plane_id = 6; * @param value the planeId to set * @return this */ @@ -170,44 +170,44 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 9; - * @return whether the dstSlot field is set + * optional uint32 index = 7; + * @return whether the index field is set */ - public boolean hasDstSlot() { + public boolean hasIndex() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 dst_slot = 9; + * optional uint32 index = 7; * @return this */ - public SwapLineupCsReq clearDstSlot() { + public SwapLineupCsReq clearIndex() { bitField0_ &= ~0x00000008; - dstSlot = 0; + index = 0; return this; } /** - * optional uint32 dst_slot = 9; - * @return the dstSlot + * optional uint32 index = 7; + * @return the index */ - public int getDstSlot() { - return dstSlot; + public int getIndex() { + return index; } /** - * optional uint32 dst_slot = 9; - * @param value the dstSlot to set + * optional uint32 index = 7; + * @param value the index to set * @return this */ - public SwapLineupCsReq setDstSlot(final int value) { + public SwapLineupCsReq setIndex(final int value) { bitField0_ |= 0x00000008; - dstSlot = value; + index = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 11; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -215,7 +215,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 11; * @return this */ public SwapLineupCsReq clearExtraLineupType() { @@ -225,7 +225,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 11; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -258,7 +258,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 11; * @param value the extraLineupType to set * @return this */ @@ -270,7 +270,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 5; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -278,7 +278,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 5; * @return this */ public SwapLineupCsReq clearIsVirtual() { @@ -288,7 +288,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 5; * @return the isVirtual */ public boolean getIsVirtual() { @@ -296,7 +296,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 5; * @param value the isVirtual to set * @return this */ @@ -312,9 +312,9 @@ public final class SwapLineupCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; srcSlot = other.srcSlot; - index = other.index; - planeId = other.planeId; dstSlot = other.dstSlot; + planeId = other.planeId; + index = other.index; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } @@ -330,14 +330,14 @@ public final class SwapLineupCsReqOuterClass { if (other.hasSrcSlot()) { setSrcSlot(other.srcSlot); } - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasDstSlot()) { + setDstSlot(other.dstSlot); } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasDstSlot()) { - setDstSlot(other.dstSlot); + if (other.hasIndex()) { + setIndex(other.index); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -356,9 +356,9 @@ public final class SwapLineupCsReqOuterClass { cachedSize = -1; bitField0_ = 0; srcSlot = 0; - index = 0; - planeId = 0; dstSlot = 0; + planeId = 0; + index = 0; extraLineupType = 0; isVirtual = false; return this; @@ -385,9 +385,9 @@ public final class SwapLineupCsReqOuterClass { SwapLineupCsReq other = (SwapLineupCsReq) o; return bitField0_ == other.bitField0_ && (!hasSrcSlot() || srcSlot == other.srcSlot) - && (!hasIndex() || index == other.index) - && (!hasPlaneId() || planeId == other.planeId) && (!hasDstSlot() || dstSlot == other.dstSlot) + && (!hasPlaneId() || planeId == other.planeId) + && (!hasIndex() || index == other.index) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @@ -400,22 +400,22 @@ public final class SwapLineupCsReqOuterClass { } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(index); + output.writeUInt32NoTag(dstSlot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(dstSlot); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isVirtual); } } @@ -427,13 +427,13 @@ public final class SwapLineupCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -461,33 +461,33 @@ public final class SwapLineupCsReqOuterClass { } } case 32: { - // index - index = input.readUInt32(); + // dstSlot + dstSlot = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { - // dstSlot - dstSlot = input.readUInt32(); + case 56: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -495,11 +495,11 @@ public final class SwapLineupCsReqOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { + case 40: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -529,13 +529,13 @@ public final class SwapLineupCsReqOuterClass { output.writeUInt32(FieldNames.srcSlot, srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.dstSlot, dstSlot); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.dstSlot, dstSlot); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -565,10 +565,11 @@ public final class SwapLineupCsReqOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 1958115683: + case 583331896: { + if (input.isAtField(FieldNames.dstSlot)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + dstSlot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -588,11 +589,10 @@ public final class SwapLineupCsReqOuterClass { } break; } - case 1958115683: - case 583331896: { - if (input.isAtField(FieldNames.dstSlot)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - dstSlot = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -684,11 +684,11 @@ public final class SwapLineupCsReqOuterClass { static class FieldNames { static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); - static final FieldName index = FieldName.forField("index"); + static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); + static final FieldName index = FieldName.forField("index"); static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java index 9e51f88..6d60177 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SwitchLineupIndexCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 2; + * optional uint32 index = 8; */ private int index; @@ -34,7 +34,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 2; + * optional uint32 index = 8; * @return whether the index field is set */ public boolean hasIndex() { @@ -42,7 +42,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 2; + * optional uint32 index = 8; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 2; + * optional uint32 index = 8; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 2; + * optional uint32 index = 8; * @param value the index to set * @return this */ @@ -129,7 +129,7 @@ public final class SwitchLineupIndexCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public final class SwitchLineupIndexCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java index 0c5560b..8489e58 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SwitchLineupIndexScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional uint32 index = 9; + * optional uint32 index = 13; */ private int index; @@ -39,7 +39,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return this */ public SwitchLineupIndexScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return whether the index field is set */ public boolean hasIndex() { @@ -84,7 +84,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return this */ public SwitchLineupIndexScRsp clearIndex() { @@ -94,7 +94,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @return the index */ public int getIndex() { @@ -102,7 +102,7 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 9; + * optional uint32 index = 13; * @param value the index to set * @return this */ @@ -177,11 +177,11 @@ public final class SwitchLineupIndexScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(index); } } @@ -205,16 +205,16 @@ public final class SwitchLineupIndexScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { // index index = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java index 54a8898..5b853f4 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class SyncApplyFriendScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_info = 15; */ private final FriendApplyInfoOuterClass.FriendApplyInfo friendApplyInfo = FriendApplyInfoOuterClass.FriendApplyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_info = 15; * @return whether the friendApplyInfo field is set */ public boolean hasFriendApplyInfo() { @@ -42,7 +42,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_info = 15; * @return this */ public SyncApplyFriendScNotify clearFriendApplyInfo() { @@ -52,7 +52,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_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. @@ -66,7 +66,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_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 @@ -80,7 +80,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 4; + * optional .FriendApplyInfo friend_apply_info = 15; * @param value the friendApplyInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class SyncApplyFriendScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); output.writeMessageNoTag(friendApplyInfo); } } @@ -172,7 +172,7 @@ public final class SyncApplyFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 122: { // friendApplyInfo input.readMessage(friendApplyInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java index e915ec7..c27eca1 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SyncClientResVersionCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 14; */ private int clientResVersion; @@ -34,7 +34,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 14; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -42,7 +42,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 14; * @return this */ public SyncClientResVersionCsReq clearClientResVersion() { @@ -52,7 +52,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 14; * @return the clientResVersion */ public int getClientResVersion() { @@ -60,7 +60,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 15; + * optional uint32 client_res_version = 14; * @param value the clientResVersion to set * @return this */ @@ -129,7 +129,7 @@ public final class SyncClientResVersionCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(clientResVersion); } } @@ -150,7 +150,7 @@ public final class SyncClientResVersionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 112: { // clientResVersion clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java index cf25d29..9e60f8a 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -18,16 +18,16 @@ public final class SyncClientResVersionScRspOuterClass { public static final class SyncClientResVersionScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 client_res_version = 2; - */ - private int clientResVersion; - /** * optional uint32 retcode = 5; */ private int retcode; + /** + * optional uint32 client_res_version = 10; + */ + private int clientResVersion; + private SyncClientResVersionScRsp() { } @@ -38,49 +38,12 @@ public final class SyncClientResVersionScRspOuterClass { return new SyncClientResVersionScRsp(); } - /** - * optional uint32 client_res_version = 2; - * @return whether the clientResVersion field is set - */ - public boolean hasClientResVersion() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 client_res_version = 2; - * @return this - */ - public SyncClientResVersionScRsp clearClientResVersion() { - bitField0_ &= ~0x00000001; - clientResVersion = 0; - return this; - } - - /** - * optional uint32 client_res_version = 2; - * @return the clientResVersion - */ - public int getClientResVersion() { - return clientResVersion; - } - - /** - * optional uint32 client_res_version = 2; - * @param value the clientResVersion to set - * @return this - */ - public SyncClientResVersionScRsp setClientResVersion(final int value) { - bitField0_ |= 0x00000001; - clientResVersion = value; - return this; - } - /** * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -88,7 +51,7 @@ public final class SyncClientResVersionScRspOuterClass { * @return this */ public SyncClientResVersionScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } @@ -107,18 +70,55 @@ public final class SyncClientResVersionScRspOuterClass { * @return this */ public SyncClientResVersionScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 client_res_version = 10; + * @return whether the clientResVersion field is set + */ + public boolean hasClientResVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_res_version = 10; + * @return this + */ + public SyncClientResVersionScRsp clearClientResVersion() { + bitField0_ &= ~0x00000002; + clientResVersion = 0; + return this; + } + + /** + * optional uint32 client_res_version = 10; + * @return the clientResVersion + */ + public int getClientResVersion() { + return clientResVersion; + } + + /** + * optional uint32 client_res_version = 10; + * @param value the clientResVersion to set + * @return this + */ + public SyncClientResVersionScRsp setClientResVersion(final int value) { + bitField0_ |= 0x00000002; + clientResVersion = value; + return this; + } + @Override public SyncClientResVersionScRsp copyFrom(final SyncClientResVersionScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientResVersion = other.clientResVersion; retcode = other.retcode; + clientResVersion = other.clientResVersion; } return this; } @@ -129,12 +129,12 @@ public final class SyncClientResVersionScRspOuterClass { return this; } cachedSize = -1; - if (other.hasClientResVersion()) { - setClientResVersion(other.clientResVersion); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasClientResVersion()) { + setClientResVersion(other.clientResVersion); + } return this; } @@ -145,8 +145,8 @@ public final class SyncClientResVersionScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - clientResVersion = 0; retcode = 0; + clientResVersion = 0; return this; } @@ -170,30 +170,30 @@ public final class SyncClientResVersionScRspOuterClass { } SyncClientResVersionScRsp other = (SyncClientResVersionScRsp) o; return bitField0_ == other.bitField0_ - && (!hasClientResVersion() || clientResVersion == other.clientResVersion) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasClientResVersion() || clientResVersion == other.clientResVersion); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(clientResVersion); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(clientResVersion); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } return size; } @@ -205,18 +205,18 @@ public final class SyncClientResVersionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // clientResVersion - clientResVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { // retcode retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // clientResVersion + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SyncClientResVersionScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } output.endObject(); } @@ -256,11 +256,10 @@ public final class SyncClientResVersionScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class SyncClientResVersionScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class SyncClientResVersionScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java index d4ef10a..fd2d76a 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 4; + * optional uint32 uid = 12; */ private int uid; @@ -34,7 +34,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 12; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 12; * @return this */ public SyncDeleteFriendScNotify clearUid() { @@ -52,7 +52,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 12; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 12; * @param value the uid to set * @return this */ @@ -129,7 +129,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 96: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java index 3379681..d2fc0fa 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncEntityBuffChangeListScNotifyOuterClass.java @@ -20,7 +20,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; */ private final RepeatedMessage entityBuffInfoList = RepeatedMessage.newEmptyInstance(EntityBuffChangeInfoOuterClass.EntityBuffChangeInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; * @return whether the entityBuffInfoList field is set */ public boolean hasEntityBuffInfoList() { @@ -43,7 +43,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; * @return this */ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { @@ -53,7 +53,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 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. @@ -68,7 +68,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 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 @@ -83,7 +83,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; * @param value the entityBuffInfoList to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 10; * @param values the entityBuffInfoList to add * @return this */ @@ -168,7 +168,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < entityBuffInfoList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(entityBuffInfoList.get(i)); } } @@ -190,7 +190,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 82: { // entityBuffInfoList tag = input.readRepeatedMessage(entityBuffInfoList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java index 9d799b7..43dbf46 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncHandleFriendScNotifyOuterClass.java @@ -19,17 +19,17 @@ public final class SyncHandleFriendScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 10; + * optional uint32 uid = 13; */ private int uid; /** - * optional bool handle_result = 6; + * optional bool handle_result = 8; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 14; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 13; * @return whether the uid field is set */ public boolean hasUid() { @@ -52,7 +52,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 13; * @return this */ public SyncHandleFriendScNotify clearUid() { @@ -62,7 +62,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 13; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 13; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 6; + * optional bool handle_result = 8; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -89,7 +89,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 6; + * optional bool handle_result = 8; * @return this */ public SyncHandleFriendScNotify clearHandleResult() { @@ -99,7 +99,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 6; + * optional bool handle_result = 8; * @return the handleResult */ public boolean getHandleResult() { @@ -107,7 +107,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 6; + * optional bool handle_result = 8; * @param value the handleResult to set * @return this */ @@ -118,7 +118,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 14; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -126,7 +126,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 14; * @return this */ public SyncHandleFriendScNotify clearHandleFriendInfo() { @@ -136,7 +136,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 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. @@ -150,7 +150,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 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 @@ -164,7 +164,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 1; + * optional .FriendListInfo handle_friend_info = 14; * @param value the handleFriendInfo to set * @return this */ @@ -247,15 +247,15 @@ public final class SyncHandleFriendScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 114); output.writeMessageNoTag(handleFriendInfo); } } @@ -282,25 +282,25 @@ public final class SyncHandleFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 104: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 64) { break; } } - case 48: { + case 64: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 114) { break; } } - case 10: { + case 114: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java index da30ba2..ce756c3 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncLineupNotifyOuterClass.java @@ -20,12 +20,12 @@ public final class SyncLineupNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 13; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_list = 1; */ private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); @@ -40,7 +40,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 13; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 13; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 9; + * 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. @@ -72,7 +72,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 9; + * 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 @@ -86,7 +86,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 9; + * optional .LineupInfo lineup = 13; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_list = 1; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_list = 1; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_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. @@ -129,7 +129,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_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 @@ -143,7 +143,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_list = 1; * @param value the reasonList to add * @return this */ @@ -154,7 +154,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 4; + * repeated .SyncReason reason_list = 1; * @param values the reasonList to add * @return this */ @@ -231,12 +231,12 @@ public final class SyncLineupNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +261,16 @@ public final class SyncLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 106: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +289,7 @@ public final class SyncLineupNotifyOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // reasonList [packed=false] tag = input.readRepeatedEnum(reasonList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java index 073cbcb..be5353f 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java @@ -20,17 +20,17 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_version_id = 10; + * optional uint32 rogue_version_id = 7; */ private int rogueVersionId; /** - * optional .RogueCommonActionResultDisplayType display_type = 9; + * optional .RogueCommonActionResultDisplayType display_type = 8; */ private int displayType; /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 5; */ private final RepeatedMessage actionResultList = RepeatedMessage.newEmptyInstance(RogueActionResultOuterClass.RogueActionResult.getFactory()); @@ -45,7 +45,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 10; + * optional uint32 rogue_version_id = 7; * @return whether the rogueVersionId field is set */ public boolean hasRogueVersionId() { @@ -53,7 +53,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 10; + * optional uint32 rogue_version_id = 7; * @return this */ public SyncRogueCommonActionResultScNotify clearRogueVersionId() { @@ -63,7 +63,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 10; + * optional uint32 rogue_version_id = 7; * @return the rogueVersionId */ public int getRogueVersionId() { @@ -71,7 +71,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 10; + * optional uint32 rogue_version_id = 7; * @param value the rogueVersionId to set * @return this */ @@ -82,7 +82,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 9; + * optional .RogueCommonActionResultDisplayType display_type = 8; * @return whether the displayType field is set */ public boolean hasDisplayType() { @@ -90,7 +90,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 9; + * optional .RogueCommonActionResultDisplayType display_type = 8; * @return this */ public SyncRogueCommonActionResultScNotify clearDisplayType() { @@ -100,7 +100,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 9; + * optional .RogueCommonActionResultDisplayType display_type = 8; * @return the displayType */ public RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType getDisplayType( @@ -134,7 +134,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 9; + * optional .RogueCommonActionResultDisplayType display_type = 8; * @param value the displayType to set * @return this */ @@ -146,7 +146,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 5; * @return whether the actionResultList field is set */ public boolean hasActionResultList() { @@ -154,7 +154,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 5; * @return this */ public SyncRogueCommonActionResultScNotify clearActionResultList() { @@ -164,7 +164,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 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. @@ -178,7 +178,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 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 @@ -193,7 +193,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 5; * @param value the actionResultList to add * @return this */ @@ -205,7 +205,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 2; + * repeated .RogueActionResult action_result_list = 5; * @param values the actionResultList to add * @return this */ @@ -290,16 +290,16 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeEnumNoTag(displayType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < actionResultList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 42); output.writeMessageNoTag(actionResultList.get(i)); } } @@ -328,16 +328,16 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 56: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { // displayType final int value = input.readInt32(); if (RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType.forNumber(value) != null) { @@ -345,11 +345,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 18) { + if (tag != 42) { break; } } - case 18: { + case 42: { // actionResultList tag = input.readRepeatedMessage(actionResultList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java index 1ba9774..b3a24c8 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java @@ -19,12 +19,12 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_version_id = 2; + * optional uint32 rogue_version_id = 11; */ private int rogueVersionId; /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 7; */ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction rogueCommonPendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); @@ -39,7 +39,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 2; + * optional uint32 rogue_version_id = 11; * @return whether the rogueVersionId field is set */ public boolean hasRogueVersionId() { @@ -47,7 +47,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 2; + * optional uint32 rogue_version_id = 11; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueVersionId() { @@ -57,7 +57,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 2; + * optional uint32 rogue_version_id = 11; * @return the rogueVersionId */ public int getRogueVersionId() { @@ -65,7 +65,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 2; + * optional uint32 rogue_version_id = 11; * @param value the rogueVersionId to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 7; * @return whether the rogueCommonPendingAction field is set */ public boolean hasRogueCommonPendingAction() { @@ -84,7 +84,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 7; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueCommonPendingAction() { @@ -94,7 +94,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 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. @@ -109,7 +109,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 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 @@ -124,7 +124,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 13; + * optional .RogueCommonPendingAction rogue_common_pending_action = 7; * @param value the rogueCommonPendingAction to set * @return this */ @@ -203,11 +203,11 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueCommonPendingAction); } } @@ -232,16 +232,16 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 88: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // rogueCommonPendingAction input.readMessage(rogueCommonPendingAction); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java index 5779f1b..a1ce05c 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueFinishScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class SyncRogueFinishScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_info = 7; */ private final RogueFinishInfoOuterClass.RogueFinishInfo finishInfo = RogueFinishInfoOuterClass.RogueFinishInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_info = 7; * @return whether the finishInfo field is set */ public boolean hasFinishInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_info = 7; * @return this */ public SyncRogueFinishScNotify clearFinishInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_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. @@ -66,7 +66,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_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 @@ -80,7 +80,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 10; + * optional .RogueFinishInfo finish_info = 7; * @param value the finishInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class SyncRogueFinishScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 58); output.writeMessageNoTag(finishInfo); } } @@ -172,7 +172,7 @@ public final class SyncRogueFinishScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 58: { // finishInfo input.readMessage(finishInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueMapRoomScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueMapRoomScNotifyOuterClass.java index f0e3d3c..c2c1550 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueMapRoomScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueMapRoomScNotifyOuterClass.java @@ -19,12 +19,12 @@ public final class SyncRogueMapRoomScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 6; */ private int mapId; /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 8; */ private final RogueRoomOuterClass.RogueRoom curRoom = RogueRoomOuterClass.RogueRoom.newInstance(); @@ -39,7 +39,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 6; * @return whether the mapId field is set */ public boolean hasMapId() { @@ -47,7 +47,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 6; * @return this */ public SyncRogueMapRoomScNotify clearMapId() { @@ -57,7 +57,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 6; * @return the mapId */ public int getMapId() { @@ -65,7 +65,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 5; + * optional uint32 map_id = 6; * @param value the mapId to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 8; * @return whether the curRoom field is set */ public boolean hasCurRoom() { @@ -84,7 +84,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 8; * @return this */ public SyncRogueMapRoomScNotify clearCurRoom() { @@ -94,7 +94,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 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. @@ -108,7 +108,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 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 @@ -122,7 +122,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 13; + * optional .RogueRoom cur_room = 8; * @param value the curRoom to set * @return this */ @@ -198,11 +198,11 @@ public final class SyncRogueMapRoomScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 66); output.writeMessageNoTag(curRoom); } } @@ -226,16 +226,16 @@ public final class SyncRogueMapRoomScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 48: { // mapId mapId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 66) { break; } } - case 106: { + case 66: { // curRoom input.readMessage(curRoom); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueStatusScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueStatusScNotifyOuterClass.java index 5948bf1..3b7c408 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueStatusScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueStatusScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class SyncRogueStatusScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueStatus rogue_status = 15; + * optional .RogueStatus rogue_status = 6; */ private int rogueStatus; @@ -34,7 +34,7 @@ public final class SyncRogueStatusScNotifyOuterClass { } /** - * optional .RogueStatus rogue_status = 15; + * optional .RogueStatus rogue_status = 6; * @return whether the rogueStatus field is set */ public boolean hasRogueStatus() { @@ -42,7 +42,7 @@ public final class SyncRogueStatusScNotifyOuterClass { } /** - * optional .RogueStatus rogue_status = 15; + * optional .RogueStatus rogue_status = 6; * @return this */ public SyncRogueStatusScNotify clearRogueStatus() { @@ -52,7 +52,7 @@ public final class SyncRogueStatusScNotifyOuterClass { } /** - * optional .RogueStatus rogue_status = 15; + * optional .RogueStatus rogue_status = 6; * @return the rogueStatus */ public RogueStatusOuterClass.RogueStatus getRogueStatus() { @@ -85,7 +85,7 @@ public final class SyncRogueStatusScNotifyOuterClass { } /** - * optional .RogueStatus rogue_status = 15; + * optional .RogueStatus rogue_status = 6; * @param value the rogueStatus to set * @return this */ @@ -154,7 +154,7 @@ public final class SyncRogueStatusScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeEnumNoTag(rogueStatus); } } @@ -175,7 +175,7 @@ public final class SyncRogueStatusScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 48: { // rogueStatus final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java index cdc8cf8..92a08a1 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItemInfo = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; * @return whether the rogueVirtualItemInfo field is set */ public boolean hasRogueVirtualItemInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; * @return this */ public SyncRogueVirtualItemInfoScNotify clearRogueVirtualItemInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_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. @@ -66,7 +66,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_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,7 +80,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 3; * @param value the rogueVirtualItemInfo to set * @return this */ @@ -152,7 +152,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeMessageNoTag(rogueVirtualItemInfo); } } @@ -173,7 +173,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 26: { // rogueVirtualItemInfo input.readMessage(rogueVirtualItemInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java index 9db80a8..19f710b 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class TakeChallengeRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 13; */ private int groupId; @@ -34,7 +34,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 13; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -42,7 +42,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 13; * @return this */ public TakeChallengeRewardCsReq clearGroupId() { @@ -52,7 +52,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 13; * @return the groupId */ public int getGroupId() { @@ -60,7 +60,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 13; * @param value the groupId to set * @return this */ @@ -129,7 +129,7 @@ public final class TakeChallengeRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(groupId); } } @@ -150,7 +150,7 @@ public final class TakeChallengeRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 104: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java index 55b57c8..6e0017a 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeChallengeRewardScRspOuterClass.java @@ -20,17 +20,17 @@ public final class TakeChallengeRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 5; */ private int groupId; /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; */ private final RepeatedMessage takenRewardList = RepeatedMessage.newEmptyInstance(TakenChallengeRewardInfoOuterClass.TakenChallengeRewardInfo.getFactory()); @@ -45,7 +45,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 5; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -53,7 +53,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 5; * @return this */ public TakeChallengeRewardScRsp clearGroupId() { @@ -63,7 +63,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 5; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 5; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return this */ public TakeChallengeRewardScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -127,7 +127,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @return this */ public TakeChallengeRewardScRsp clearTakenRewardList() { @@ -137,7 +137,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_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. @@ -152,7 +152,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_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 @@ -167,7 +167,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @param value the takenRewardList to add * @return this */ @@ -179,7 +179,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 5; + * repeated .TakenChallengeRewardInfo taken_reward_list = 13; * @param values the takenRewardList to add * @return this */ @@ -262,16 +262,16 @@ public final class TakeChallengeRewardScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 106); output.writeMessageNoTag(takenRewardList.get(i)); } } @@ -299,25 +299,25 @@ public final class TakeChallengeRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 40: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 106) { break; } } - case 42: { + case 106: { // takenRewardList tag = input.readRepeatedMessage(takenRewardList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java index ea3be76..e7e2089 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class TakeMailAttachmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 optional_reward_id = 7; + * optional uint32 optional_reward_id = 12; */ private int optionalRewardId; /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 8; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 7; + * optional uint32 optional_reward_id = 12; * @return whether the optionalRewardId field is set */ public boolean hasOptionalRewardId() { @@ -48,7 +48,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 7; + * optional uint32 optional_reward_id = 12; * @return this */ public TakeMailAttachmentCsReq clearOptionalRewardId() { @@ -58,7 +58,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 7; + * optional uint32 optional_reward_id = 12; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -66,7 +66,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 7; + * optional uint32 optional_reward_id = 12; * @param value the optionalRewardId to set * @return this */ @@ -77,7 +77,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 8; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -85,7 +85,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 8; * @return this */ public TakeMailAttachmentCsReq clearMailIdList() { @@ -95,7 +95,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_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. @@ -109,7 +109,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_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 @@ -123,7 +123,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 8; * @param value the mailIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 1; + * repeated uint32 mail_id_list = 8; * @param values the mailIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class TakeMailAttachmentCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mailIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class TakeMailAttachmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 96: { // optionalRewardId optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class TakeMailAttachmentCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 64: { // mailIdList [packed=false] tag = input.readRepeatedUInt32(mailIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java index 28f2da4..91803b0 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeMailAttachmentScRspOuterClass.java @@ -20,17 +20,17 @@ public final class TakeMailAttachmentScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 15; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_list = 13; */ private final RepeatedInt succMailIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public TakeMailAttachmentScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 15; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -90,7 +90,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 15; * @return this */ public TakeMailAttachmentScRsp clearAttachment() { @@ -100,7 +100,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 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. @@ -114,7 +114,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 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 @@ -128,7 +128,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 4; + * optional .ItemList attachment = 15; * @param value the attachment to set * @return this */ @@ -139,7 +139,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_list = 13; * @return whether the succMailIdList field is set */ public boolean hasSuccMailIdList() { @@ -147,7 +147,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_list = 13; * @return this */ public TakeMailAttachmentScRsp clearSuccMailIdList() { @@ -157,7 +157,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_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. @@ -171,7 +171,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_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 @@ -185,7 +185,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_list = 13; * @param value the succMailIdList to add * @return this */ @@ -196,7 +196,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 11; + * repeated uint32 succ_mail_id_list = 13; * @param values the succMailIdList to add * @return this */ @@ -279,16 +279,16 @@ public final class TakeMailAttachmentScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < succMailIdList.length(); i++) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(succMailIdList.array()[i]); } } @@ -316,25 +316,25 @@ public final class TakeMailAttachmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 122) { break; } } - case 34: { + case 122: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 106) { break; } } - case 90: { + case 106: { // succMailIdList [packed=true] input.readPackedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; @@ -353,7 +353,7 @@ public final class TakeMailAttachmentScRspOuterClass { tag = input.readTag(); break; } - case 88: { + case 104: { // succMailIdList [packed=false] tag = input.readRepeatedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java index cb1f1d0..4d9f978 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java @@ -19,13 +19,9 @@ public final class TakeOffEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  uint32 base_avatar_id = 14;
-     *
- * - * optional uint32 equip_avatar_id = 7; + * optional uint32 avatar_id = 11; */ - private int equipAvatarId; + private int avatarId; private TakeOffEquipmentCsReq() { } @@ -38,55 +34,39 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 14;
-     *
- * - * optional uint32 equip_avatar_id = 7; - * @return whether the equipAvatarId field is set + * optional uint32 avatar_id = 11; + * @return whether the avatarId field is set */ - public boolean hasEquipAvatarId() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  uint32 base_avatar_id = 14;
-     *
- * - * optional uint32 equip_avatar_id = 7; + * optional uint32 avatar_id = 11; * @return this */ - public TakeOffEquipmentCsReq clearEquipAvatarId() { + public TakeOffEquipmentCsReq clearAvatarId() { bitField0_ &= ~0x00000001; - equipAvatarId = 0; + avatarId = 0; return this; } /** - * 
-     *  uint32 base_avatar_id = 14;
-     *
- * - * optional uint32 equip_avatar_id = 7; - * @return the equipAvatarId + * optional uint32 avatar_id = 11; + * @return the avatarId */ - public int getEquipAvatarId() { - return equipAvatarId; + public int getAvatarId() { + return avatarId; } /** - * 
-     *  uint32 base_avatar_id = 14;
-     *
- * - * optional uint32 equip_avatar_id = 7; - * @param value the equipAvatarId to set + * optional uint32 avatar_id = 11; + * @param value the avatarId to set * @return this */ - public TakeOffEquipmentCsReq setEquipAvatarId(final int value) { + public TakeOffEquipmentCsReq setAvatarId(final int value) { bitField0_ |= 0x00000001; - equipAvatarId = value; + avatarId = value; return this; } @@ -95,7 +75,7 @@ public final class TakeOffEquipmentCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipAvatarId = other.equipAvatarId; + avatarId = other.avatarId; } return this; } @@ -106,8 +86,8 @@ public final class TakeOffEquipmentCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); } return this; } @@ -119,7 +99,7 @@ public final class TakeOffEquipmentCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - equipAvatarId = 0; + avatarId = 0; return this; } @@ -143,14 +123,14 @@ public final class TakeOffEquipmentCsReqOuterClass { } TakeOffEquipmentCsReq other = (TakeOffEquipmentCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId); + && (!hasAvatarId() || avatarId == other.avatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(equipAvatarId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(avatarId); } } @@ -158,7 +138,7 @@ public final class TakeOffEquipmentCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } return size; } @@ -170,9 +150,9 @@ public final class TakeOffEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // equipAvatarId - equipAvatarId = input.readUInt32(); + case 88: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -197,7 +177,7 @@ public final class TakeOffEquipmentCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.avatarId, avatarId); } output.endObject(); } @@ -209,11 +189,11 @@ public final class TakeOffEquipmentCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -274,7 +254,7 @@ public final class TakeOffEquipmentCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java index 7d6aa60..ced8e23 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java @@ -20,16 +20,12 @@ public final class TakeOffRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional uint32 equip_avatar_id = 1; + * optional uint32 avatar_id = 8; */ - private int equipAvatarId; + private int avatarId; /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 5; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -44,60 +40,44 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional uint32 equip_avatar_id = 1; - * @return whether the equipAvatarId field is set + * optional uint32 avatar_id = 8; + * @return whether the avatarId field is set */ - public boolean hasEquipAvatarId() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional uint32 equip_avatar_id = 1; + * optional uint32 avatar_id = 8; * @return this */ - public TakeOffRelicCsReq clearEquipAvatarId() { + public TakeOffRelicCsReq clearAvatarId() { bitField0_ &= ~0x00000001; - equipAvatarId = 0; + avatarId = 0; return this; } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional uint32 equip_avatar_id = 1; - * @return the equipAvatarId + * optional uint32 avatar_id = 8; + * @return the avatarId */ - public int getEquipAvatarId() { - return equipAvatarId; + public int getAvatarId() { + return avatarId; } /** - * 
-     *  uint32 base_avatar_id = 2;
-     *
- * - * optional uint32 equip_avatar_id = 1; - * @param value the equipAvatarId to set + * optional uint32 avatar_id = 8; + * @param value the avatarId to set * @return this */ - public TakeOffRelicCsReq setEquipAvatarId(final int value) { + public TakeOffRelicCsReq setAvatarId(final int value) { bitField0_ |= 0x00000001; - equipAvatarId = value; + avatarId = value; return this; } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 5; * @return whether the slotList field is set */ public boolean hasSlotList() { @@ -105,7 +85,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 5; * @return this */ public TakeOffRelicCsReq clearSlotList() { @@ -115,7 +95,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 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. @@ -129,7 +109,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 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 @@ -143,7 +123,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 5; * @param value the slotList to add * @return this */ @@ -154,7 +134,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 8; + * repeated uint32 slot_list = 5; * @param values the slotList to add * @return this */ @@ -169,7 +149,7 @@ public final class TakeOffRelicCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipAvatarId = other.equipAvatarId; + avatarId = other.avatarId; slotList.copyFrom(other.slotList); } return this; @@ -181,8 +161,8 @@ public final class TakeOffRelicCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); } if (other.hasSlotList()) { getMutableSlotList().addAll(other.slotList); @@ -197,7 +177,7 @@ public final class TakeOffRelicCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - equipAvatarId = 0; + avatarId = 0; slotList.clear(); return this; } @@ -223,19 +203,19 @@ public final class TakeOffRelicCsReqOuterClass { } TakeOffRelicCsReq other = (TakeOffRelicCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasSlotList() || slotList.equals(other.slotList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(equipAvatarId); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -245,7 +225,7 @@ public final class TakeOffRelicCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { size += (1 * slotList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(slotList); @@ -260,16 +240,16 @@ public final class TakeOffRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // equipAvatarId - equipAvatarId = input.readUInt32(); + case 64: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -288,7 +268,7 @@ public final class TakeOffRelicCsReqOuterClass { tag = input.readTag(); break; } - case 64: { + case 40: { // slotList [packed=false] tag = input.readRepeatedUInt32(slotList, tag); bitField0_ |= 0x00000002; @@ -302,7 +282,7 @@ public final class TakeOffRelicCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.slotList, slotList); @@ -317,11 +297,11 @@ public final class TakeOffRelicCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -394,7 +374,7 @@ public final class TakeOffRelicCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); static final FieldName slotList = FieldName.forField("slotList", "slot_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java index 50af32a..c1a0647 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class TakePromotionRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 7; */ private int baseAvatarId; /** - * optional uint32 promotion = 2; + * optional uint32 promotion = 15; */ private int promotion; @@ -39,7 +39,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 7; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 7; * @return this */ public TakePromotionRewardCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 7; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 1; + * optional uint32 base_avatar_id = 7; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 2; + * optional uint32 promotion = 15; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 2; + * optional uint32 promotion = 15; * @return this */ public TakePromotionRewardCsReq clearPromotion() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 2; + * optional uint32 promotion = 15; * @return the promotion */ public int getPromotion() { @@ -102,7 +102,7 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 2; + * optional uint32 promotion = 15; * @param value the promotion to set * @return this */ @@ -177,11 +177,11 @@ public final class TakePromotionRewardCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(promotion); } } @@ -205,16 +205,16 @@ public final class TakePromotionRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 120) { break; } } - case 16: { + case 120: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java index 1e73a23..af3c4dd 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java @@ -19,12 +19,12 @@ public final class TakePromotionRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .ItemList reward_list = 13; + * optional .ItemList reward_list = 1; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 13; + * optional .ItemList reward_list = 1; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 13; + * optional .ItemList reward_list = 1; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 13; + * optional .ItemList 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. @@ -108,7 +108,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 13; + * optional .ItemList 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 @@ -122,7 +122,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 13; + * optional .ItemList reward_list = 1; * @param value the rewardList to set * @return this */ @@ -198,11 +198,11 @@ public final class TakePromotionRewardScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 10); output.writeMessageNoTag(rewardList); } } @@ -226,16 +226,16 @@ public final class TakePromotionRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 10) { break; } } - case 106: { + case 10: { // rewardList input.readMessage(rewardList); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java index 90db19e..d1b0504 100644 --- a/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakenChallengeRewardInfoOuterClass.java @@ -19,12 +19,12 @@ public final class TakenChallengeRewardInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 star_count = 5; + * optional uint32 star_count = 11; */ private int starCount; /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 1; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 5; + * optional uint32 star_count = 11; * @return whether the starCount field is set */ public boolean hasStarCount() { @@ -47,7 +47,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 5; + * optional uint32 star_count = 11; * @return this */ public TakenChallengeRewardInfo clearStarCount() { @@ -57,7 +57,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 5; + * optional uint32 star_count = 11; * @return the starCount */ public int getStarCount() { @@ -65,7 +65,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 5; + * optional uint32 star_count = 11; * @param value the starCount to set * @return this */ @@ -76,7 +76,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 1; * @return whether the reward field is set */ public boolean hasReward() { @@ -84,7 +84,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 1; * @return this */ public TakenChallengeRewardInfo clearReward() { @@ -94,7 +94,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 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. @@ -108,7 +108,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 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 @@ -122,7 +122,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 3; + * optional .ItemList reward = 1; * @param value the reward to set * @return this */ @@ -198,11 +198,11 @@ public final class TakenChallengeRewardInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(reward); } } @@ -226,16 +226,16 @@ public final class TakenChallengeRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 88: { // starCount starCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // reward input.readMessage(reward); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java index a775441..52b4a23 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinQueryCsReqOuterClass.java @@ -20,7 +20,7 @@ public final class TextJoinQueryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_id_list = 8; */ private final RepeatedInt textJoinIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_id_list = 8; * @return whether the textJoinIdList field is set */ public boolean hasTextJoinIdList() { @@ -43,7 +43,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_id_list = 8; * @return this */ public TextJoinQueryCsReq clearTextJoinIdList() { @@ -53,7 +53,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_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. @@ -67,7 +67,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_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 @@ -81,7 +81,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_id_list = 8; * @param value the textJoinIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class TextJoinQueryCsReqOuterClass { } /** - * repeated uint32 text_join_id_list = 3; + * repeated uint32 text_join_id_list = 8; * @param values the textJoinIdList to add * @return this */ @@ -163,7 +163,7 @@ public final class TextJoinQueryCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { for (int i = 0; i < textJoinIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(textJoinIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class TextJoinQueryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 66: { // textJoinIdList [packed=true] input.readPackedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class TextJoinQueryCsReqOuterClass { tag = input.readTag(); break; } - case 24: { + case 64: { // textJoinIdList [packed=false] tag = input.readRepeatedUInt32(textJoinIdList, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java index 1c7adf5..bbc1b96 100644 --- a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java @@ -20,12 +20,12 @@ public final class TextJoinQueryScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 3; */ private int retcode; /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 10; */ private final RepeatedMessage textJoinList = RepeatedMessage.newEmptyInstance(TextJoinInfoOuterClass.TextJoinInfo.getFactory()); @@ -40,7 +40,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 3; * @return this */ public TextJoinQueryScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 10; * @return whether the textJoinList field is set */ public boolean hasTextJoinList() { @@ -85,7 +85,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 10; * @return this */ public TextJoinQueryScRsp clearTextJoinList() { @@ -95,7 +95,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 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. @@ -109,7 +109,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 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 @@ -123,7 +123,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 10; * @param value the textJoinList to add * @return this */ @@ -134,7 +134,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 5; + * repeated .TextJoinInfo text_join_list = 10; * @param values the textJoinList to add * @return this */ @@ -211,12 +211,12 @@ public final class TextJoinQueryScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < textJoinList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 82); output.writeMessageNoTag(textJoinList.get(i)); } } @@ -241,16 +241,16 @@ public final class TextJoinQueryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 82) { break; } } - case 42: { + case 82: { // textJoinList tag = input.readRepeatedMessage(textJoinList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java index d818f8e..58f47f0 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockChatBubbleScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 bubble_id = 12; + * optional uint32 bubble_id = 14; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 12; + * optional uint32 bubble_id = 14; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 12; + * optional uint32 bubble_id = 14; * @return this */ public UnlockChatBubbleScNotify clearBubbleId() { @@ -52,7 +52,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 12; + * optional uint32 bubble_id = 14; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 12; + * optional uint32 bubble_id = 14; * @param value the bubbleId to set * @return this */ @@ -129,7 +129,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 112: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java index 380061f..f94891c 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 10; */ private int themeId; @@ -34,7 +34,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 10; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 10; * @return this */ public UnlockPhoneThemeScNotify clearThemeId() { @@ -52,7 +52,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 10; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 8; + * optional uint32 theme_id = 10; * @param value the themeId to set * @return this */ @@ -129,7 +129,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 80: { // themeId themeId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java index 2dd7eec..e5d51ae 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeCsReqOuterClass.java @@ -20,17 +20,17 @@ public final class UnlockSkilltreeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 point_id = 6; + * optional uint32 point_id = 12; */ private int pointId; /** - * optional uint32 level = 11; + * optional uint32 level = 14; */ private int level; /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 6; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -45,7 +45,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 6; + * optional uint32 point_id = 12; * @return whether the pointId field is set */ public boolean hasPointId() { @@ -53,7 +53,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 6; + * optional uint32 point_id = 12; * @return this */ public UnlockSkilltreeCsReq clearPointId() { @@ -63,7 +63,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 6; + * optional uint32 point_id = 12; * @return the pointId */ public int getPointId() { @@ -71,7 +71,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 6; + * optional uint32 point_id = 12; * @param value the pointId to set * @return this */ @@ -82,7 +82,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 14; * @return whether the level field is set */ public boolean hasLevel() { @@ -90,7 +90,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 14; * @return this */ public UnlockSkilltreeCsReq clearLevel() { @@ -100,7 +100,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 14; * @return the level */ public int getLevel() { @@ -108,7 +108,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 14; * @param value the level to set * @return this */ @@ -119,7 +119,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 6; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -127,7 +127,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 6; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_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. @@ -151,7 +151,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_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 @@ -165,7 +165,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 6; * @param value the itemList to add * @return this */ @@ -176,7 +176,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 15; + * repeated .ItemCost item_list = 6; * @param values the itemList to add * @return this */ @@ -258,16 +258,16 @@ public final class UnlockSkilltreeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 50); output.writeMessageNoTag(itemList.get(i)); } } @@ -295,25 +295,25 @@ public final class UnlockSkilltreeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 96: { // pointId pointId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { + case 112: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 50) { break; } } - case 122: { + case 50: { // itemList tag = input.readRepeatedMessage(itemList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java index 89ae580..bb893b1 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,24 +19,20 @@ public final class UnlockSkilltreeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 level = 2; + */ + private int level; + + /** + * optional uint32 retcode = 11; */ private int retcode; /** - * 
-     *  uint32 base_avatar_id = 6;
-     *
- * - * optional uint32 point_id = 5; + * optional uint32 point_id = 15; */ private int pointId; - /** - * optional uint32 level = 8; - */ - private int level; - private UnlockSkilltreeScRsp() { } @@ -48,115 +44,25 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 level = 2; + * @return whether the level field is set */ - public boolean hasRetcode() { + public boolean hasLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public UnlockSkilltreeScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - retcode = 0; - return this; - } - - /** - * optional uint32 retcode = 1; - * @return the retcode - */ - public int getRetcode() { - return retcode; - } - - /** - * optional uint32 retcode = 1; - * @param value the retcode to set - * @return this - */ - public UnlockSkilltreeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * 
-     *  uint32 base_avatar_id = 6;
-     *
- * - * optional uint32 point_id = 5; - * @return whether the pointId field is set - */ - public boolean hasPointId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  uint32 base_avatar_id = 6;
-     *
- * - * optional uint32 point_id = 5; - * @return this - */ - public UnlockSkilltreeScRsp clearPointId() { - bitField0_ &= ~0x00000002; - pointId = 0; - return this; - } - - /** - * 
-     *  uint32 base_avatar_id = 6;
-     *
- * - * optional uint32 point_id = 5; - * @return the pointId - */ - public int getPointId() { - return pointId; - } - - /** - * 
-     *  uint32 base_avatar_id = 6;
-     *
- * - * optional uint32 point_id = 5; - * @param value the pointId to set - * @return this - */ - public UnlockSkilltreeScRsp setPointId(final int value) { - bitField0_ |= 0x00000002; - pointId = value; - return this; - } - - /** - * optional uint32 level = 8; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @return this */ public UnlockSkilltreeScRsp clearLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; level = 0; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @return the level */ public int getLevel() { @@ -164,24 +70,98 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 2; * @param value the level to set * @return this */ public UnlockSkilltreeScRsp setLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; level = value; return this; } + /** + * optional uint32 retcode = 11; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 11; + * @return this + */ + public UnlockSkilltreeScRsp clearRetcode() { + bitField0_ &= ~0x00000002; + retcode = 0; + return this; + } + + /** + * optional uint32 retcode = 11; + * @return the retcode + */ + public int getRetcode() { + return retcode; + } + + /** + * optional uint32 retcode = 11; + * @param value the retcode to set + * @return this + */ + public UnlockSkilltreeScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional uint32 point_id = 15; + * @return whether the pointId field is set + */ + public boolean hasPointId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 point_id = 15; + * @return this + */ + public UnlockSkilltreeScRsp clearPointId() { + bitField0_ &= ~0x00000004; + pointId = 0; + return this; + } + + /** + * optional uint32 point_id = 15; + * @return the pointId + */ + public int getPointId() { + return pointId; + } + + /** + * optional uint32 point_id = 15; + * @param value the pointId to set + * @return this + */ + public UnlockSkilltreeScRsp setPointId(final int value) { + bitField0_ |= 0x00000004; + pointId = value; + return this; + } + @Override public UnlockSkilltreeScRsp copyFrom(final UnlockSkilltreeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + level = other.level; retcode = other.retcode; pointId = other.pointId; - level = other.level; } return this; } @@ -192,15 +172,15 @@ public final class UnlockSkilltreeScRspOuterClass { return this; } cachedSize = -1; + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasPointId()) { setPointId(other.pointId); } - if (other.hasLevel()) { - setLevel(other.level); - } return this; } @@ -211,9 +191,9 @@ public final class UnlockSkilltreeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + level = 0; retcode = 0; pointId = 0; - level = 0; return this; } @@ -237,24 +217,24 @@ public final class UnlockSkilltreeScRspOuterClass { } UnlockSkilltreeScRsp other = (UnlockSkilltreeScRsp) o; return bitField0_ == other.bitField0_ + && (!hasLevel() || level == other.level) && (!hasRetcode() || retcode == other.retcode) - && (!hasPointId() || pointId == other.pointId) - && (!hasLevel() || level == other.level); + && (!hasPointId() || pointId == other.pointId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(pointId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(pointId); } } @@ -262,13 +242,13 @@ public final class UnlockSkilltreeScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } return size; } @@ -280,27 +260,27 @@ public final class UnlockSkilltreeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // pointId - pointId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 16: { // level level = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // pointId + pointId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -325,13 +305,13 @@ public final class UnlockSkilltreeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.pointId, pointId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.pointId, pointId); } output.endObject(); } @@ -343,11 +323,22 @@ public final class UnlockSkilltreeScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -359,17 +350,6 @@ public final class UnlockSkilltreeScRspOuterClass { if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { pointId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -430,11 +410,11 @@ public final class UnlockSkilltreeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName level = FieldName.forField("level"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName pointId = FieldName.forField("pointId", "point_id"); - - static final FieldName level = FieldName.forField("level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java index 9fd7286..d560849 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockedMusicOuterClass.java @@ -19,17 +19,17 @@ public final class UnlockedMusicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 1; - */ - private int id; - - /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 8; */ private int groupId; /** - * optional bool unkbool = 13; + * optional uint32 id = 12; + */ + private int id; + + /** + * optional bool unkbool = 5; */ private boolean unkbool; @@ -44,62 +44,25 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 1; - * @return whether the id field is set + * optional uint32 group_id = 8; + * @return whether the groupId field is set */ - public boolean hasId() { + public boolean hasGroupId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 id = 1; - * @return this - */ - public UnlockedMusic clearId() { - bitField0_ &= ~0x00000001; - id = 0; - return this; - } - - /** - * optional uint32 id = 1; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 1; - * @param value the id to set - * @return this - */ - public UnlockedMusic setId(final int value) { - bitField0_ |= 0x00000001; - id = value; - return this; - } - - /** - * optional uint32 group_id = 2; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 8; * @return this */ public UnlockedMusic clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 8; * @return the groupId */ public int getGroupId() { @@ -107,18 +70,55 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 2; + * optional uint32 group_id = 8; * @param value the groupId to set * @return this */ public UnlockedMusic setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * optional bool unkbool = 13; + * optional uint32 id = 12; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 id = 12; + * @return this + */ + public UnlockedMusic clearId() { + bitField0_ &= ~0x00000002; + id = 0; + return this; + } + + /** + * optional uint32 id = 12; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 12; + * @param value the id to set + * @return this + */ + public UnlockedMusic setId(final int value) { + bitField0_ |= 0x00000002; + id = value; + return this; + } + + /** + * optional bool unkbool = 5; * @return whether the unkbool field is set */ public boolean hasUnkbool() { @@ -126,7 +126,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 13; + * optional bool unkbool = 5; * @return this */ public UnlockedMusic clearUnkbool() { @@ -136,7 +136,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 13; + * optional bool unkbool = 5; * @return the unkbool */ public boolean getUnkbool() { @@ -144,7 +144,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 13; + * optional bool unkbool = 5; * @param value the unkbool to set * @return this */ @@ -159,8 +159,8 @@ public final class UnlockedMusicOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; groupId = other.groupId; + id = other.id; unkbool = other.unkbool; } return this; @@ -172,12 +172,12 @@ public final class UnlockedMusicOuterClass { return this; } cachedSize = -1; - if (other.hasId()) { - setId(other.id); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasId()) { + setId(other.id); + } if (other.hasUnkbool()) { setUnkbool(other.unkbool); } @@ -191,8 +191,8 @@ public final class UnlockedMusicOuterClass { } cachedSize = -1; bitField0_ = 0; - id = 0; groupId = 0; + id = 0; unkbool = false; return this; } @@ -217,23 +217,23 @@ public final class UnlockedMusicOuterClass { } UnlockedMusic other = (UnlockedMusic) o; return bitField0_ == other.bitField0_ - && (!hasId() || id == other.id) && (!hasGroupId() || groupId == other.groupId) + && (!hasId() || id == other.id) && (!hasUnkbool() || unkbool == other.unkbool); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(groupId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 40); output.writeBoolNoTag(unkbool); } } @@ -242,10 +242,10 @@ public final class UnlockedMusicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class UnlockedMusicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { + case 64: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // unkbool unkbool = input.readBool(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class UnlockedMusicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.unkbool, unkbool); @@ -323,10 +323,11 @@ public final class UnlockedMusicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -334,11 +335,10 @@ public final class UnlockedMusicOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -409,10 +409,10 @@ public final class UnlockedMusicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName id = FieldName.forField("id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName id = FieldName.forField("id"); + static final FieldName unkbool = FieldName.forField("unkbool"); } } diff --git a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java index cef7f28..618ee92 100644 --- a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 4; */ private final ServerPrefsOuterClass.ServerPrefs serverPrefs = ServerPrefsOuterClass.ServerPrefs.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 4; * @return whether the serverPrefs field is set */ public boolean hasServerPrefs() { @@ -42,7 +42,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 4; * @return this */ public UpdateServerPrefsDataCsReq clearServerPrefs() { @@ -52,7 +52,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 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. @@ -66,7 +66,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 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 @@ -80,7 +80,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 14; + * optional .ServerPrefs server_prefs = 4; * @param value the serverPrefs to set * @return this */ @@ -151,7 +151,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 34); output.writeMessageNoTag(serverPrefs); } } @@ -172,7 +172,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 34: { // serverPrefs input.readMessage(serverPrefs); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java index b6650d8..4bcf8dd 100644 --- a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java @@ -19,15 +19,15 @@ public final class UpdateServerPrefsDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 server_prefs_id = 6; - */ - private int serverPrefsId; - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 5; */ private int retcode; + /** + * optional uint32 server_prefs_id = 7; + */ + private int serverPrefsId; + private UpdateServerPrefsDataScRsp() { } @@ -39,62 +39,25 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 6; - * @return whether the serverPrefsId field is set + * optional uint32 retcode = 5; + * @return whether the retcode field is set */ - public boolean hasServerPrefsId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 server_prefs_id = 6; - * @return this - */ - public UpdateServerPrefsDataScRsp clearServerPrefsId() { - bitField0_ &= ~0x00000001; - serverPrefsId = 0; - return this; - } - - /** - * optional uint32 server_prefs_id = 6; - * @return the serverPrefsId - */ - public int getServerPrefsId() { - return serverPrefsId; - } - - /** - * optional uint32 server_prefs_id = 6; - * @param value the serverPrefsId to set - * @return this - */ - public UpdateServerPrefsDataScRsp setServerPrefsId(final int value) { - bitField0_ |= 0x00000001; - serverPrefsId = value; - return this; - } - - /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 5; * @return this */ public UpdateServerPrefsDataScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ public UpdateServerPrefsDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * optional uint32 server_prefs_id = 7; + * @return whether the serverPrefsId field is set + */ + public boolean hasServerPrefsId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 server_prefs_id = 7; + * @return this + */ + public UpdateServerPrefsDataScRsp clearServerPrefsId() { + bitField0_ &= ~0x00000002; + serverPrefsId = 0; + return this; + } + + /** + * optional uint32 server_prefs_id = 7; + * @return the serverPrefsId + */ + public int getServerPrefsId() { + return serverPrefsId; + } + + /** + * optional uint32 server_prefs_id = 7; + * @param value the serverPrefsId to set + * @return this + */ + public UpdateServerPrefsDataScRsp setServerPrefsId(final int value) { + bitField0_ |= 0x00000002; + serverPrefsId = value; + return this; + } + @Override public UpdateServerPrefsDataScRsp copyFrom(final UpdateServerPrefsDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - serverPrefsId = other.serverPrefsId; retcode = other.retcode; + serverPrefsId = other.serverPrefsId; } return this; } @@ -129,12 +129,12 @@ public final class UpdateServerPrefsDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasServerPrefsId()) { - setServerPrefsId(other.serverPrefsId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasServerPrefsId()) { + setServerPrefsId(other.serverPrefsId); + } return this; } @@ -145,8 +145,8 @@ public final class UpdateServerPrefsDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - serverPrefsId = 0; retcode = 0; + serverPrefsId = 0; return this; } @@ -170,19 +170,19 @@ public final class UpdateServerPrefsDataScRspOuterClass { } UpdateServerPrefsDataScRsp other = (UpdateServerPrefsDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasServerPrefsId() || serverPrefsId == other.serverPrefsId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasServerPrefsId() || serverPrefsId == other.serverPrefsId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(serverPrefsId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(serverPrefsId); } } @@ -190,10 +190,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(serverPrefsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(serverPrefsId); } return size; } @@ -205,18 +205,18 @@ public final class UpdateServerPrefsDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // serverPrefsId - serverPrefsId = input.readUInt32(); + case 40: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // retcode - retcode = input.readUInt32(); + case 56: { + // serverPrefsId + serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.serverPrefsId, serverPrefsId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.serverPrefsId, serverPrefsId); } output.endObject(); } @@ -256,11 +256,10 @@ public final class UpdateServerPrefsDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 656672552: - case 2077691526: { - if (input.isAtField(FieldNames.serverPrefsId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - serverPrefsId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,10 +267,11 @@ public final class UpdateServerPrefsDataScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 656672552: + case 2077691526: { + if (input.isAtField(FieldNames.serverPrefsId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class UpdateServerPrefsDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName serverPrefsId = FieldName.forField("serverPrefsId", "server_prefs_id"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName serverPrefsId = FieldName.forField("serverPrefsId", "server_prefs_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java index d98e336..e5aca59 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java @@ -19,22 +19,26 @@ public final class UseItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 optional_reward_id = 4; + * 
+     *  bool LBDJNGPKPMN = 1;
+     *
+ * + * optional uint32 optional_reward_id = 5; */ private int optionalRewardId; /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 10; */ private int useItemId; /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 11; */ private int baseAvatarId; /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 15; */ private int useItemCount; @@ -54,7 +58,11 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 4; + * 
+     *  bool LBDJNGPKPMN = 1;
+     *
+ * + * optional uint32 optional_reward_id = 5; * @return whether the optionalRewardId field is set */ public boolean hasOptionalRewardId() { @@ -62,7 +70,11 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 4; + * 
+     *  bool LBDJNGPKPMN = 1;
+     *
+ * + * optional uint32 optional_reward_id = 5; * @return this */ public UseItemCsReq clearOptionalRewardId() { @@ -72,7 +84,11 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 4; + * 
+     *  bool LBDJNGPKPMN = 1;
+     *
+ * + * optional uint32 optional_reward_id = 5; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -80,7 +96,11 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 4; + * 
+     *  bool LBDJNGPKPMN = 1;
+     *
+ * + * optional uint32 optional_reward_id = 5; * @param value the optionalRewardId to set * @return this */ @@ -91,7 +111,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 10; * @return whether the useItemId field is set */ public boolean hasUseItemId() { @@ -99,7 +119,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 10; * @return this */ public UseItemCsReq clearUseItemId() { @@ -109,7 +129,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 10; * @return the useItemId */ public int getUseItemId() { @@ -117,7 +137,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 7; + * optional uint32 use_item_id = 10; * @param value the useItemId to set * @return this */ @@ -128,7 +148,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 11; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -136,7 +156,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 11; * @return this */ public UseItemCsReq clearBaseAvatarId() { @@ -146,7 +166,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 11; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -154,7 +174,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 10; + * optional uint32 base_avatar_id = 11; * @param value the baseAvatarId to set * @return this */ @@ -165,7 +185,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 15; * @return whether the useItemCount field is set */ public boolean hasUseItemCount() { @@ -173,7 +193,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 15; * @return this */ public UseItemCsReq clearUseItemCount() { @@ -183,7 +203,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 15; * @return the useItemCount */ public int getUseItemCount() { @@ -191,7 +211,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 15; * @param value the useItemCount to set * @return this */ @@ -346,19 +366,19 @@ public final class UseItemCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000010) != 0) { @@ -395,34 +415,34 @@ public final class UseItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // optionalRewardId optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // useItemId - useItemId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 80) { break; } } case 80: { + // useItemId + useItemId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // useItemCount useItemCount = input.readUInt32(); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java index 628d8e7..232011d 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java @@ -19,22 +19,22 @@ public final class UseItemScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 use_item_id = 6; - */ - private int useItemId; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_id = 7; + */ + private int useItemId; + + /** + * optional uint32 use_item_count = 9; */ private int useItemCount; /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 8; */ private final ItemListOuterClass.ItemList returnData = ItemListOuterClass.ItemList.newInstance(); @@ -49,62 +49,25 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 6; - * @return whether the useItemId field is set + * optional uint32 retcode = 6; + * @return whether the retcode field is set */ - public boolean hasUseItemId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 use_item_id = 6; - * @return this - */ - public UseItemScRsp clearUseItemId() { - bitField0_ &= ~0x00000001; - useItemId = 0; - return this; - } - - /** - * optional uint32 use_item_id = 6; - * @return the useItemId - */ - public int getUseItemId() { - return useItemId; - } - - /** - * optional uint32 use_item_id = 6; - * @param value the useItemId to set - * @return this - */ - public UseItemScRsp setUseItemId(final int value) { - bitField0_ |= 0x00000001; - useItemId = value; - return this; - } - - /** - * optional uint32 retcode = 9; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 6; * @return this */ public UseItemScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -112,18 +75,55 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ public UseItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_id = 7; + * @return whether the useItemId field is set + */ + public boolean hasUseItemId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 use_item_id = 7; + * @return this + */ + public UseItemScRsp clearUseItemId() { + bitField0_ &= ~0x00000002; + useItemId = 0; + return this; + } + + /** + * optional uint32 use_item_id = 7; + * @return the useItemId + */ + public int getUseItemId() { + return useItemId; + } + + /** + * optional uint32 use_item_id = 7; + * @param value the useItemId to set + * @return this + */ + public UseItemScRsp setUseItemId(final int value) { + bitField0_ |= 0x00000002; + useItemId = value; + return this; + } + + /** + * optional uint32 use_item_count = 9; * @return whether the useItemCount field is set */ public boolean hasUseItemCount() { @@ -131,7 +131,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 9; * @return this */ public UseItemScRsp clearUseItemCount() { @@ -141,7 +141,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 9; * @return the useItemCount */ public int getUseItemCount() { @@ -149,7 +149,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 13; + * optional uint32 use_item_count = 9; * @param value the useItemCount to set * @return this */ @@ -160,7 +160,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 8; * @return whether the returnData field is set */ public boolean hasReturnData() { @@ -168,7 +168,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 8; * @return this */ public UseItemScRsp clearReturnData() { @@ -178,7 +178,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 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. @@ -192,7 +192,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 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 @@ -206,7 +206,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 4; + * optional .ItemList return_data = 8; * @param value the returnData to set * @return this */ @@ -221,8 +221,8 @@ public final class UseItemScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - useItemId = other.useItemId; retcode = other.retcode; + useItemId = other.useItemId; useItemCount = other.useItemCount; returnData.copyFrom(other.returnData); } @@ -235,12 +235,12 @@ public final class UseItemScRspOuterClass { return this; } cachedSize = -1; - if (other.hasUseItemId()) { - setUseItemId(other.useItemId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasUseItemId()) { + setUseItemId(other.useItemId); + } if (other.hasUseItemCount()) { setUseItemCount(other.useItemCount); } @@ -257,8 +257,8 @@ public final class UseItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - useItemId = 0; retcode = 0; + useItemId = 0; useItemCount = 0; returnData.clear(); return this; @@ -285,8 +285,8 @@ public final class UseItemScRspOuterClass { } UseItemScRsp other = (UseItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasUseItemId() || useItemId == other.useItemId) && (!hasRetcode() || retcode == other.retcode) + && (!hasUseItemId() || useItemId == other.useItemId) && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasReturnData() || returnData.equals(other.returnData)); } @@ -295,18 +295,18 @@ public final class UseItemScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 48); - output.writeUInt32NoTag(useItemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(useItemId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 66); output.writeMessageNoTag(returnData); } } @@ -315,10 +315,10 @@ public final class UseItemScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); @@ -337,33 +337,33 @@ public final class UseItemScRspOuterClass { while (true) { switch (tag) { case 48: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { // useItemId useItemId = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { // useItemCount useItemCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 66) { break; } } - case 34: { + case 66: { // returnData input.readMessage(returnData); bitField0_ |= 0x00000008; @@ -390,10 +390,10 @@ public final class UseItemScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.useItemCount, useItemCount); @@ -411,11 +411,10 @@ public final class UseItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -423,10 +422,11 @@ public final class UseItemScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -815318027: + case 1396027151: { + if (input.isAtField(FieldNames.useItemId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + useItemId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -510,10 +510,10 @@ public final class UseItemScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); static final FieldName returnData = FieldName.forField("returnData", "return_data"); diff --git a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java index a57ef28..057d8c9 100644 --- a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java @@ -19,20 +19,20 @@ public final class VectorOuterClass { private static final long serialVersionUID = 0L; /** - * optional sint32 z = 8; - */ - private int z; - - /** - * optional sint32 y = 10; + * optional sint32 y = 2; */ private int y; /** - * optional sint32 x = 12; + * optional sint32 x = 6; */ private int x; + /** + * optional sint32 z = 15; + */ + private int z; + private Vector() { } @@ -44,62 +44,25 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 8; - * @return whether the z field is set + * optional sint32 y = 2; + * @return whether the y field is set */ - public boolean hasZ() { + public boolean hasY() { return (bitField0_ & 0x00000001) != 0; } /** - * optional sint32 z = 8; - * @return this - */ - public Vector clearZ() { - bitField0_ &= ~0x00000001; - z = 0; - return this; - } - - /** - * optional sint32 z = 8; - * @return the z - */ - public int getZ() { - return z; - } - - /** - * optional sint32 z = 8; - * @param value the z to set - * @return this - */ - public Vector setZ(final int value) { - bitField0_ |= 0x00000001; - z = value; - return this; - } - - /** - * optional sint32 y = 10; - * @return whether the y field is set - */ - public boolean hasY() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional sint32 y = 10; + * optional sint32 y = 2; * @return this */ public Vector clearY() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; y = 0; return this; } /** - * optional sint32 y = 10; + * optional sint32 y = 2; * @return the y */ public int getY() { @@ -107,36 +70,36 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 10; + * optional sint32 y = 2; * @param value the y to set * @return this */ public Vector setY(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; y = value; return this; } /** - * optional sint32 x = 12; + * optional sint32 x = 6; * @return whether the x field is set */ public boolean hasX() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional sint32 x = 12; + * optional sint32 x = 6; * @return this */ public Vector clearX() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; x = 0; return this; } /** - * optional sint32 x = 12; + * optional sint32 x = 6; * @return the x */ public int getX() { @@ -144,24 +107,61 @@ public final class VectorOuterClass { } /** - * optional sint32 x = 12; + * optional sint32 x = 6; * @param value the x to set * @return this */ public Vector setX(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; x = value; return this; } + /** + * optional sint32 z = 15; + * @return whether the z field is set + */ + public boolean hasZ() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional sint32 z = 15; + * @return this + */ + public Vector clearZ() { + bitField0_ &= ~0x00000004; + z = 0; + return this; + } + + /** + * optional sint32 z = 15; + * @return the z + */ + public int getZ() { + return z; + } + + /** + * optional sint32 z = 15; + * @param value the z to set + * @return this + */ + public Vector setZ(final int value) { + bitField0_ |= 0x00000004; + z = value; + return this; + } + @Override public Vector copyFrom(final Vector other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - z = other.z; y = other.y; x = other.x; + z = other.z; } return this; } @@ -172,15 +172,15 @@ public final class VectorOuterClass { return this; } cachedSize = -1; - if (other.hasZ()) { - setZ(other.z); - } if (other.hasY()) { setY(other.y); } if (other.hasX()) { setX(other.x); } + if (other.hasZ()) { + setZ(other.z); + } return this; } @@ -191,9 +191,9 @@ public final class VectorOuterClass { } cachedSize = -1; bitField0_ = 0; - z = 0; y = 0; x = 0; + z = 0; return this; } @@ -217,39 +217,39 @@ public final class VectorOuterClass { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ - && (!hasZ() || z == other.z) && (!hasY() || y == other.y) - && (!hasX() || x == other.x); + && (!hasX() || x == other.x) + && (!hasZ() || z == other.z); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeSInt32NoTag(z); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeSInt32NoTag(y); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeSInt32NoTag(x); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeSInt32NoTag(z); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(z); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(y); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(x); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeSInt32SizeNoTag(z); + } return size; } @@ -260,27 +260,27 @@ public final class VectorOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // z - z = input.readSInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 16: { // y y = input.readSInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { + case 48: { // x x = input.readSInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // z + z = input.readSInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class VectorOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeSInt32(FieldNames.z, z); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeSInt32(FieldNames.y, y); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeSInt32(FieldNames.x, x); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeSInt32(FieldNames.z, z); + } output.endObject(); } @@ -323,22 +323,11 @@ public final class VectorOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 122: { - if (input.isAtField(FieldNames.z)) { - if (!input.trySkipNullValue()) { - z = input.readSInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 121: { if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { y = input.readSInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -349,6 +338,17 @@ public final class VectorOuterClass { if (input.isAtField(FieldNames.x)) { if (!input.trySkipNullValue()) { x = input.readSInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 122: { + if (input.isAtField(FieldNames.z)) { + if (!input.trySkipNullValue()) { + z = input.readSInt32(); bitField0_ |= 0x00000004; } } else { @@ -408,11 +408,11 @@ public final class VectorOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName z = FieldName.forField("z"); - static final FieldName y = FieldName.forField("y"); static final FieldName x = FieldName.forField("x"); + + static final FieldName z = FieldName.forField("z"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index 66f2174..8aa0f97 100644 --- a/src/main/java/emu/lunarcore/GameConstants.java +++ b/src/main/java/emu/lunarcore/GameConstants.java @@ -6,7 +6,7 @@ import java.time.ZoneOffset; import emu.lunarcore.util.Position; public class GameConstants { - public static String VERSION = "2.3.0"; + public static String VERSION = "2.4.0"; public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600; diff --git a/src/main/java/emu/lunarcore/command/commands/GenderCommand.java b/src/main/java/emu/lunarcore/command/commands/GenderCommand.java deleted file mode 100644 index 38ec131..0000000 --- a/src/main/java/emu/lunarcore/command/commands/GenderCommand.java +++ /dev/null @@ -1,51 +0,0 @@ -package emu.lunarcore.command.commands; - -import emu.lunarcore.command.Command; -import emu.lunarcore.command.CommandArgs; -import emu.lunarcore.command.CommandHandler; -import emu.lunarcore.data.GameData; -import emu.lunarcore.game.player.Player; -import emu.lunarcore.game.player.PlayerGender; -import emu.lunarcore.server.packet.send.PacketGetHeroBasicTypeInfoScRsp; - -@Command(label = "gender", permission = "player.gender", requireTarget = true, desc = "/gender {male | female}. Sets the player gender.") -public class GenderCommand implements CommandHandler { - - @Override - public void execute(CommandArgs args) { - // Set world level - Player target = args.getTarget(); - PlayerGender playerGender = null; - - String gender = args.get(0).toLowerCase(); - switch (gender) { - case "m", "male", "boy", "man" -> { - playerGender = PlayerGender.GENDER_MAN; - } - case "f", "female", "girl", "woman" -> { - playerGender = PlayerGender.GENDER_WOMAN; - } - } - - // Change gender - if (playerGender != null && playerGender != target.getGender()) { - // Set gender first - target.setGender(playerGender); - target.save(); - - // Get first hero excel that matches our new player gender - var heroExcel = GameData.getHeroExcelMap().values().stream().filter(path -> path.getGender() == target.getGender()).findFirst().orElse(null); - if (heroExcel != null) { - // Set hero basic type - target.setHeroBasicType(heroExcel.getId()); - } - - // Send packet and response message - target.sendPacket(new PacketGetHeroBasicTypeInfoScRsp(target)); - args.sendMessage("Gender for " + target.getName() + " set successfully"); - } else { - args.sendMessage("Error: Invalid input"); - } - } - -} diff --git a/src/main/java/emu/lunarcore/data/GameData.java b/src/main/java/emu/lunarcore/data/GameData.java index b077669..c693451 100644 --- a/src/main/java/emu/lunarcore/data/GameData.java +++ b/src/main/java/emu/lunarcore/data/GameData.java @@ -30,7 +30,7 @@ public class GameData { @Getter private static Int2ObjectMap stageExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap mazePlaneExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap mapEntranceExcelMap = new Int2ObjectOpenHashMap<>(); - @Getter private static Int2ObjectMap heroExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap multiplePathAvatarExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap shopExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap rewardExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap interactExcelMap = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index df3d29e..d336136 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -220,10 +220,12 @@ public class ResourceLoader { } // Load floor infos - for (File file : floorDir.listFiles()) { + for (var excel : GameData.getMapEntranceExcelMap().values()) { + String name = "P" + excel.getPlaneID() + "_F" + excel.getFloorID(); + File file = new File(LunarCore.getConfig().getResourceDir() + "/Config/LevelOutput/RuntimeFloor/" + name + ".json"); + try (FileReader reader = new FileReader(file)) { FloorInfo floor = gson.fromJson(reader, FloorInfo.class); - String name = file.getName().substring(0, file.getName().indexOf('.')); GameData.getFloorInfos().put(name, floor); } catch (Exception e) { e.printStackTrace(); @@ -307,9 +309,11 @@ public class ResourceLoader { } // Notify the server owner if we are missing any files + /* if (count < GameData.getSummonUnitExcelMap().size()) { LunarCore.getLogger().warn("Summon unit configs are missing, please check your resources folder: {resources}/Config/ConfigSummonUnit. Character summon techniques may not work!"); } + */ // Reset loaded count count = 0; diff --git a/src/main/java/emu/lunarcore/data/excel/HeroExcel.java b/src/main/java/emu/lunarcore/data/excel/HeroExcel.java deleted file mode 100644 index b3c7e98..0000000 --- a/src/main/java/emu/lunarcore/data/excel/HeroExcel.java +++ /dev/null @@ -1,19 +0,0 @@ -package emu.lunarcore.data.excel; - -import emu.lunarcore.data.GameResource; -import emu.lunarcore.data.ResourceType; -import emu.lunarcore.game.player.PlayerGender; -import lombok.Getter; - -@Getter -@ResourceType(name = {"HeroConfig.json"}) -public class HeroExcel extends GameResource { - private int HeroAvatarID; - private PlayerGender Gender; - - @Override - public int getId() { - return HeroAvatarID; - } - -} diff --git a/src/main/java/emu/lunarcore/data/excel/MultiplePathAvatarExcel.java b/src/main/java/emu/lunarcore/data/excel/MultiplePathAvatarExcel.java new file mode 100644 index 0000000..0506df1 --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/MultiplePathAvatarExcel.java @@ -0,0 +1,24 @@ +package emu.lunarcore.data.excel; + +import emu.lunarcore.data.GameResource; +import emu.lunarcore.data.ResourceType; +import emu.lunarcore.game.player.PlayerGender; +import lombok.Getter; + +@Getter +@ResourceType(name = {"MultiplePathAvatarConfig.json"}) +public class MultiplePathAvatarExcel extends GameResource { + private int AvatarID; + private int BaseAvatarID; + private PlayerGender Gender; + + @Override + public int getId() { + return AvatarID; + } + + public boolean isDefault() { + return this.AvatarID == this.BaseAvatarID; + } + +} diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java index 4c67d94..5c4d853 100644 --- a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java @@ -16,10 +16,10 @@ import com.google.gson.annotations.SerializedName; @Getter @ResourceType(name = {"RogueBuffGroup.json"}, loadPriority = LoadPriority.LOW) public class RogueBuffGroupExcel extends GameResource { - @SerializedName(value = "LIOICIOFLGL") + @SerializedName(value = "MNNPAFJEGJC") private int RogueBuffGroupID; // RogueBuffGroupID - @SerializedName(value = "LEEMGFGKCMO") + @SerializedName(value = "KCFPNHGBGIA") private IntArrayList RogueBuffTagList; // RogueBuffTagList or RogueBuffGroupList private transient Set rogueBuffList = new HashSet<>(); diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarData.java b/src/main/java/emu/lunarcore/game/avatar/AvatarData.java index bc69265..483b4bd 100644 --- a/src/main/java/emu/lunarcore/game/avatar/AvatarData.java +++ b/src/main/java/emu/lunarcore/game/avatar/AvatarData.java @@ -2,30 +2,41 @@ package emu.lunarcore.game.avatar; import dev.morphia.annotations.Entity; import emu.lunarcore.data.excel.AvatarExcel; +import emu.lunarcore.game.inventory.GameItem; +import emu.lunarcore.game.player.Player; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.Getter; import lombok.Setter; /** * A helper class that contains information about an avatar's rank. */ +@Getter @Entity(useDiscriminator = false) public class AvatarData { - @Getter @Setter - private int rank; // Eidolons - @Getter + @Setter private int rank; // Eidolons private Int2IntMap skills; // Skill tree + + @Setter private transient IAvatar baseAvatar; + private transient Int2ObjectMap equips; - @Deprecated + @Deprecated // Morphia only public AvatarData() { - + this.equips = new Int2ObjectOpenHashMap<>(); } public AvatarData(AvatarExcel excel) { + this(); this.skills = new Int2IntOpenHashMap(); for (var skillTree : excel.getDefaultSkillTrees()) { this.skills.put(skillTree.getPointID(), skillTree.getLevel()); } } + + public Player getOwner() { + return this.getBaseAvatar().getOwner(); + } } diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarHeroPath.java b/src/main/java/emu/lunarcore/game/avatar/AvatarMultiPath.java similarity index 50% rename from src/main/java/emu/lunarcore/game/avatar/AvatarHeroPath.java rename to src/main/java/emu/lunarcore/game/avatar/AvatarMultiPath.java index 8e2542c..d4c453d 100644 --- a/src/main/java/emu/lunarcore/game/avatar/AvatarHeroPath.java +++ b/src/main/java/emu/lunarcore/game/avatar/AvatarMultiPath.java @@ -2,39 +2,45 @@ package emu.lunarcore.game.avatar; import java.util.Map; +import org.bson.types.ObjectId; + import dev.morphia.annotations.Entity; import dev.morphia.annotations.Id; import dev.morphia.annotations.Indexed; import emu.lunarcore.LunarCore; import emu.lunarcore.data.excel.AvatarExcel; +import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.AvatarSkillTreeOuterClass.AvatarSkillTree; -import emu.lunarcore.proto.HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo; - +import emu.lunarcore.proto.EquipRelicOuterClass.EquipRelic; +import emu.lunarcore.proto.MultiPathAvatarInfoOuterClass.MultiPathAvatarInfo; import lombok.Getter; import lombok.Setter; @Getter -@Entity(value = "heroPaths", useDiscriminator = false) -public class AvatarHeroPath { - @Id private int id; // Equivalent to HeroBaseType +@Entity(value = "multiPaths", useDiscriminator = false) +public class AvatarMultiPath implements IAvatar { + @Id private ObjectId id; @Indexed private int ownerUid; + private int excelId; private AvatarData data; + @Setter private transient Player owner; @Setter private transient GameAvatar avatar; private transient AvatarExcel excel; @Deprecated // Morphia only! - public AvatarHeroPath() { + public AvatarMultiPath() { } - public AvatarHeroPath(Player player, AvatarExcel excel) { + public AvatarMultiPath(Player player, AvatarExcel excel) { // Set excel avatar id as id - this.id = excel.getId(); + this.excelId = excel.getId(); this.ownerUid = player.getUid(); + this.owner = player; this.setExcel(excel); } @@ -45,6 +51,7 @@ public class AvatarHeroPath { if (this.data == null) { this.data = new AvatarData(excel); } + this.data.setBaseAvatar(this); } public int getRank() { @@ -55,13 +62,22 @@ public class AvatarHeroPath { return this.getData().getSkills(); } - public HeroBasicTypeInfo toProto() { - var proto = HeroBasicTypeInfo.newInstance() - .setBasicTypeValue(this.getId()) + public MultiPathAvatarInfo toProto() { + var proto = MultiPathAvatarInfo.newInstance() + .setAvatarIdValue(this.getExcelId()) + .setPathEquipmentId(0) .setRank(this.getRank()); for (var skill : getSkills().entrySet()) { - proto.addSkillTreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); + proto.addMultiPathSkillTree(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); + } + + for (var equip : getEquips().values()) { + if (equip.getItemMainType() == ItemMainType.Relic) { + proto.addEquipRelicList(EquipRelic.newInstance().setSlot(equip.getEquipSlot()).setRelicUniqueId(equip.getInternalUid())); + } else if (equip.getItemMainType() == ItemMainType.Equipment) { + proto.setPathEquipmentId(equip.getInternalUid()); + } } return proto; diff --git a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java index cf59db0..5717b9f 100644 --- a/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java +++ b/src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java @@ -9,7 +9,7 @@ import emu.lunarcore.GameConstants; import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; import emu.lunarcore.data.excel.AvatarExcel; -import emu.lunarcore.data.excel.HeroExcel; +import emu.lunarcore.data.excel.MultiplePathAvatarExcel; import emu.lunarcore.game.inventory.GameItem; import emu.lunarcore.game.player.BasePlayerManager; import emu.lunarcore.game.player.Player; @@ -26,23 +26,48 @@ public class AvatarStorage extends BasePlayerManager implements Iterable avatars; private final Object2ObjectMap avatarObjectIdMap; - private final Int2ObjectMap heroPaths; + private final Int2ObjectMap multiPaths; + private final Object2ObjectMap multiPathsObjectIdMap; public AvatarStorage(Player player) { super(player); this.avatars = new Int2ObjectOpenHashMap<>(); this.avatarObjectIdMap = new Object2ObjectOpenHashMap<>(); - this.heroPaths = new Int2ObjectOpenHashMap<>(); + this.multiPaths = new Int2ObjectOpenHashMap<>(); + this.multiPathsObjectIdMap = new Object2ObjectOpenHashMap<>(); } public int getAvatarCount() { return this.avatars.size(); } + + // Base avatars + + public IAvatar getBaseAvatarById(int id) { + IAvatar baseAvatar = this.getMultiPathById(id); + if (baseAvatar == null) { + baseAvatar = this.getAvatarById(id); + } + + return baseAvatar; + } + + public IAvatar getBaseAvatarById(ObjectId id) { + IAvatar baseAvatar = this.getMultiPathById(id); + if (baseAvatar == null) { + baseAvatar = this.getAvatarById(id); + } + + return baseAvatar; + } + // Regular avatars + public GameAvatar getAvatarById(int id) { - // Check if we are trying to retrieve the hero character - if (GameData.getHeroExcelMap().containsKey(id)) { - id = GameConstants.TRAILBLAZER_AVATAR_ID; + // Check if we are trying to retrieve a multi path character + var multiPathExcel = GameData.getMultiplePathAvatarExcelMap().get(id); + if (multiPathExcel != null) { + id = multiPathExcel.getBaseAvatarID(); } return getAvatars().get(id); @@ -57,7 +82,7 @@ public class AvatarStorage extends BasePlayerManager implements Iterable stream = LunarCore.getGameDatabase().getObjects(GameAvatar.class, "ownerUid", this.getPlayer().getUid()); stream.forEach(this::loadAvatar); } - private void loadHeroPathsFromDatabase() { + private void loadMultiPathsFromDatabase() { // Get stream from database - Stream heroStream = LunarCore.getGameDatabase().getObjects(AvatarHeroPath.class, "ownerUid", this.getPlayer().getUid()); + Stream stream = LunarCore.getGameDatabase().getObjects(AvatarMultiPath.class, "ownerUid", this.getPlayer().getUid()); - heroStream.forEach(heroPath -> { + stream.forEach(path -> { // Load avatar excel data - AvatarExcel excel = GameData.getAvatarExcelMap().get(heroPath.getId()); + AvatarExcel excel = GameData.getAvatarExcelMap().get(path.getExcelId()); if (excel == null) { return; } - heroPath.setExcel(excel); + path.setOwner(this.getPlayer()); + path.setExcel(excel); - this.heroPaths.put(heroPath.getId(), heroPath); + // Add + getMultiPaths().put(path.getExcelId(), path); + getMultiPathsObjectIdMap().put(path.getId(), path); }); // Setup hero paths if they dont exist - this.validateHeroPaths(); + this.validateMultiPaths(); } public boolean loadAvatar(GameAvatar avatar) { @@ -159,8 +202,8 @@ public class AvatarStorage extends BasePlayerManager implements Iterable equips; private transient Int2LongMap buffs; - private transient AvatarHeroPath heroPath; + private transient AvatarMultiPath multiPath; @Deprecated // Morphia only public GameAvatar() { - this.equips = new Int2ObjectOpenHashMap<>(); this.buffs = Int2LongMaps.synchronize(new Int2LongOpenHashMap()); this.level = 1; this.currentHp = 10000; @@ -89,11 +85,11 @@ public class GameAvatar implements GameEntity { this.setExcel(excel); } - public GameAvatar(AvatarHeroPath path) { + public GameAvatar(AvatarMultiPath path) { this(); this.avatarId = GameConstants.TRAILBLAZER_AVATAR_ID; this.timestamp = System.currentTimeMillis() / 1000; - this.setHeroPath(path); + this.setMultiPath(path); } @Override @@ -101,6 +97,10 @@ public class GameAvatar implements GameEntity { return this.getOwner().getScene(); } + public int getExcelId() { + return this.avatarId; + } + public void setExcel(AvatarExcel excel) { if (this.excel == null) { this.excel = excel; @@ -108,6 +108,7 @@ public class GameAvatar implements GameEntity { if (this.data == null) { this.data = new AvatarData(excel); } + this.data.setBaseAvatar(this); } public void setOwner(Player player) { @@ -135,7 +136,11 @@ public class GameAvatar implements GameEntity { } public boolean isHero() { - return GameData.getHeroExcelMap().containsKey(this.getAvatarId()); + return this.getAvatarId() == GameConstants.TRAILBLAZER_AVATAR_ID; + } + + public boolean hasMultiPath() { + return GameData.getMultiplePathAvatarExcelMap().containsKey(this.getAvatarId()); } public int getMaxSp() { @@ -188,16 +193,16 @@ public class GameAvatar implements GameEntity { return this.getData().getSkills(); } - public void setHeroPath(AvatarHeroPath heroPath) { + public void setMultiPath(AvatarMultiPath multiPath) { // Clear prev set hero path from avatar - if (this.getHeroPath() != null) { - this.getHeroPath().setAvatar(null); + if (this.multiPath != null) { + this.multiPath.setAvatar(null); } - this.data = heroPath.getData(); - this.excel = heroPath.getExcel(); // DO NOT USE GameAvatar::setExcel for this - this.heroPath = heroPath; - this.heroPath.setAvatar(this); + this.data = multiPath.getData(); + this.excel = multiPath.getExcel(); // DO NOT USE GameAvatar::setExcel for this + this.multiPath = multiPath; + this.multiPath.setAvatar(this); } // Rewards @@ -224,72 +229,12 @@ public class GameAvatar implements GameEntity { public void addBuff(int buffId, int duration) { this.buffs.put(buffId, System.currentTimeMillis() + (duration * 1000)); } - - // Equips - - public GameItem getEquipBySlot(int slot) { - return this.getEquips().get(slot); - } - - public GameItem getEquipment() { - return this.getEquips().get(GameConstants.EQUIPMENT_SLOT_ID); - } - - public boolean equipItem(GameItem item) { - // Sanity check - int slot = item.getEquipSlot(); - if (slot == 0) return false; - - // Check if other avatars have this item equipped - GameAvatar otherAvatar = getOwner().getAvatarById(item.getEquipAvatarId()); - if (otherAvatar != null) { - // Unequip this item from the other avatar - if (otherAvatar.unequipItem(slot) != null) { - getOwner().sendPacket(new PacketPlayerSyncScNotify(otherAvatar)); - } - // Swap with other avatar - if (getEquips().containsKey(slot)) { - GameItem toSwap = this.getEquipBySlot(slot); - otherAvatar.equipItem(toSwap); - } - } else if (getEquips().containsKey(slot)) { - // Unequip item in current slot if it exists - GameItem unequipped = unequipItem(slot); - if (unequipped != null) { - getOwner().sendPacket(new PacketPlayerSyncScNotify(unequipped)); - } - } - - // Set equip - getEquips().put(slot, item); - - // Save equip if equipped avatar was changed - if (item.setEquipAvatar(this)) { - item.save(); - } - - // Send packet - getOwner().sendPacket(new PacketPlayerSyncScNotify(this, item)); - - return true; - } - - public GameItem unequipItem(int slot) { - GameItem item = getEquips().remove(slot); - - if (item != null) { - item.setEquipAvatar(null); - item.save(); - return item; - } - - return null; - } - + // Proto public Avatar toProto() { var proto = Avatar.newInstance() + .setIsMarked(this.isMarked()) .setBaseAvatarId(this.getAvatarId()) .setLevel(this.getLevel()) .setExp(this.getExp()) @@ -298,16 +243,18 @@ public class GameAvatar implements GameEntity { .setIsMarked(this.isMarked()) .setFirstMetTimestamp(this.getTimestamp()); - for (var equip : this.getEquips().values()) { - if (equip.getItemMainType() == ItemMainType.Relic) { - proto.addEquipRelicList(EquipRelic.newInstance().setSlot(equip.getEquipSlot()).setRelicUniqueId(equip.getInternalUid())); - } else if (equip.getItemMainType() == ItemMainType.Equipment) { - proto.setEquipmentUniqueId(equip.getInternalUid()); + if (!this.hasMultiPath()) { + for (var equip : this.getEquips().values()) { + if (equip.getItemMainType() == ItemMainType.Relic) { + proto.addEquipRelicList(EquipRelic.newInstance().setSlot(equip.getEquipSlot()).setRelicUniqueId(equip.getInternalUid())); + } else if (equip.getItemMainType() == ItemMainType.Equipment) { + proto.setEquipmentUniqueId(equip.getInternalUid()); + } + } + + for (var skill : getSkills().entrySet()) { + proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); } - } - - for (var skill : getSkills().entrySet()) { - proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); } for (int i = 0; i < this.getPromotion(); i++) { @@ -450,8 +397,8 @@ public class GameAvatar implements GameEntity { // Save avatar LunarCore.getGameDatabase().save(this); // Save hero path - if (this.getHeroPath() != null) { - this.getHeroPath().save(); + if (this.getMultiPath() != null) { + this.getMultiPath().save(); } } } diff --git a/src/main/java/emu/lunarcore/game/avatar/IAvatar.java b/src/main/java/emu/lunarcore/game/avatar/IAvatar.java new file mode 100644 index 0000000..9167eee --- /dev/null +++ b/src/main/java/emu/lunarcore/game/avatar/IAvatar.java @@ -0,0 +1,89 @@ +package emu.lunarcore.game.avatar; + +import org.bson.types.ObjectId; + +import emu.lunarcore.GameConstants; +import emu.lunarcore.data.excel.AvatarExcel; +import emu.lunarcore.game.inventory.GameItem; +import emu.lunarcore.game.player.Player; +import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; + +public interface IAvatar { + public ObjectId getId(); + + public Player getOwner(); + + public AvatarData getData(); + + // Excels + + public int getExcelId(); + + public AvatarExcel getExcel(); + + // Equip handlers + + public default Int2ObjectMap getEquips() { + return this.getData().getEquips(); + } + + public default GameItem getEquipBySlot(int slot) { + return this.getEquips().get(slot); + } + + public default GameItem getEquipment() { + return this.getEquips().get(GameConstants.EQUIPMENT_SLOT_ID); + } + + public default boolean equipItem(GameItem item) { + // Sanity check + int slot = item.getEquipSlot(); + if (slot == 0) return false; + + // Check if other avatars have this item equipped + IAvatar otherAvatar = item.getEquipAvatar(); + if (otherAvatar != null) { + // Unequip this item from the other avatar + if (otherAvatar.unequipItem(slot) != null) { + otherAvatar.getOwner().sendPacket(new PacketPlayerSyncScNotify(otherAvatar)); + } + // Swap with other avatar + if (getEquips().containsKey(slot)) { + GameItem toSwap = this.getEquipBySlot(slot); + otherAvatar.equipItem(toSwap); + } + } else if (getEquips().containsKey(slot)) { + // Unequip item in current slot if it exists + GameItem unequipped = unequipItem(slot); + if (unequipped != null) { + getOwner().sendPacket(new PacketPlayerSyncScNotify(unequipped)); + } + } + + // Set equip + getEquips().put(slot, item); + + // Save equip if equipped avatar was changed + if (item.setEquipAvatar(this)) { + item.save(); + } + + // Send packet + getOwner().sendPacket(new PacketPlayerSyncScNotify(this, item)); + + return true; + } + + public default GameItem unequipItem(int slot) { + GameItem item = getEquips().remove(slot); + + if (item != null) { + item.setEquipAvatar(null); + item.save(); + return item; + } + + return null; + } +} diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java index c2ed0c8..5240a57 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java @@ -279,13 +279,13 @@ public class ChallengeInstance { case STORY -> { if (this.getBuffs() != null) { int buffId = this.getBuffs().getInt(this.getCurrentStage() - 1); - proto.getMutableStoryInfo().getMutableCurStoryBuffs().addBuffList(buffId); + proto.getMutableExtInfo().getMutableCurStoryBuffs().addBuffList(buffId); } } case BOSS -> { if (this.getBuffs() != null) { int buffId = this.getBuffs().getInt(this.getCurrentStage() - 1); - proto.getMutableStoryInfo().getMutableCurBossBuffs().addBuffList(buffId); + proto.getMutableExtInfo().getMutableCurBossBuffs().addBuffList(buffId); } } default -> { diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java index 7adef28..40aff4a 100644 --- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java +++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java @@ -13,7 +13,7 @@ import emu.lunarcore.data.GameDepot; import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.data.excel.RelicMainAffixExcel; import emu.lunarcore.data.excel.RelicSubAffixExcel; -import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.avatar.IAvatar; import emu.lunarcore.game.enums.AvatarPropertyType; import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.player.Player; @@ -53,7 +53,7 @@ public class GameItem { private List subAffixes; @Indexed private ObjectId equipAvatarId; // Object id of the avatar this item is equipped to - private transient GameAvatar equipAvatar; + private transient IAvatar equipAvatar; @LoadOnly @AlsoLoad("equipAvatar") private int equipAvatarExcelId; // Deprecated legacy field @@ -151,15 +151,15 @@ public class GameItem { return false; } - public boolean setEquipAvatar(GameAvatar avatar) { - if (avatar == null && this.isEquipped()) { + public boolean setEquipAvatar(IAvatar baseAvatar) { + if (baseAvatar == null && this.isEquipped()) { this.equipAvatarId = null; this.equipAvatar = null; this.equipAvatarExcelId = 0; // Legacy field return true; - } else if (this.equipAvatarId != avatar.getId()) { - this.equipAvatarId = avatar.getId(); - this.equipAvatar = avatar; + } else if (this.equipAvatarId != baseAvatar.getId()) { + this.equipAvatarId = baseAvatar.getId(); + this.equipAvatar = baseAvatar; this.equipAvatarExcelId = 0; // Legacy field return true; } @@ -293,7 +293,7 @@ public class GameItem { .setMainAffixId(this.mainAffix); if (this.getEquipAvatar() != null) { - proto.setEquipAvatarId(this.getEquipAvatar().getExcel().getId()); + proto.setEquipAvatarId(this.getEquipAvatar().getExcelId()); } if (this.subAffixes != null) { @@ -316,7 +316,7 @@ public class GameItem { .setRank(this.getRank()); if (this.getEquipAvatar() != null) { - proto.setEquipAvatarId(this.getEquipAvatar().getExcel().getId()); + proto.setEquipAvatarId(this.getEquipAvatar().getExcelId()); } return proto; diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItemSubAffix.java b/src/main/java/emu/lunarcore/game/inventory/GameItemSubAffix.java index c31e2f8..e29bc21 100644 --- a/src/main/java/emu/lunarcore/game/inventory/GameItemSubAffix.java +++ b/src/main/java/emu/lunarcore/game/inventory/GameItemSubAffix.java @@ -7,13 +7,13 @@ import emu.lunarcore.util.Utils; import lombok.Getter; import lombok.Setter; -@Getter +@Getter @Setter @Entity(useDiscriminator = false) public class GameItemSubAffix implements Comparable { private int id; // Affix id - @Setter private int count; - @Setter private int step; + private int count; + private int step; @Deprecated public GameItemSubAffix() { diff --git a/src/main/java/emu/lunarcore/game/inventory/Inventory.java b/src/main/java/emu/lunarcore/game/inventory/Inventory.java index 38728ef..c480455 100644 --- a/src/main/java/emu/lunarcore/game/inventory/Inventory.java +++ b/src/main/java/emu/lunarcore/game/inventory/Inventory.java @@ -14,6 +14,7 @@ import emu.lunarcore.data.excel.AvatarExcel; import emu.lunarcore.data.excel.ItemExcel; import emu.lunarcore.game.avatar.AvatarStorage; import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.game.avatar.IAvatar; import emu.lunarcore.game.enums.ItemMainType; import emu.lunarcore.game.enums.ItemSubType; import emu.lunarcore.game.inventory.tabs.EquipInventoryTab; @@ -553,7 +554,7 @@ public class Inventory extends BasePlayerManager { // Equips public boolean equipItem(int avatarId, int equipId) { - GameAvatar avatar = getPlayer().getAvatarById(avatarId); + IAvatar avatar = getPlayer().getAvatars().getBaseAvatarById(avatarId); GameItem item = this.getItemByUid(equipId); if (avatar != null && item != null) { @@ -564,7 +565,7 @@ public class Inventory extends BasePlayerManager { } public boolean unequipItem(int avatarId, int slot) { - GameAvatar avatar = getPlayer().getAvatarById(avatarId); + IAvatar avatar = getPlayer().getAvatars().getBaseAvatarById(avatarId); if (avatar != null) { GameItem unequipped = avatar.unequipItem(slot); @@ -613,16 +614,16 @@ public class Inventory extends BasePlayerManager { // Equip to a character if possible if (item.isEquipped() || item.getEquipAvatarExcelId() > 0) { - GameAvatar avatar = null; + IAvatar avatar = null; boolean hasEquipped = false; if (item.getEquipAvatarExcelId() > 0) { // Legacy equip handler - avatar = getPlayer().getAvatars().getAvatarById(item.getEquipAvatarExcelId()); + avatar = getPlayer().getAvatars().getBaseAvatarById(item.getEquipAvatarExcelId()); item.setEquipAvatar(avatar); item.save(); } else { - avatar = getPlayer().getAvatars().getAvatarById(item.getEquipAvatarId()); + avatar = getPlayer().getAvatars().getBaseAvatarById(item.getEquipAvatarId()); } // Make sure the avatar that we equipped this item to actually exists diff --git a/src/main/java/emu/lunarcore/game/inventory/InventoryService.java b/src/main/java/emu/lunarcore/game/inventory/InventoryService.java index b3b41a8..a55925f 100644 --- a/src/main/java/emu/lunarcore/game/inventory/InventoryService.java +++ b/src/main/java/emu/lunarcore/game/inventory/InventoryService.java @@ -164,9 +164,9 @@ public class InventoryService extends BaseGameService { player.save(); // Save avatar and send packets - if (avatar.getHeroPath() != null) { - avatar.getHeroPath().save(); - player.sendPacket(new PacketPlayerSyncScNotify(avatar.getHeroPath())); + if (avatar.getMultiPath() != null) { + avatar.getMultiPath().save(); + player.sendPacket(new PacketPlayerSyncScNotify(avatar.getMultiPath())); } else { avatar.save(); player.sendPacket(new PacketPlayerSyncScNotify(avatar)); @@ -195,9 +195,9 @@ public class InventoryService extends BaseGameService { avatar.setRank(avatar.getRank() + 1); // Save avatar and send packets - if (avatar.getHeroPath() != null) { - avatar.getHeroPath().save(); - player.sendPacket(new PacketPlayerSyncScNotify(avatar.getHeroPath())); + if (avatar.getMultiPath() != null) { + avatar.getMultiPath().save(); + player.sendPacket(new PacketPlayerSyncScNotify(avatar.getMultiPath())); } else { avatar.save(); player.sendPacket(new PacketPlayerSyncScNotify(avatar)); diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index a8d08ee..3b8436c 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -1,7 +1,9 @@ package emu.lunarcore.game.player; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.bson.types.ObjectId; @@ -24,7 +26,7 @@ import emu.lunarcore.data.excel.MazePlaneExcel; import emu.lunarcore.game.account.Account; import emu.lunarcore.game.avatar.AvatarStorage; import emu.lunarcore.game.avatar.GameAvatar; -import emu.lunarcore.game.avatar.AvatarHeroPath; +import emu.lunarcore.game.avatar.AvatarMultiPath; import emu.lunarcore.game.battle.Battle; import emu.lunarcore.game.challenge.ChallengeGroupReward; import emu.lunarcore.game.challenge.ChallengeHistory; @@ -84,12 +86,12 @@ public class Player implements Tickable { private String name; private String signature; private int birthday; - private int curBasicType; private int headIcon; private int phoneTheme; private int chatBubble; private int currentBgm; - @Setter private PlayerGender gender; + private Map curAvatarPaths; + private PlayerGender gender; private int level; private int exp; // Total exp @@ -145,11 +147,11 @@ public class Player implements Tickable { @Deprecated // Morphia only public Player() { - this.curBasicType = GameConstants.TRAILBLAZER_AVATAR_ID; this.gender = PlayerGender.GENDER_MAN; this.foodBuffs = new Int2ObjectOpenHashMap<>(); this.assistAvatars = new ArrayList<>(); this.displayAvatars = new ArrayList<>(); + this.curAvatarPaths = new HashMap<>(); this.avatars = new AvatarStorage(this); this.inventory = new Inventory(this); @@ -190,7 +192,7 @@ public class Player implements Tickable { } // Setup hero paths - this.getAvatars().validateHeroPaths(); + this.getAvatars().validateMultiPaths(); // Give us the main character // TODO script tutorial @@ -452,20 +454,44 @@ public class Player implements Tickable { return this.exp - GameData.getPlayerExpRequired(this.level); } - public AvatarHeroPath getCurHeroPath() { - return this.getAvatars().getHeroPathById(this.getCurBasicType()); + public int getCurAvatarPathId(int baseAvatarId) { + return this.getCurAvatarPaths().getOrDefault(baseAvatarId, 0); } - public void setHeroBasicType(int heroType) { - AvatarHeroPath path = this.getAvatars().getHeroPathById(heroType); - if (path == null) return; + public AvatarMultiPath getCurAvatarPath(int baseAvatarId) { + int pathId = this.getCurAvatarPathId(baseAvatarId); + return this.getAvatars().getMultiPathById(pathId); + } + + public int setAvatarPath(int pathId) { + // Get excel + var excel = GameData.getMultiplePathAvatarExcelMap().get(pathId); + if (excel == null) return 0; - GameAvatar mainCharacter = this.getAvatarById(GameConstants.TRAILBLAZER_AVATAR_ID); - if (mainCharacter == null) return; + // Get path data + AvatarMultiPath path = this.getAvatars().getMultiPathById(pathId); + if (path == null) return 0; - // Set new hero and cur basic type - mainCharacter.setHeroPath(path); - this.curBasicType = heroType; + // Get avatar data + GameAvatar avatar = this.getAvatarById(excel.getBaseAvatarID()); + if (avatar == null) return 0; + + // Set new avatar path + avatar.setMultiPath(path); + + // Set current avatar path + this.getCurAvatarPaths().put(excel.getBaseAvatarID(), pathId); + + // Sync with client + this.sendPacket(new PacketPlayerSyncScNotify(path)); + for (var item : avatar.getEquips().values()) { + this.sendPacket(new PacketPlayerSyncScNotify(item)); + } + + this.sendPacket(new PacketAvatarPathChangedNotify(avatar, path)); + + // Success + return pathId; } public int getNextBattleId() { @@ -962,7 +988,7 @@ public class Player implements Tickable { datastore.getCollection(GameAvatar.class).deleteMany(filter); datastore.getCollection(ChallengeHistory.class).deleteMany(filter); datastore.getCollection(ChallengeGroupReward.class).deleteMany(filter); - datastore.getCollection(AvatarHeroPath.class).deleteMany(filter); + datastore.getCollection(AvatarMultiPath.class).deleteMany(filter); datastore.getCollection(GameItem.class).deleteMany(filter); datastore.getCollection(PlayerLineup.class).deleteMany(filter); datastore.getCollection(PlayerExtraLineup.class).deleteMany(filter); diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index 1f2f756..40a6f98 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -5,1478 +5,1556 @@ public class CmdId { public static final int NONE = 0; // Cmd Ids - public static final int SpringRecoverCsReq = 1408; - public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3727; - public static final int FinishEmotionDialoguePerformanceScRsp = 6371; - public static final int FightMatch3SwapScRsp = 30130; - public static final int SelectChatBubbleScRsp = 5120; - public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5649; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2670; - public static final int EnterAetherDivideSceneCsReq = 4861; - public static final int HeliobusActivityDataCsReq = 5861; - public static final int CommonRogueQueryScRsp = 5624; - public static final int GetRogueShopMiracleInfoCsReq = 5620; - public static final int ApplyFriendCsReq = 2930; - public static final int GetHeartDialInfoScRsp = 6388; - public static final int ComposeLimitNumUpdateNotify = 550; - public static final int GetCurAssistCsReq = 2968; - public static final int TakeRollShopRewardCsReq = 6919; - public static final int RelicRecommendScRsp = 505; - public static final int ChangeLineupLeaderCsReq = 794; - public static final int TrialActivityDataChangeScNotify = 2646; - public static final int DrinkMakerChallengeCsReq = 6992; - public static final int GetMbtiReportCsReq = 7042; - public static final int AlleyGuaranteedFundsCsReq = 4768; - public static final int UpdateFeatureSwitchScNotify = 66; - public static final int FinishQuestCsReq = 927; - public static final int ChessRogueRollDiceScRsp = 5508; - public static final int GetCrossInfoScRsp = 7333; - public static final int GetAuthkeyScRsp = 82; - public static final int ActivateFarmElementCsReq = 1405; - public static final int SetAetherDivideLineUpCsReq = 4847; - public static final int StartAetherDivideChallengeBattleScRsp = 4871; - public static final int FightEnterScRsp = 30088; - public static final int FinishRogueCommonDialogueCsReq = 5689; - public static final int MarkAvatarCsReq = 328; - public static final int StartRogueScRsp = 1820; - public static final int UnlockAvatarSkinScNotify = 337; - public static final int SellItemCsReq = 570; - public static final int LobbyQuitScRsp = 7359; - public static final int SwapLineupScRsp = 727; - public static final int TakeAllApRewardCsReq = 3373; - public static final int GetChallengeGroupStatisticsCsReq = 1782; - public static final int RetcodeNotify = 24; - public static final int RestartChallengePhaseCsReq = 1751; - public static final int FinishPerformSectionIdScRsp = 2727; - public static final int AetherDivideFinishChallengeScNotify = 4801; - public static final int SyncLineupNotify = 762; - public static final int UseItemScRsp = 571; - public static final int GetFarmStageGachaInfoCsReq = 1391; - public static final int UseTreasureDungeonItemScRsp = 4451; - public static final int AcceptMainMissionCsReq = 1232; - public static final int GetWolfBroGameDataCsReq = 6587; - public static final int RogueTournDifficultyCompNotify = 6079; - public static final int JoinLineupCsReq = 739; - public static final int DelSaveRaidScNotify = 2270; - public static final int InteractPropScRsp = 1420; - public static final int DeleteSocialEventServerCacheScRsp = 7086; - public static final int EnableRogueTalentCsReq = 1838; + public static final int SpringRecoverCsReq = 1488; + public static final int FinishEmotionDialoguePerformanceScRsp = 6341; + public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5673; + public static final int SubmitMonsterResearchActivityMaterialCsReq = 2640; + public static final int EnterAetherDivideSceneCsReq = 4818; + public static final int CommonRogueQueryScRsp = 5668; + public static final int GetRogueShopMiracleInfoCsReq = 5637; + public static final int ApplyFriendCsReq = 2928; + public static final int GetHeartDialInfoScRsp = 6374; + public static final int ComposeLimitNumUpdateNotify = 538; + public static final int GetCurAssistCsReq = 2902; + public static final int ChangeLineupLeaderCsReq = 798; + public static final int FinishQuestCsReq = 964; + public static final int GetAuthkeyScRsp = 91; + public static final int StartAetherDivideChallengeBattleScRsp = 4841; + public static final int FightEnterScRsp = 30074; + public static final int FinishRogueCommonDialogueCsReq = 5694; + public static final int MarkAvatarCsReq = 392; + public static final int StartRogueScRsp = 1837; + public static final int UnlockAvatarSkinScNotify = 324; + public static final int SellItemCsReq = 540; + public static final int RelicAvatarRecommendScRsp = 542; + public static final int SwapLineupScRsp = 764; + public static final int GetChallengeGroupStatisticsCsReq = 1791; + public static final int FinishPerformSectionIdScRsp = 2764; + public static final int SyncLineupNotify = 789; + public static final int UseTreasureDungeonItemScRsp = 4408; + public static final int AcceptMainMissionCsReq = 1282; + public static final int GetWolfBroGameDataCsReq = 6519; + public static final int RogueTournDifficultyCompNotify = 6100; + public static final int JoinLineupCsReq = 758; + public static final int DelSaveRaidScNotify = 2240; public static final int EvolveBuildReRandomStageCsReq = 7105; - public static final int CurTrialActivityScNotify = 2689; - public static final int UnlockPhoneThemeScNotify = 5171; - public static final int SubmitEmotionItemScRsp = 6373; - public static final int UpdateRogueAdventureRoomScoreScRsp = 5690; - public static final int RogueTournGetSettleInfoScRsp = 6052; - public static final int ClockParkStartScriptCsReq = 7230; - public static final int NewAssistHistoryNotify = 2985; - public static final int LobbyInviteScRsp = 7379; - public static final int AlleyShipUsedCountScNotify = 4755; - public static final int RecoverAllLineupCsReq = 1468; - public static final int HeliobusSnsPostScRsp = 5873; - public static final int SetNicknameCsReq = 56; - public static final int SharePunkLordMonsterCsReq = 3239; - public static final int RogueTournRenameArchiveCsReq = 6090; - public static final int RogueTournGetArchiveRepositoryCsReq = 6071; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5524; - public static final int AlleyPlacingGameCsReq = 4747; - public static final int TakeRogueEventHandbookRewardCsReq = 5693; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4639; - public static final int MuseumTakeCollectRewardCsReq = 4301; - public static final int MonopolyGameCreateScNotify = 7026; - public static final int MonopolyGetRafflePoolInfoScRsp = 7014; - public static final int DailyFirstEnterMonopolyActivityCsReq = 7047; - public static final int GetActivityScheduleConfigCsReq = 2639; - public static final int DeleteSummonUnitCsReq = 1477; - public static final int RefreshAlleyOrderScRsp = 4703; - public static final int FinishChessRogueSubStoryScRsp = 5592; - public static final int GetCurSceneInfoScRsp = 1471; - public static final int GetFightActivityDataScRsp = 3688; - public static final int QuitBattleCsReq = 191; - public static final int FinishFirstTalkNpcScRsp = 2171; - public static final int EvolveBuildQueryInfoScRsp = 7117; - public static final int StartCocoonStageScRsp = 1485; - public static final int BattleLogReportScRsp = 162; - public static final int TreasureDungeonFinishScNotify = 4488; - public static final int ChessRogueEnterScRsp = 5424; - public static final int SetMissionEventProgressCsReq = 1281; - public static final int TreasureDungeonDataScNotify = 4461; - public static final int StrongChallengeActivityBattleEndScNotify = 6639; - public static final int StartAlleyEventCsReq = 4730; - public static final int ChessRogueCellUpdateNotify = 5572; - public static final int QuestRecordScNotify = 987; - public static final int MonopolyCheatDiceCsReq = 7028; - public static final int BuyRogueShopMiracleCsReq = 5671; - public static final int EnterRogueEndlessActivityStageScRsp = 6005; - public static final int StartAetherDivideStageBattleCsReq = 4849; - public static final int GetLoginActivityCsReq = 2661; - public static final int UpdateServerPrefsDataCsReq = 6139; - public static final int ClockParkGetInfoCsReq = 7261; - public static final int StartBoxingClubBattleScRsp = 4273; - public static final int GetFeverTimeActivityDataScRsp = 7156; - public static final int GetStoryLineInfoCsReq = 6261; - public static final int ChessRogueUpdateReviveInfoScNotify = 5402; - public static final int GetWaypointCsReq = 461; - public static final int ReturnLastTownScRsp = 1451; - public static final int SubmitOfferingItemCsReq = 6927; - public static final int LeaveRogueScRsp = 1871; - public static final int FinishTutorialGuideCsReq = 1662; - public static final int SpaceZooExchangeItemScRsp = 6747; - public static final int MonopolyAcceptQuizCsReq = 7085; - public static final int MonopolySocialEventEffectScNotify = 7034; - public static final int SetSpringRecoverConfigScRsp = 1464; - public static final int TravelBrochureSetPageDescStatusScRsp = 6403; - public static final int GetAlleyInfoCsReq = 4761; - public static final int RogueTournClearArchiveNameScNotify = 6081; - public static final int GetAllSaveRaidScRsp = 2203; - public static final int FightTreasureDungeonMonsterScRsp = 4403; - public static final int FinishCosumeItemMissionCsReq = 1247; - public static final int WolfBroGamePickupBulletScRsp = 6596; - public static final int ClockParkUnlockTalentScRsp = 7273; - public static final int ExchangeStaminaScRsp = 96; - public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5514; - public static final int FinishChapterScNotify = 4991; - public static final int GetPunkLordBattleRecordScRsp = 3268; - public static final int GetShopListScRsp = 1588; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4726; - public static final int GetStageLineupScRsp = 788; - public static final int UpdateRotaterScNotify = 6856; - public static final int GetTelevisionActivityDataCsReq = 6969; - public static final int LockRelicCsReq = 582; - public static final int EnterSceneCsReq = 1480; - public static final int SetClientPausedCsReq = 1417; - public static final int PlayerLogoutCsReq = 91; - public static final int SpaceZooMutateCsReq = 6739; - public static final int BattlePassInfoNotify = 3061; - public static final int MonopolyMoveCsReq = 7071; - public static final int ContentPackageSyncDataScNotify = 7470; - public static final int ReserveStaminaExchangeScRsp = 72; - public static final int MarkItemCsReq = 558; - public static final int StartFinishMainMissionScNotify = 1250; - public static final int CancelMatchCsReq = 7320; - public static final int FinishAeonDialogueGroupCsReq = 1852; - public static final int HeliobusSnsUpdateScNotify = 5862; - public static final int FightMatch3DataCsReq = 30161; - public static final int MonopolyGameRaiseRatioCsReq = 7050; - public static final int MonopolyRollDiceScRsp = 7030; - public static final int UpdateFloorSavedValueNotify = 1414; - public static final int WolfBroGameActivateBulletScRsp = 6582; - public static final int TrainVisitorBehaviorFinishScRsp = 3788; - public static final int LockEquipmentCsReq = 539; - public static final int MultiplayerFightGameFinishScNotify = 1071; - public static final int AetherDivideTainerInfoScNotify = 4833; - public static final int TextJoinBatchSaveCsReq = 3839; - public static final int ExpUpRelicScRsp = 521; - public static final int AlleyShipUnlockScNotify = 4712; - public static final int DeactivateFarmElementScRsp = 1448; - public static final int ChessRogueEnterNextLayerScRsp = 5598; - public static final int SyncRogueFinishScNotify = 1896; - public static final int HeliobusSnsReadCsReq = 5891; - public static final int ChessRogueNousEditDiceCsReq = 5464; - public static final int LeaveTrialActivityScRsp = 2634; - public static final int SetGameplayBirthdayScRsp = 8; - public static final int GroupStateChangeScNotify = 1499; - public static final int MonopolyTakePhaseRewardScRsp = 7060; - public static final int SetSignatureCsReq = 2827; - public static final int EquipAetherDividePassiveSkillCsReq = 4896; - public static final int EvolveBuildUnlockInfoNotify = 7132; - public static final int GetLevelRewardTakenListCsReq = 51; - public static final int SetLanguageScRsp = 33; - public static final int InteractTreasureDungeonGridScRsp = 4456; - public static final int GetRndOptionCsReq = 3461; - public static final int ChessRogueNousDiceUpdateNotify = 5418; - public static final int TakeQuestRewardCsReq = 991; - public static final int TravelBrochureSelectMessageCsReq = 6439; - public static final int ChessRoguePickAvatarScRsp = 5520; - public static final int LeaveAetherDivideSceneScRsp = 4820; - public static final int MuseumRandomEventStartScNotify = 4370; - public static final int UpdateTrackMainMissionIdCsReq = 1285; - public static final int RemoveStuffFromAreaScRsp = 4371; - public static final int SetGenderScRsp = 26; - public static final int MonopolyScrachRaffleTicketCsReq = 7069; - public static final int BoxingClubChallengeUpdateScNotify = 4227; - public static final int SyncRogueCommonVirtualItemInfoScNotify = 5618; - public static final int GetBasicInfoScRsp = 18; - public static final int AetherDivideSpiritExpUpCsReq = 4809; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2174; - public static final int TrainRefreshTimeNotify = 3739; - public static final int GetFriendDevelopmentInfoScRsp = 2965; - public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4221; - public static final int TakeCityShopRewardScRsp = 1573; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5454; - public static final int ReviveRogueAvatarCsReq = 1870; - public static final int SetTurnFoodSwitchScRsp = 517; - public static final int SceneEntityMoveScNotify = 1462; - public static final int LeaveMapRotationRegionCsReq = 6887; - public static final int TakeTrialActivityRewardScRsp = 2642; - public static final int ClientObjDownloadDataScNotify = 43; - public static final int ExchangeHcoinScRsp = 509; - public static final int DressAvatarSkinCsReq = 351; - public static final int EvolveBuildGiveupScRsp = 7103; - public static final int QueryProductInfoCsReq = 40; - public static final int TakeChallengeRaidRewardScRsp = 2287; - public static final int GetReplayTokenCsReq = 3561; - public static final int DoGachaInRollShopCsReq = 6907; - public static final int ChessRogueNousEnableRogueTalentScRsp = 5599; - public static final int EnhanceCommonRogueBuffCsReq = 5609; - public static final int EnterStrongChallengeActivityStageScRsp = 6620; - public static final int WolfBroGameUseBulletCsReq = 6574; - public static final int GetMapRotationDataCsReq = 6862; - public static final int PromoteEquipmentScRsp = 520; - public static final int RaidCollectionDataScNotify = 6947; - public static final int RankUpAvatarScRsp = 396; - public static final int LobbyCreateCsReq = 7395; - public static final int GetMovieRacingDataScRsp = 4151; - public static final int SceneEntityMoveScRsp = 1488; - public static final int AlleyEventEffectNotify = 4727; - public static final int GetCurBattleInfoScRsp = 173; - public static final int TriggerVoiceCsReq = 4147; - public static final int GameplayCounterUpdateScNotify = 1429; - public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5498; - public static final int GiveUpBoxingClubChallengeScRsp = 4271; - public static final int FightKickOutScNotify = 30020; - public static final int AcceptedPamMissionExpireScRsp = 4088; - public static final int WolfBroGameExplodeMonsterCsReq = 6503; - public static final int RegionStopScNotify = 3; - public static final int TakeRogueEndlessActivityPointRewardScRsp = 6007; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5502; - public static final int ClockParkFinishScriptScNotify = 7249; - public static final int DailyTaskDataScNotify = 1271; - public static final int GetMonopolyFriendRankingListScRsp = 7046; - public static final int GetMonopolyDailyReportScRsp = 7035; - public static final int BuyNpcStuffScRsp = 4320; - public static final int GetMissionDataCsReq = 1261; - public static final int GetFriendApplyListInfoCsReq = 2939; - public static final int GetUnlockTeleportCsReq = 1472; - public static final int ChessRogueFinishCurRoomNotify = 5426; - public static final int TextJoinQueryCsReq = 3891; - public static final int RotateMapScRsp = 6871; - public static final int LeaveChallengeScRsp = 1773; - public static final int TakeRogueAeonLevelRewardCsReq = 1869; - public static final int MonopolyGuessDrawScNotify = 7048; - public static final int MonopolyGameGachaCsReq = 7068; - public static final int SummonPunkLordMonsterScRsp = 3271; - public static final int LeaveMapRotationRegionScNotify = 6896; - public static final int SetGroupCustomSaveDataScRsp = 1465; - public static final int SwitchLineupIndexCsReq = 721; - public static final int FinishItemIdCsReq = 2739; - public static final int MuseumRandomEventSelectCsReq = 4351; - public static final int PlayerGetTokenScRsp = 73; - public static final int RefreshTriggerByClientCsReq = 1436; - public static final int EnterTreasureDungeonScRsp = 4494; - public static final int GetQuestRecordScRsp = 971; - public static final int RogueModifierUpdateNotify = 5371; - public static final int RestoreWolfBroGameArchiveCsReq = 6539; - public static final int CommonRogueUpdateScNotify = 5642; - public static final int MissionGroupWarnScNotify = 1274; - public static final int GetEnteredSceneScRsp = 1452; - public static final int ArchiveWolfBroGameScRsp = 6520; - public static final int SyncTaskScRsp = 1230; - public static final int MultiplayerFightGiveUpCsReq = 1039; - public static final int RogueWorkbenchSelectFuncScRsp = 5683; - public static final int PlayerReturnTakeRewardScRsp = 4571; - public static final int EvolveBuildLeaveScRsp = 7106; - public static final int PickRogueAvatarScRsp = 1882; - public static final int ComposeItemCsReq = 547; - public static final int SetFriendMarkCsReq = 2990; - public static final int SyncRogueRewardInfoScNotify = 1867; - public static final int EnterChallengeNextPhaseScRsp = 1712; - public static final int RogueWorkbenchSelectFuncCsReq = 5678; - public static final int RebattleByClientCsNotify = 194; - public static final int EvolveBuildShopAbilityUpCsReq = 7107; - public static final int MatchThreeSetBirdPosScRsp = 7433; - public static final int UnlockHeadIconScNotify = 2887; - public static final int SyncHandleFriendScNotify = 2974; - public static final int GetGachaInfoCsReq = 1961; - public static final int RogueModifierSelectCellScRsp = 5339; - public static final int HeliobusUpgradeLevelScRsp = 5894; - public static final int TakeMultipleExpeditionRewardScRsp = 2570; - public static final int TakeLoginActivityRewardScRsp = 2620; - public static final int PVEBattleResultCsReq = 161; - public static final int MonopolyGuessChooseScRsp = 7100; - public static final int QuitBattleScNotify = 187; - public static final int MonopolyGiveUpCurContentScRsp = 7037; - public static final int TakeOffRelicCsReq = 303; - public static final int StartRaidScRsp = 2288; - public static final int RogueModifierStageStartNotify = 5327; - public static final int EnterChallengeNextPhaseCsReq = 1781; - public static final int MonopolyGetRegionProgressCsReq = 7072; - public static final int GetFriendBattleRecordDetailScRsp = 2942; - public static final int SetHeroBasicTypeCsReq = 32; - public static final int ComposeSelectedRelicCsReq = 581; - public static final int GetTutorialGuideScRsp = 1620; - public static final int SceneCastSkillCostMpScRsp = 1496; - public static final int GetFriendAssistListScRsp = 2964; - public static final int GetTreasureDungeonActivityDataScRsp = 4474; - public static final int InteractChargerCsReq = 6891; - public static final int GetPlayerBoardDataScRsp = 2888; - public static final int EntityBindPropScRsp = 1426; - public static final int GetExpeditionDataCsReq = 2561; - public static final int GetMonopolyDailyReportCsReq = 7041; - public static final int MonopolyConfirmRandomScRsp = 7056; - public static final int AlleyTakeEventRewardScRsp = 4713; - public static final int TakeMailAttachmentScRsp = 871; - public static final int SetDisplayAvatarCsReq = 2839; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5590; - public static final int HeliobusSnsLikeCsReq = 5830; - public static final int TravelBrochureSetCustomValueScRsp = 6421; - public static final int ScenePlaneEventScNotify = 1479; - public static final int MatchBoxingClubOpponentScRsp = 4220; - public static final int CurAssistChangedNotify = 2917; - public static final int ArchiveWolfBroGameCsReq = 6591; - public static final int PlayerReturnTakePointRewardCsReq = 4539; - public static final int RogueTournEnterLayerCsReq = 6095; - public static final int ChessRogueSelectBpCsReq = 5450; - public static final int DeployRotaterCsReq = 6839; - public static final int LobbyKickOutScRsp = 7356; - public static final int AceAntiCheaterScRsp = 11; - public static final int SyncRogueCommonDialogueDataScNotify = 5698; - public static final int GetAllLineupDataCsReq = 756; - public static final int TakeFightActivityRewardCsReq = 3673; - public static final int GetMonopolyMbtiReportRewardScRsp = 7015; - public static final int MultipleDropInfoNotify = 4673; - public static final int GetPunkLordDataCsReq = 3221; - public static final int UnlockTutorialGuideScRsp = 1671; - public static final int WaypointShowNewCsNotify = 430; - public static final int AlleyShopLevelScNotify = 4781; - public static final int EnterSceneByServerScNotify = 1483; - public static final int RogueTournGetAllArchiveCsReq = 6054; - public static final int GeneralVirtualItemDataNotify = 600; - public static final int DeleteFriendScRsp = 2994; - public static final int RogueTournReviveAvatarScRsp = 6067; - public static final int GetTutorialScRsp = 1688; - public static final int SetRogueCollectionCsReq = 5672; - public static final int PlayerGetTokenCsReq = 39; - public static final int TravelBrochureGetDataScRsp = 6488; - public static final int GiveUpBoxingClubChallengeCsReq = 4230; - public static final int SwitchAetherDivideLineUpSlotScRsp = 4856; - public static final int HeliobusEnterBattleCsReq = 5856; - public static final int FinishCurTurnCsReq = 4362; - public static final int TakeRogueScoreRewardScRsp = 1851; - public static final int ClockParkHandleWaitOperationScRsp = 7274; - public static final int GetFriendRecommendListInfoScRsp = 2956; - public static final int PlayerReturnSignCsReq = 4588; - public static final int RogueTournLevelInfoUpdateScNotify = 6013; - public static final int EnterFeverTimeActivityStageScRsp = 7151; - public static final int GetFriendLoginInfoCsReq = 2940; - public static final int GetFriendListInfoScRsp = 2988; - public static final int BoxingClubRewardScNotify = 4287; - public static final int RogueTournEnterScRsp = 6031; - public static final int RemoveRotaterCsReq = 6803; - public static final int GetQuestDataCsReq = 961; - public static final int PlayerReturnInfoQueryScRsp = 4527; - public static final int PlayerReturnStartScNotify = 4561; - public static final int ChallengeLineupNotify = 1774; - public static final int ExchangeRogueBuffWithMiracleScRsp = 5656; - public static final int UpdateMechanismBarScNotify = 1442; - public static final int UpdatePlayerSettingCsReq = 6; - public static final int UpdateTrackMainMissionIdScRsp = 1254; - public static final int RogueTournEnablePermanentTalentCsReq = 6049; - public static final int GetAssistHistoryScRsp = 2913; - public static final int PlayBackGroundMusicCsReq = 3191; - public static final int GetGunPlayDataCsReq = 4112; - public static final int SyncRogueExploreWinScNotify = 1858; - public static final int GetMonopolyFriendRankingListCsReq = 7008; - public static final int MonopolyGameBingoFlipCardCsReq = 7058; - public static final int StartBattleCollegeScRsp = 5739; - public static final int ChangeScriptEmotionScRsp = 6320; - public static final int SceneReviveAfterRebattleCsReq = 1412; - public static final int LeaveAetherDivideSceneCsReq = 4891; - public static final int SyncRogueCommonPendingActionScNotify = 5605; - public static final int MarkReadMailScRsp = 820; - public static final int MarkChatEmojiScRsp = 3974; - public static final int GetServerPrefsDataCsReq = 6191; - public static final int GetSecretKeyInfoCsReq = 10; - public static final int ChessRogueSelectCellScRsp = 5442; - public static final int GetTrainVisitorBehaviorScRsp = 3720; - public static final int SelectInclinationTextScRsp = 2127; - public static final int SetIsDisplayAvatarInfoScRsp = 2871; - public static final int RogueTournGetPermanentTalentInfoCsReq = 6066; - public static final int GetRogueInitialScoreCsReq = 1900; - public static final int LeaveChallengeCsReq = 1739; - public static final int BuyBpLevelScRsp = 3030; - public static final int AcceptMissionEventScRsp = 1270; - public static final int GetMonopolyInfoCsReq = 7061; - public static final int GetQuestRecordCsReq = 930; - public static final int StartTimedCocoonStageCsReq = 1431; - public static final int EnterRogueScRsp = 1873; - public static final int LastSpringRefreshTimeNotify = 1456; - public static final int LogisticsDetonateStarSkiffScRsp = 4754; - public static final int DrinkMakerDayEndScNotify = 6991; - public static final int TakeOffEquipmentCsReq = 362; - public static final int GetRogueBuffEnhanceInfoScRsp = 1881; - public static final int EnhanceChessRogueBuffCsReq = 5544; - public static final int CancelCacheNotifyScRsp = 4127; - public static final int SendMsgCsReq = 3961; - public static final int SwitchLineupIndexScRsp = 782; - public static final int SetRogueExhibitionScRsp = 5660; - public static final int MonopolyMoveScRsp = 7087; - public static final int StoryLineInfoScNotify = 6291; - public static final int MultiplayerGetFightGateScRsp = 1020; - public static final int ChessRogueUpdateBoardScNotify = 5488; - public static final int GetQuestDataScRsp = 988; - public static final int BuyNpcStuffCsReq = 4391; - public static final int TakeRogueScoreRewardCsReq = 1849; - public static final int CancelActivityExpeditionCsReq = 2574; - public static final int HeliobusEnterBattleScRsp = 5849; - public static final int GetLevelRewardTakenListScRsp = 9; - public static final int SetHeadIconScRsp = 2820; - public static final int MatchThreeGetDataScRsp = 7417; - public static final int MultiplayerFightGameStateScRsp = 1088; - public static final int AcceptExpeditionCsReq = 2591; - public static final int HandleRogueCommonPendingActionCsReq = 5646; - public static final int LogisticsInfoScNotify = 4701; - public static final int DailyFirstMeetPamScRsp = 3420; - public static final int ChessRogueQuestFinishNotify = 5571; - public static final int RogueTournEnterRogueCocoonSceneScRsp = 6027; - public static final int RechargeSuccNotify = 549; - public static final int MonopolyLikeScNotify = 7024; - public static final int SyncRogueMapRoomScNotify = 1840; - public static final int SetCurWaypointCsReq = 491; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5566; - public static final int SceneEntityTeleportCsReq = 1498; - public static final int TravelBrochureUpdatePasterPosScRsp = 6474; - public static final int ChessRogueCheatRollScRsp = 5456; - public static final int UnlockTutorialScRsp = 1673; - public static final int UnlockTeleportNotify = 1467; - public static final int SetFriendRemarkNameScRsp = 2951; - public static final int GetFriendListInfoCsReq = 2961; - public static final int MonopolyTakeRaffleTicketRewardScRsp = 7084; - public static final int HeartDialScriptChangeScNotify = 6387; - public static final int ExchangeHcoinCsReq = 551; - public static final int HeliobusLineupUpdateScNotify = 5812; - public static final int ChessRogueQueryBpCsReq = 5475; - public static final int TakeChapterRewardCsReq = 471; - public static final int SelectPhoneThemeScRsp = 5130; - public static final int SyncRoguePickAvatarInfoScNotify = 1892; - public static final int FightMatch3DataScRsp = 30188; - public static final int TakeRogueMiracleHandbookRewardScRsp = 5700; - public static final int DoGachaInRollShopScRsp = 6903; - public static final int GetSaveLogisticsMapCsReq = 4750; - public static final int EnterFeverTimeActivityStageCsReq = 7158; - public static final int StartChallengeScRsp = 1720; - public static final int LobbyGetInfoScRsp = 7398; - public static final int GetRogueExhibitionScRsp = 5614; - public static final int PVEBattleResultScRsp = 188; - public static final int UpdateRedDotDataCsReq = 5991; - public static final int FinishPlotCsReq = 1161; - public static final int BuyGoodsScRsp = 1520; - public static final int BuyRogueShopBuffCsReq = 5627; - public static final int SubmitOrigamiItemCsReq = 4196; - public static final int LobbyModifyPlayerInfoScRsp = 7353; - public static final int UpdateMovieRacingDataScRsp = 4181; - public static final int MonopolyGameBingoFlipCardScRsp = 7013; - public static final int OfferingInfoScNotify = 6935; - public static final int ExpeditionDataChangeScNotify = 2587; - public static final int GetTelevisionActivityDataScRsp = 6962; - public static final int FinishTutorialCsReq = 1687; - public static final int WolfBroGameDataChangeScNotify = 6562; - public static final int MatchThreeSetBirdPosCsReq = 7428; - public static final int GroupStateChangeScRsp = 1435; - public static final int SyncRogueReviveInfoScNotify = 1832; - public static final int HeliobusUpgradeLevelCsReq = 5847; - public static final int HeliobusSelectSkillCsReq = 5821; - public static final int PlayerKickOutScNotify = 87; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2194; - public static final int SyncClientResVersionCsReq = 130; - public static final int SceneUpdatePositionVersionNotify = 1474; - public static final int EnterTelevisionActivityStageScRsp = 6979; - public static final int TrainVisitorRewardSendNotify = 3773; - public static final int RogueTournGetMiscRealTimeDataScRsp = 6020; - public static final int EndDrinkMakerSequenceScRsp = 6994; - public static final int GetMarkItemListCsReq = 568; - public static final int AetherDivideRefreshEndlessScRsp = 4895; - public static final int ServerSimulateBattleFinishScNotify = 174; - public static final int EnterTrialActivityStageScRsp = 2644; - public static final int ChessRogueSkipTeachingLevelScRsp = 5581; - public static final int EntityBindPropCsReq = 1454; - public static final int GetMultipleDropInfoCsReq = 4661; - public static final int GetDailyActiveInfoCsReq = 3391; - public static final int GetPhoneDataCsReq = 5161; - public static final int LobbyJoinCsReq = 7370; - public static final int UpdateGunPlayDataScRsp = 4101; - public static final int SpaceZooExchangeItemCsReq = 6774; - public static final int RogueTournReEnterRogueCocoonStageCsReq = 6083; - public static final int ChessRogueReRollDiceCsReq = 5460; - public static final int PlayerHeartBeatScRsp = 16; - public static final int SecurityReportScRsp = 4174; - public static final int RaidCollectionDataScRsp = 6942; - public static final int GetDrinkMakerDataScRsp = 6982; - public static final int ExtraLineupDestroyNotify = 712; - public static final int MonopolyGetRegionProgressScRsp = 7053; - public static final int FightMatch3ForceUpdateNotify = 30174; - public static final int GetPrivateChatHistoryCsReq = 3939; - public static final int PlayerReturnTakeRewardCsReq = 4530; - public static final int GetSingleRedDotParamGroupScRsp = 5973; - public static final int RankUpAvatarCsReq = 394; - public static final int GameplayCounterCountDownScRsp = 1460; - public static final int GetRogueHandbookDataCsReq = 5685; - public static final int SceneCastSkillScRsp = 1473; - public static final int ChessRogueGoAheadScRsp = 5574; - public static final int MonopolyReRollRandomScRsp = 7003; - public static final int ChessRogueChangeyAeonDimensionNotify = 5531; - public static final int MarkAvatarScRsp = 301; - public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5586; - public static final int RogueTournHandBookNotify = 6091; - public static final int GetTutorialCsReq = 1661; - public static final int GetArchiveDataScRsp = 2388; - public static final int SyncAddBlacklistScNotify = 2903; - public static final int AlleyTakeEventRewardCsReq = 4758; - public static final int ExchangeRogueRewardKeyCsReq = 1842; - public static final int ChessRogueQuitCsReq = 5539; - public static final int ChessRogueGiveUpCsReq = 5481; - public static final int QueryProductInfoScRsp = 48; - public static final int StartTimedFarmElementScRsp = 1419; - public static final int ReplaceLineupCsReq = 709; - public static final int RogueTournLeaveRogueCocoonSceneCsReq = 6100; - public static final int GetTrainVisitorRegisterCsReq = 3730; - public static final int SetBoxingClubResonanceLineupCsReq = 4247; - public static final int GetFriendBattleRecordDetailCsReq = 2924; - public static final int GetAllRedDotDataCsReq = 5961; - public static final int UseItemCsReq = 530; - public static final int RogueTournStartCsReq = 6075; - public static final int ShareScRsp = 4188; - public static final int StartTrialActivityCsReq = 2616; - public static final int GetStrongChallengeActivityDataCsReq = 6661; - public static final int TakeAllApRewardScRsp = 3330; - public static final int GetTrialActivityDataScRsp = 2608; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5414; - public static final int MonopolyGetRaffleTicketScRsp = 7083; - public static final int GetFriendApplyListInfoScRsp = 2973; - public static final int EvolveBuildTakeExpRewardCsReq = 7150; - public static final int FightMatch3TurnEndScNotify = 30139; - public static final int GetPlayerBoardDataCsReq = 2861; - public static final int EvolveBuildStartLevelCsReq = 7120; + public static final int CurTrialActivityScNotify = 2694; + public static final int SubmitEmotionItemScRsp = 6349; + public static final int UpdateRogueAdventureRoomScoreScRsp = 5642; + public static final int LobbyInviteScRsp = 7353; + public static final int SharePunkLordMonsterCsReq = 3258; + public static final int RogueTournGetArchiveRepositoryCsReq = 6043; + public static final int RogueTournRenameArchiveCsReq = 6048; + public static final int TakeRogueEventHandbookRewardCsReq = 5639; + public static final int GetPlayerReturnMultiDropInfoScRsp = 4658; + public static final int MuseumTakeCollectRewardCsReq = 4347; + public static final int MonopolyGameCreateScNotify = 7080; + public static final int MonopolyGetRafflePoolInfoScRsp = 7065; + public static final int GetActivityScheduleConfigCsReq = 2658; + public static final int DeleteSummonUnitCsReq = 1450; + public static final int RefreshAlleyOrderScRsp = 4762; + public static final int GetCurSceneInfoScRsp = 1441; + public static final int StartCocoonStageScRsp = 1406; + public static final int TreasureDungeonFinishScNotify = 4474; + public static final int StrongChallengeActivityBattleEndScNotify = 6658; + public static final int StartAlleyEventCsReq = 4728; + public static final int ChessRogueCellUpdateNotify = 5412; + public static final int BuyRogueShopMiracleCsReq = 5641; + public static final int EnterRogueEndlessActivityStageScRsp = 6010; + public static final int StartAetherDivideStageBattleCsReq = 4873; + public static final int GetLoginActivityCsReq = 2618; + public static final int StartBoxingClubBattleScRsp = 4249; + public static final int GetWaypointCsReq = 418; + public static final int LeaveRogueScRsp = 1841; + public static final int TravelBrochureSetPageDescStatusScRsp = 6462; + public static final int GetAllSaveRaidScRsp = 2262; + public static final int WolfBroGamePickupBulletScRsp = 6583; + public static final int ClockParkUnlockTalentScRsp = 7249; + public static final int ExchangeStaminaScRsp = 83; + public static final int GetPunkLordBattleRecordScRsp = 3202; + public static final int GetShopListScRsp = 1574; + public static final int LogisticsScoreRewardSyncInfoScNotify = 4780; + public static final int GetStageLineupScRsp = 774; + public static final int UpdateRotaterScNotify = 6848; + public static final int LockRelicCsReq = 591; + public static final int BattlePassInfoNotify = 3018; + public static final int MonopolyMoveCsReq = 7041; + public static final int ReserveStaminaExchangeScRsp = 95; + public static final int MarkItemCsReq = 509; + public static final int MonopolyGameRaiseRatioCsReq = 7038; + public static final int UpdateFloorSavedValueNotify = 1465; + public static final int ExpUpRelicScRsp = 522; + public static final int AlleyShipUnlockScNotify = 4777; + public static final int ChessRogueEnterNextLayerScRsp = 5582; + public static final int SyncRogueFinishScNotify = 1883; + public static final int ChessRogueNousEditDiceCsReq = 5445; + public static final int MonopolyTakePhaseRewardScRsp = 7085; + public static final int EvolveBuildUnlockInfoNotify = 7123; + public static final int GetLevelRewardTakenListCsReq = 8; + public static final int InteractTreasureDungeonGridScRsp = 4448; + public static final int GetRndOptionCsReq = 3418; + public static final int SwordTrainingRestoreGameScRsp = 7468; + public static final int ChessRogueNousDiceUpdateNotify = 5542; + public static final int TakeQuestRewardCsReq = 929; + public static final int SwordTrainingExamResultConfirmCsReq = 7488; + public static final int ChessRoguePickAvatarScRsp = 5441; + public static final int LeaveAetherDivideSceneScRsp = 4837; + public static final int MuseumRandomEventStartScNotify = 4340; + public static final int RemoveStuffFromAreaScRsp = 4341; + public static final int MonopolyScrachRaffleTicketCsReq = 7081; + public static final int SyncRogueCommonVirtualItemInfoScNotify = 5645; + public static final int AetherDivideSpiritExpUpCsReq = 4811; + public static final int GetFirstTalkByPerformanceNpcScRsp = 2157; + public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4222; + public static final int ReviveRogueAvatarCsReq = 1840; + public static final int SetTurnFoodSwitchScRsp = 523; + public static final int TakeTrialActivityRewardScRsp = 2633; + public static final int ClientObjDownloadDataScNotify = 99; + public static final int TakeChallengeRaidRewardScRsp = 2219; + public static final int DoGachaInRollShopCsReq = 6913; + public static final int WolfBroGameUseBulletCsReq = 6557; + public static final int GetMapRotationDataCsReq = 6889; + public static final int LobbyCreateCsReq = 7369; + public static final int AlleyEventEffectNotify = 4764; + public static final int GetCurBattleInfoScRsp = 149; + public static final int GiveUpBoxingClubChallengeScRsp = 4241; + public static final int FightKickOutScNotify = 30037; + public static final int AcceptedPamMissionExpireScRsp = 4074; + public static final int WolfBroGameExplodeMonsterCsReq = 6562; + public static final int TakeRogueEndlessActivityPointRewardScRsp = 6003; + public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5456; + public static final int GetMonopolyDailyReportScRsp = 7052; + public static final int BuyNpcStuffScRsp = 4337; + public static final int GetMissionDataCsReq = 1218; + public static final int ChessRogueFinishCurRoomNotify = 5439; + public static final int TextJoinQueryCsReq = 3829; + public static final int RotateMapScRsp = 6841; + public static final int LeaveChallengeScRsp = 1749; + public static final int TakeRogueAeonLevelRewardCsReq = 1881; + public static final int MonopolyGuessDrawScNotify = 7075; + public static final int MonopolyGameGachaCsReq = 7002; + public static final int SummonPunkLordMonsterScRsp = 3241; + public static final int FinishItemIdCsReq = 2758; + public static final int MuseumRandomEventSelectCsReq = 4308; + public static final int RefreshTriggerByClientCsReq = 1497; + public static final int EnterTreasureDungeonScRsp = 4498; + public static final int CommonRogueUpdateScNotify = 5633; + public static final int MissionGroupWarnScNotify = 1257; + public static final int GetEnteredSceneScRsp = 1444; + public static final int ArchiveWolfBroGameScRsp = 6537; + public static final int SyncTaskScRsp = 1228; + public static final int RogueWorkbenchSelectFuncScRsp = 5660; + public static final int EvolveBuildLeaveScRsp = 7150; + public static final int PickRogueAvatarScRsp = 1891; + public static final int SetFriendMarkCsReq = 2942; + public static final int EnterChallengeNextPhaseScRsp = 1777; + public static final int RogueWorkbenchSelectFuncCsReq = 5644; + public static final int EvolveBuildShopAbilityUpCsReq = 7113; + public static final int MatchThreeSetBirdPosScRsp = 7412; + public static final int RogueModifierSelectCellScRsp = 5358; + public static final int HeliobusUpgradeLevelScRsp = 5898; + public static final int TakeMultipleExpeditionRewardScRsp = 2540; + public static final int MonopolyGuessChooseScRsp = 7087; + public static final int QuitBattleScNotify = 119; + public static final int StartRaidScRsp = 2274; + public static final int RogueModifierStageStartNotify = 5364; + public static final int EnterChallengeNextPhaseCsReq = 1721; + public static final int MonopolyGetRegionProgressCsReq = 7095; + public static final int GetFriendBattleRecordDetailScRsp = 2933; + public static final int ComposeSelectedRelicCsReq = 521; + public static final int GetFriendAssistListScRsp = 2936; + public static final int GetTreasureDungeonActivityDataScRsp = 4457; + public static final int GetPlayerBoardDataScRsp = 2874; + public static final int GetMonopolyDailyReportCsReq = 7030; + public static final int TakeMailAttachmentScRsp = 841; + public static final int SetDisplayAvatarCsReq = 2858; + public static final int ChessRogueQueryAeonDimensionsScRsp = 5576; + public static final int HeliobusSnsLikeCsReq = 5828; + public static final int MatchBoxingClubOpponentScRsp = 4237; + public static final int ArchiveWolfBroGameCsReq = 6529; + public static final int AceAntiCheaterScRsp = 10; + public static final int SyncRogueCommonDialogueDataScNotify = 5684; + public static final int GetAllLineupDataCsReq = 748; + public static final int GetMonopolyMbtiReportRewardScRsp = 7086; + public static final int GetPunkLordDataCsReq = 3222; + public static final int UnlockTutorialGuideScRsp = 1641; + public static final int EnterSceneByServerScNotify = 1434; + public static final int DeleteFriendScRsp = 2998; + public static final int EnterSummonActivityStageScRsp = 7570; + public static final int RogueTournReviveAvatarScRsp = 6071; + public static final int GetTutorialScRsp = 1674; + public static final int TravelBrochureGetDataScRsp = 6474; + public static final int GiveUpBoxingClubChallengeCsReq = 4228; + public static final int FinishCurTurnCsReq = 4389; + public static final int EnterFeverTimeActivityStageScRsp = 7155; + public static final int GetFriendLoginInfoCsReq = 2914; + public static final int GetFriendListInfoScRsp = 2974; + public static final int RogueTournEnterScRsp = 6028; + public static final int GetQuestDataCsReq = 918; + public static final int PlayerReturnInfoQueryScRsp = 4564; + public static final int PlayerReturnStartScNotify = 4518; + public static final int ExchangeRogueBuffWithMiracleScRsp = 5648; + public static final int UpdateMechanismBarScNotify = 1433; + public static final int UpdatePlayerSettingCsReq = 31; + public static final int RogueTournEnablePermanentTalentCsReq = 6057; + public static final int GetGunPlayDataCsReq = 4177; + public static final int SceneReviveAfterRebattleCsReq = 1477; + public static final int LeaveAetherDivideSceneCsReq = 4829; + public static final int MarkReadMailScRsp = 837; + public static final int GetServerPrefsDataCsReq = 6129; + public static final int GetTrainVisitorBehaviorScRsp = 3737; + public static final int SelectInclinationTextScRsp = 2164; + public static final int SetIsDisplayAvatarInfoScRsp = 2841; + public static final int GetRogueInitialScoreCsReq = 1887; + public static final int LeaveChallengeCsReq = 1758; + public static final int StartTimedCocoonStageCsReq = 1415; + public static final int MonopolyMoveScRsp = 7019; + public static final int MultiplayerGetFightGateScRsp = 1037; + public static final int ChessRogueUpdateBoardScNotify = 5515; + public static final int GetQuestDataScRsp = 974; + public static final int BuyNpcStuffCsReq = 4329; + public static final int CancelActivityExpeditionCsReq = 2557; + public static final int GetLevelRewardTakenListScRsp = 11; + public static final int MatchThreeGetDataScRsp = 7429; + public static final int MultiplayerFightGameStateScRsp = 1074; + public static final int HandleRogueCommonPendingActionCsReq = 5700; + public static final int GetTrackPhotoActivityDataCsReq = 7552; + public static final int ChessRogueQuestFinishNotify = 5578; + public static final int MonopolyLikeScNotify = 7068; + public static final int SetCurWaypointCsReq = 429; + public static final int ChessRogueCheatRollScRsp = 5567; + public static final int SetFriendRemarkNameScRsp = 2908; + public static final int GetFriendListInfoCsReq = 2918; + public static final int HeliobusLineupUpdateScNotify = 5877; + public static final int SwordTrainingFinishEndingHintCsReq = 7493; + public static final int TakeChapterRewardCsReq = 441; + public static final int SelectPhoneThemeScRsp = 5128; + public static final int DoGachaInRollShopScRsp = 6905; + public static final int EnterFeverTimeActivityStageCsReq = 7152; + public static final int StartChallengeScRsp = 1737; + public static final int LobbyGetInfoScRsp = 7374; + public static final int BuyGoodsScRsp = 1537; + public static final int BuyRogueShopBuffCsReq = 5664; + public static final int UpdateMovieRacingDataScRsp = 4121; + public static final int OfferingInfoScNotify = 6929; + public static final int FinishTutorialCsReq = 1619; + public static final int WolfBroGameDataChangeScNotify = 6589; + public static final int MatchThreeSetBirdPosCsReq = 7420; + public static final int HeliobusUpgradeLevelCsReq = 5846; + public static final int HeliobusSelectSkillCsReq = 5822; + public static final int FinishFirstTalkByPerformanceNpcScRsp = 2198; + public static final int SceneUpdatePositionVersionNotify = 1457; + public static final int EnterTelevisionActivityStageScRsp = 6963; + public static final int EndDrinkMakerSequenceScRsp = 6984; + public static final int ChessRogueSkipTeachingLevelScRsp = 5489; + public static final int GetMultipleDropInfoCsReq = 4618; + public static final int GetPhoneDataCsReq = 5118; + public static final int SetAvatarPathCsReq = 52; + public static final int LobbyJoinCsReq = 7356; + public static final int PlayerHeartBeatScRsp = 90; + public static final int RaidCollectionDataScRsp = 6957; + public static final int GetDrinkMakerDataScRsp = 6997; + public static final int MonopolyGetRegionProgressScRsp = 7054; + public static final int GetSingleRedDotParamGroupScRsp = 5949; + public static final int ChessRogueGoAheadScRsp = 5529; + public static final int MonopolyReRollRandomScRsp = 7062; + public static final int MarkAvatarScRsp = 347; + public static final int RogueTournHandBookNotify = 6020; + public static final int GetTutorialCsReq = 1618; + public static final int GetArchiveDataScRsp = 2374; + public static final int SyncAddBlacklistScNotify = 2962; + public static final int GetSwordTrainingDataCsReq = 7479; + public static final int ExchangeRogueRewardKeyCsReq = 1833; + public static final int ChessRogueGiveUpCsReq = 5524; + public static final int StartTimedFarmElementScRsp = 1443; + public static final int ReplaceLineupCsReq = 711; + public static final int RogueTournLeaveRogueCocoonSceneCsReq = 6050; + public static final int SetBoxingClubResonanceLineupCsReq = 4246; + public static final int GetFriendBattleRecordDetailCsReq = 2968; + public static final int GetAllRedDotDataCsReq = 5918; + public static final int RogueTournStartCsReq = 6031; + public static final int StartTrialActivityCsReq = 2690; + public static final int MonopolyGetRaffleTicketScRsp = 7034; + public static final int GetPlayerBoardDataCsReq = 2818; public static final int StarFightDataChangeNotify = 7166; - public static final int UnlockSkilltreeCsReq = 339; - public static final int TakeAllRewardCsReq = 3071; - public static final int ChessRogueQueryAeonDimensionsCsReq = 5512; - public static final int PunkLordMonsterInfoScNotify = 3296; - public static final int NewMailScNotify = 887; - public static final int ChessRogueStartScRsp = 5477; - public static final int GetRogueInfoScRsp = 1888; - public static final int RogueModifierSelectCellCsReq = 5320; - public static final int LogisticsGameScRsp = 4720; - public static final int TakePromotionRewardCsReq = 356; - public static final int ShowNewSupplementVisitorCsReq = 3762; - public static final int GetAssistListCsReq = 2933; - public static final int EnterAdventureCsReq = 1361; - public static final int TravelBrochureSelectMessageScRsp = 6473; - public static final int GetAetherDivideInfoScRsp = 4874; - public static final int GetCurAssistScRsp = 2995; - public static final int GetNpcStatusScRsp = 2720; - public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5651; - public static final int RogueNpcDisappearScRsp = 5647; - public static final int RankUpEquipmentScRsp = 527; - public static final int RogueTournExpNotify = 6068; - public static final int GetMonsterResearchActivityDataScRsp = 2603; - public static final int ClockParkGetOngoingScriptInfoCsReq = 7287; - public static final int SellItemScRsp = 556; - public static final int RestartChallengePhaseScRsp = 1709; - public static final int ChallengeBossPhaseSettleNotify = 1737; - public static final int FinishChessRogueNousSubStoryScRsp = 5455; - public static final int MatchThreeLevelEndCsReq = 7420; - public static final int GetPlatformPlayerInfoScRsp = 2993; - public static final int GetStarFightDataCsReq = 7168; - public static final int SpaceZooTakeCsReq = 6794; - public static final int StartStarFightLevelScRsp = 7165; - public static final int AddAvatarScNotify = 347; - public static final int SelectChessRogueSubStoryScRsp = 5540; - public static final int FinishQuestScRsp = 962; - public static final int SyncChessRogueNousValueScNotify = 5469; - public static final int RelicRecommendCsReq = 548; - public static final int RogueTournTakeExpRewardScRsp = 6080; - public static final int ChangeLineupLeaderScRsp = 796; - public static final int TakePictureCsReq = 4139; - public static final int GetBagScRsp = 588; - public static final int GetHeroBasicTypeInfoCsReq = 68; - public static final int GetChatFriendHistoryCsReq = 3930; - public static final int ClockParkUseBuffScRsp = 7256; - public static final int GetPunkLordMonsterDataScRsp = 3288; - public static final int WolfBroGameActivateBulletCsReq = 6521; - public static final int SavePointsInfoNotify = 1458; - public static final int DeleteBlacklistCsReq = 2912; - public static final int PrivateMsgOfflineUsersScNotify = 3920; - public static final int TakeActivityExpeditionRewardCsReq = 2594; - public static final int SubmitEmotionItemCsReq = 6339; - public static final int StartWolfBroGameScRsp = 6588; - public static final int UnlockBackGroundMusicCsReq = 3139; - public static final int GetPlayerReplayInfoScRsp = 3520; - public static final int ClientObjUploadCsReq = 60; - public static final int GetChallengeRaidInfoScRsp = 2230; - public static final int GetSocialEventServerCacheCsReq = 7089; - public static final int GetRogueScoreRewardInfoScRsp = 1860; - public static final int GetLoginChatInfoCsReq = 3996; - public static final int QuitLineupCsReq = 730; - public static final int GetFirstTalkNpcCsReq = 2139; - public static final int GetAvatarDataCsReq = 361; - public static final int GetBoxingClubInfoScRsp = 4288; - public static final int StartAetherDivideSceneBattleCsReq = 4839; - public static final int RogueTournDeleteArchiveScRsp = 6096; - public static final int TakeChallengeRewardScRsp = 1721; - public static final int SyncRogueCommonDialogueOptionFinishScNotify = 5686; - public static final int DressRelicAvatarCsReq = 321; - public static final int MonopolyEventLoadUpdateScNotify = 7029; - public static final int FightTreasureDungeonMonsterCsReq = 4482; - public static final int GetFantasticStoryActivityDataScRsp = 4988; - public static final int ChooseBoxingClubResonanceScRsp = 4274; - public static final int GetAetherDivideChallengeInfoCsReq = 4837; - public static final int GetRogueEndlessActivityDataScRsp = 6001; - public static final int GetMissionEventDataCsReq = 1296; - public static final int StopRogueAdventureRoomScRsp = 5637; - public static final int TravelBrochureRemovePasterScRsp = 6427; - public static final int GetBattleCollegeDataScRsp = 5788; - public static final int GetFriendChallengeDetailCsReq = 2911; - public static final int SyncRogueAdventureRoomInfoScNotify = 5661; - public static final int TakePrestigeRewardScRsp = 4774; - public static final int LockEquipmentScRsp = 573; - public static final int SetLineupNameScRsp = 770; - public static final int HeliobusStartRaidScRsp = 5809; - public static final int HeliobusChallengeUpdateScNotify = 5881; - public static final int EvolveBuildShopAbilityResetCsReq = 7131; - public static final int ResetMapRotationRegionScRsp = 6894; - public static final int HeliobusActivityDataScRsp = 5888; - public static final int GetShareDataScRsp = 4120; - public static final int SpringRefreshScRsp = 1470; - public static final int GetCurLineupDataScRsp = 720; - public static final int HeliobusSnsCommentCsReq = 5887; - public static final int RogueTournQueryCsReq = 6058; - public static final int PrestigeLevelUpCsReq = 4749; - public static final int TelevisionActivityBattleEndScNotify = 6974; - public static final int SetStuffToAreaCsReq = 4339; - public static final int SubmitOfferingItemScRsp = 6923; - public static final int GetCurChallengeCsReq = 1727; - public static final int SetMissionEventProgressScRsp = 1212; - public static final int SubMissionRewardScNotify = 1237; - public static final int TravelBrochureApplyPasterScRsp = 6471; - public static final int MakeMissionDrinkCsReq = 6995; - public static final int StartFinishSubMissionScNotify = 1233; - public static final int TakeOfferingRewardCsReq = 6939; - public static final int TakeTalkRewardCsReq = 2191; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5564; - public static final int TakeBpRewardScRsp = 3039; - public static final int GetRaidInfoScRsp = 2274; - public static final int MonopolyAcceptQuizScRsp = 7054; - public static final int TravelBrochurePageUnlockScNotify = 6491; - public static final int CityShopInfoScNotify = 1530; - public static final int SpaceZooDataScRsp = 6788; - public static final int PromoteAvatarScRsp = 371; - public static final int ChessRogueGiveUpRollScRsp = 5406; - public static final int MonopolyLikeScRsp = 7044; - public static final int GetStoryLineInfoScRsp = 6288; - public static final int HeartDialTraceScriptCsReq = 6327; - public static final int SetLanguageCsReq = 1; - public static final int DeactivateFarmElementCsReq = 1440; - public static final int ReportPlayerCsReq = 2909; - public static final int SyncAcceptedPamMissionNotify = 4091; - public static final int RogueTournLeaveCsReq = 6064; - public static final int DressAvatarCsReq = 387; - public static final int TakeExpeditionRewardCsReq = 2530; - public static final int TrainVisitorBehaviorFinishCsReq = 3761; - public static final int TakeMonsterResearchActivityRewardCsReq = 2649; - public static final int SpaceZooDeleteCatScRsp = 6727; - public static final int OpenTreasureDungeonGridScRsp = 4421; - public static final int GetRogueAeonInfoScRsp = 1807; - public static final int StartPartialChallengeCsReq = 1770; - public static final int QuitTreasureDungeonScRsp = 4481; - public static final int EvolveBuildReRandomStageScRsp = 7129; - public static final int EnterFightActivityStageScRsp = 3639; - public static final int MonopolyGetDailyInitItemScRsp = 7002; - public static final int MonopolyClickCellScRsp = 7007; - public static final int RogueModifierDelNotify = 5387; - public static final int RaidInfoNotify = 2239; - public static final int UpgradeAreaScRsp = 4394; - public static final int GetRollShopInfoCsReq = 6909; - public static final int ChessRogueQueryScRsp = 5448; - public static final int BatchGetQuestDataCsReq = 996; - public static final int MuseumRandomEventQueryScRsp = 4349; - public static final int SearchPlayerScRsp = 2901; - public static final int TeleportToMissionResetPointScRsp = 1201; - public static final int GmTalkScRsp = 62; - public static final int GetCurSceneInfoCsReq = 1430; - public static final int CancelExpeditionCsReq = 2539; - public static final int SyncApplyFriendScNotify = 2987; - public static final int EnteredSceneChangeScNotify = 1402; - public static final int RogueWorkbenchHandleFuncScRsp = 5684; - public static final int GetAllServerPrefsDataCsReq = 6161; - public static final int TravelBrochurePageResetCsReq = 6470; - public static final int SyncRogueVirtualItemInfoScNotify = 1823; - public static final int MonopolySttUpdateScNotify = 7063; - public static final int EnhanceRogueBuffScRsp = 1837; - public static final int RogueTournConfirmSettleScRsp = 6074; - public static final int SpaceZooCatUpdateNotify = 6762; - public static final int GetRogueTalentInfoScRsp = 1875; - public static final int RogueTournGetCurRogueCocoonInfoCsReq = 6018; - public static final int QuitWolfBroGameScRsp = 6571; - public static final int GetWolfBroGameDataScRsp = 6527; - public static final int HeliobusSnsPostCsReq = 5839; - public static final int RogueModifierAddNotify = 5391; - public static final int AcceptActivityExpeditionScRsp = 2562; - public static final int PunkLordDataChangeNotify = 3232; - public static final int SetClientRaidTargetCountScRsp = 2294; - public static final int ChessRogueUpdateDiceInfoScNotify = 5435; - public static final int MonopolyRollRandomCsReq = 7096; - public static final int ChangeStoryLineFinishScNotify = 6273; - public static final int LobbyBeginScRsp = 7378; - public static final int StartPunkLordRaidCsReq = 3291; - public static final int GetChallengeGroupStatisticsScRsp = 1703; - public static final int ChessRogueEnterCellCsReq = 5532; - public static final int GetSaveRaidCsReq = 2296; - public static final int RogueGetGambleInfoCsReq = 5641; - public static final int ChallengeSettleNotify = 1730; - public static final int RecoverAllLineupScRsp = 1495; - public static final int ClockParkQuitScriptScRsp = 7294; - public static final int DoGachaScRsp = 1920; - public static final int RefreshTriggerByClientScNotify = 1438; - public static final int ChessRogueLeaveScRsp = 5513; - public static final int ReviveRogueAvatarScRsp = 1856; - public static final int RemoveStuffFromAreaCsReq = 4330; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2162; - public static final int TravelBrochureApplyPasterListCsReq = 6449; - public static final int SetAssistCsReq = 2932; - public static final int GetFriendDevelopmentInfoCsReq = 2916; - public static final int GetOfferingInfoCsReq = 6929; - public static final int GetFriendChallengeLineupScRsp = 2946; - public static final int LeaveMapRotationRegionScRsp = 6827; - public static final int ContentPackageGetDataCsReq = 7495; - public static final int EvolveBuildStartStageScRsp = 7128; - public static final int SyncRogueHandbookDataUpdateScNotify = 5626; - public static final int SpaceZooOpCatteryScRsp = 6771; - public static final int SetPlayerInfoCsReq = 17; - public static final int StoryLineTrialAvatarChangeScNotify = 6230; - public static final int WolfBroGameUseBulletScRsp = 6547; - public static final int GetAssistHistoryCsReq = 2958; - public static final int FightSessionStopScNotify = 30030; - public static final int ShowNewSupplementVisitorScRsp = 3774; - public static final int ChessRogueConfirmRollCsReq = 5593; - public static final int PickRogueAvatarCsReq = 1821; - public static final int GetRogueInfoCsReq = 1861; - public static final int RestoreWolfBroGameArchiveScRsp = 6573; - public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4296; - public static final int TakeRogueAeonLevelRewardScRsp = 1825; - public static final int EvolveBuildShopAbilityDownScRsp = 7143; - public static final int RogueTournEnterCsReq = 6037; - public static final int SetGroupCustomSaveDataCsReq = 1416; - public static final int GetUpdatedArchiveDataScRsp = 2320; - public static final int AetherDivideSpiritExpUpScRsp = 4881; - public static final int MonopolyTakePhaseRewardCsReq = 7043; - public static final int MissionEventRewardScNotify = 1282; - public static final int RogueTournLeaveRogueCocoonSceneScRsp = 6056; - public static final int HeliobusInfoChangedScNotify = 5874; - public static final int UpdateMapRotationDataScNotify = 6882; - public static final int MonopolyReRollRandomCsReq = 7082; - public static final int FantasticStoryActivityBattleEndScNotify = 4973; - public static final int GetStuffScNotify = 4387; - public static final int TakePromotionRewardScRsp = 349; - public static final int GetFirstTalkNpcScRsp = 2173; - public static final int GetRogueTalentInfoCsReq = 1836; - public static final int MonopolyScrachRaffleTicketScRsp = 7025; - public static final int MonopolyGuessBuyInformationScRsp = 7040; - public static final int GameplayCounterRecoverCsReq = 1445; - public static final int StartWolfBroGameCsReq = 6561; - public static final int PromoteEquipmentCsReq = 591; - public static final int ChangeScriptEmotionCsReq = 6391; - public static final int GetRogueAdventureRoomInfoCsReq = 5694; - public static final int EnterSectionScRsp = 1401; - public static final int TakeAssistRewardCsReq = 2954; - public static final int GetLineupAvatarDataCsReq = 774; - public static final int GetChessRogueStoryInfoCsReq = 5542; - public static final int WolfBroGameExplodeMonsterScRsp = 6570; - public static final int MonopolyGetDailyInitItemCsReq = 7052; - public static final int RogueTournEnterRoomScRsp = 6099; - public static final int HeliobusUnlockSkillScNotify = 5896; - public static final int TakeTrialActivityRewardCsReq = 2624; - public static final int GetHeroBasicTypeInfoScRsp = 95; - public static final int RogueGetGambleInfoScRsp = 5635; - public static final int TakeRogueEndlessActivityPointRewardCsReq = 6002; - public static final int GetGunPlayDataScRsp = 4137; - public static final int RogueTournBattleFailSettleInfoScNotify = 6060; - public static final int QuitRogueScRsp = 1868; - public static final int SwitchAetherDivideLineUpSlotCsReq = 4870; - public static final int RogueTournLeaveScRsp = 6059; - public static final int GateServerScNotify = 65; - public static final int UnlockTutorialGuideCsReq = 1630; - public static final int MonopolyContentUpdateScNotify = 7033; - public static final int MuseumTargetRewardNotify = 4328; - public static final int PlayerLoginFinishCsReq = 86; - public static final int StartRaidCsReq = 2261; - public static final int GetPunkLordMonsterDataCsReq = 3261; - public static final int EnterSceneScRsp = 1478; - public static final int ChessRogueEnterNextLayerCsReq = 5429; - public static final int BatchMarkChatEmojiCsReq = 3947; - public static final int SceneGroupRefreshScNotify = 1463; - public static final int ReBattleAfterBattleLoseCsNotify = 147; - public static final int GetBasicInfoCsReq = 90; - public static final int RogueDoGambleScRsp = 5607; - public static final int ClockParkBattleEndScNotify = 7282; - public static final int TakeCityShopRewardCsReq = 1539; - public static final int LobbyKickOutCsReq = 7377; - public static final int MatchResultScNotify = 7324; - public static final int EnterFantasticStoryActivityStageScRsp = 4939; - public static final int FinishCurTurnScRsp = 4374; - public static final int SceneEnterStageScRsp = 1481; - public static final int GetRogueCollectionScRsp = 5625; - public static final int RogueEndlessActivityBattleEndScNotify = 6006; - public static final int GetFeverTimeActivityDataCsReq = 7155; - public static final int MonopolyGiveUpCurContentCsReq = 7012; - public static final int SceneCastSkillCostMpCsReq = 1494; - public static final int TakeOffAvatarSkinScRsp = 312; - public static final int AlleyShipmentEventEffectsScNotify = 4733; - public static final int ClockParkUnlockTalentCsReq = 7239; - public static final int GetChallengeScRsp = 1788; - public static final int RogueTournQueryScRsp = 6057; - public static final int MuseumDispatchFinishedScNotify = 4381; - public static final int GetGachaInfoScRsp = 1988; - public static final int GetExpeditionDataScRsp = 2588; - public static final int TextJoinSaveScRsp = 3888; - public static final int SelectChessRogueNousSubStoryScRsp = 5463; - public static final int InteractChargerScRsp = 6820; - public static final int ChessRogueEnterCsReq = 5557; - public static final int MultiplayerFightGameStartScNotify = 1030; - public static final int ExchangeRogueBuffWithMiracleCsReq = 5670; - public static final int HeliobusSnsCommentScRsp = 5827; - public static final int UpdateMovieRacingDataCsReq = 4109; - public static final int MonthCardRewardNotify = 44; - public static final int SelectPhoneThemeCsReq = 5173; - public static final int FinishTutorialGuideScRsp = 1674; - public static final int MonopolyTakeRaffleTicketRewardCsReq = 7079; - public static final int SetCurInteractEntityScRsp = 1455; - public static final int PunkLordMonsterKilledNotify = 3201; - public static final int TakeOffRelicScRsp = 370; - public static final int LobbySyncInfoScNotify = 7390; - public static final int MakeDrinkScRsp = 6983; - public static final int RogueTournEnablePermanentTalentScRsp = 6061; - public static final int GetMultipleDropInfoScRsp = 4688; - public static final int TakeApRewardCsReq = 3361; - public static final int GetUnlockTeleportScRsp = 1453; - public static final int MonopolyCellUpdateNotify = 7020; - public static final int StartMatchScRsp = 7317; - public static final int GetMissionDataScRsp = 1288; - public static final int StartAetherDivideSceneBattleScRsp = 4873; - public static final int ChessRogueReviveAvatarCsReq = 5570; - public static final int QuitWolfBroGameCsReq = 6530; - public static final int AcceptMultipleExpeditionCsReq = 2521; - public static final int LobbyGetInfoCsReq = 7364; - public static final int GetMainMissionCustomValueScRsp = 1295; - public static final int TextJoinQueryScRsp = 3820; - public static final int DressRelicAvatarScRsp = 382; - public static final int LeaveRaidCsReq = 2291; - public static final int HeliobusStartRaidCsReq = 5851; - public static final int MultiplayerFightGameStateCsReq = 1061; - public static final int SpringRecoverSingleAvatarScRsp = 1424; - public static final int DailyFirstMeetPamCsReq = 3491; - public static final int TakeMonsterResearchActivityRewardScRsp = 2651; - public static final int SetFriendMarkScRsp = 2918; - public static final int BatchGetQuestDataScRsp = 921; - public static final int FeverTimeActivityBattleEndScNotify = 7154; - public static final int MonopolyConditionUpdateScNotify = 7036; - public static final int SyncEntityBuffChangeListScNotify = 1447; - public static final int SetFriendRemarkNameCsReq = 2949; - public static final int FinishFirstTalkNpcCsReq = 2130; - public static final int DeleteSocialEventServerCacheCsReq = 7098; - public static final int ClockParkStartScriptScRsp = 7271; - public static final int HeliobusSnsLikeScRsp = 5871; - public static final int EnterRogueMapRoomCsReq = 1826; - public static final int MatchBoxingClubOpponentCsReq = 4291; - public static final int EnterTreasureDungeonCsReq = 4447; - public static final int GetFantasticStoryActivityDataCsReq = 4961; - public static final int SpaceZooDataCsReq = 6761; - public static final int TriggerVoiceScRsp = 4194; - public static final int PrepareRogueAdventureRoomCsReq = 5688; - public static final int TravelBrochureGetPasterScNotify = 6447; - public static final int AceAntiCheaterCsReq = 46; - public static final int GetRogueShopBuffInfoCsReq = 5673; - public static final int SetForbidOtherApplyFriendScRsp = 2966; - public static final int ExpUpEquipmentScRsp = 574; - public static final int SetDisplayAvatarScRsp = 2873; - public static final int RotateMapCsReq = 6830; - public static final int MonopolyEventSelectFriendCsReq = 7065; - public static final int HeartDialTraceScriptScRsp = 6362; - public static final int ChessRogueRollDiceCsReq = 5563; - public static final int GetTutorialGuideCsReq = 1691; - public static final int MultipleDropInfoScNotify = 4691; - public static final int TakeMultipleExpeditionRewardCsReq = 2503; - public static final int ChessRogueMoveCellNotify = 5582; - public static final int EvolveBuildGiveupCsReq = 7133; - public static final int DelMailCsReq = 839; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5594; - public static final int GetServerPrefsDataScRsp = 6120; - public static final int MonopolyBuyGoodsCsReq = 7049; - public static final int GetChatEmojiListScRsp = 3927; - public static final int SetAssistAvatarScRsp = 2847; - public static final int TakePunkLordPointRewardCsReq = 3247; - public static final int MonopolyClickMbtiReportScRsp = 7038; - public static final int FightMatch3ChatScRsp = 30127; - public static final int FinishEmotionDialoguePerformanceCsReq = 6330; - public static final int QuitBattleScRsp = 120; - public static final int EnterMapRotationRegionCsReq = 6861; - public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3787; - public static final int SelectChatBubbleCsReq = 5191; - public static final int MissionRewardScNotify = 1239; - public static final int MatchThreeSyncDataScNotify = 7424; - public static final int SyncRogueSeasonFinishScNotify = 1813; - public static final int MuseumTakeCollectRewardScRsp = 4333; - public static final int UnlockedAreaMapScNotify = 1459; - public static final int CancelCacheNotifyCsReq = 4187; - public static final int GetMuseumInfoScRsp = 4388; - public static final int PlayerLoginCsReq = 61; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5499; - public static final int GetFriendLoginInfoScRsp = 2948; - public static final int GetChapterCsReq = 439; - public static final int GetSaveLogisticsMapScRsp = 4732; - public static final int LobbyQuitCsReq = 7387; - public static final int RogueTournResetPermanentTalentCsReq = 6011; - public static final int GetTrialActivityDataCsReq = 2664; - public static final int GetTrainVisitorBehaviorCsReq = 3791; - public static final int FinishRogueCommonDialogueScRsp = 5610; - public static final int GetSpringRecoverDataCsReq = 1490; - public static final int SharePunkLordMonsterScRsp = 3273; - public static final int GetActivityScheduleConfigScRsp = 2673; - public static final int CommonRogueComponentUpdateScNotify = 5680; - public static final int RogueTournWeekChallengeUpdateScNotify = 6044; - public static final int GetFriendRecommendListInfoCsReq = 2970; - public static final int GetHeartDialInfoCsReq = 6361; - public static final int GetRogueHandbookDataScRsp = 5654; - public static final int HandleRogueCommonPendingActionScRsp = 5611; - public static final int ClockParkHandleWaitOperationCsReq = 7262; - public static final int UpdatePsnSettingsInfoCsReq = 63; - public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5577; - public static final int DiscardRelicScRsp = 540; - public static final int GetSceneMapInfoScRsp = 1469; - public static final int UpdatePlayerSettingScRsp = 14; - public static final int GetMailCsReq = 861; - public static final int FeatureSwitchClosedScNotify = 57; - public static final int TakeQuestRewardScRsp = 920; - public static final int MultiplayerGetFightGateCsReq = 1091; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3233; - public static final int AetherDivideSpiritInfoScNotify = 4812; - public static final int SaveLogisticsCsReq = 4737; - public static final int GetRndOptionScRsp = 3488; - public static final int FightLeaveScNotify = 30091; - public static final int SpaceZooBornScRsp = 6720; - public static final int HandleFriendCsReq = 2927; - public static final int RogueTournStartScRsp = 6040; - public static final int GetPlayerDetailInfoScRsp = 2920; - public static final int RevcMsgScNotify = 3991; - public static final int InterruptMissionEventCsReq = 1251; - public static final int TakeQuestOptionalRewardScRsp = 947; - public static final int LeaveTrialActivityCsReq = 2657; - public static final int WolfBroGamePickupBulletCsReq = 6594; - public static final int StaminaInfoScNotify = 53; - public static final int GetMissionStatusScRsp = 1249; - public static final int RogueTournEnterLayerScRsp = 6072; - public static final int SetAetherDivideLineUpScRsp = 4894; - public static final int ClearAetherDividePassiveSkillCsReq = 4882; - public static final int FinishTalkMissionScRsp = 1220; - public static final int GetPunkLordBattleRecordCsReq = 3255; - public static final int SelectRogueCommonDialogueOptionScRsp = 5634; - public static final int RogueTournGetAllArchiveScRsp = 6022; - public static final int SetClientPausedScRsp = 1500; - public static final int AetherDivideTakeChallengeRewardCsReq = 4813; - public static final int ChessRogueQuitScRsp = 5575; - public static final int FinishSectionIdCsReq = 2730; - public static final int TravelBrochureGetDataCsReq = 6461; - public static final int FinishPerformSectionIdCsReq = 2787; - public static final int VirtualLineupDestroyNotify = 751; - public static final int TakeRollShopRewardScRsp = 6914; - public static final int MonopolyRollDiceCsReq = 7073; - public static final int GetSingleRedDotParamGroupCsReq = 5939; - public static final int MarkItemScRsp = 513; - public static final int PlayerReturnSignScRsp = 4591; - public static final int ActivateFarmElementScRsp = 1466; - public static final int ReturnLastTownCsReq = 1449; - public static final int StartAlleyEventScRsp = 4771; - public static final int FinishTutorialScRsp = 1627; - public static final int PlayerLogoutScRsp = 20; - public static final int GetEnteredSceneCsReq = 1407; - public static final int LobbyJoinScRsp = 7363; - public static final int MonopolyUpgradeAssetCsReq = 7009; - public static final int StartChallengeCsReq = 1791; - public static final int GetMarkItemListScRsp = 595; - public static final int SetSpringRecoverConfigCsReq = 1476; - public static final int GetAllLineupDataScRsp = 749; - public static final int CancelMarkItemNotify = 585; - public static final int SetGameplayBirthdayCsReq = 64; - public static final int SyncRogueAreaUnlockScNotify = 1879; - public static final int DestroyItemCsReq = 532; - public static final int MultiplayerFightGiveUpScRsp = 1073; - public static final int GetChessRogueNousStoryInfoScRsp = 5444; - public static final int GetPunkLordDataScRsp = 3282; - public static final int ContentPackageUnlockScRsp = 7474; - public static final int GetDrinkMakerDataCsReq = 6989; - public static final int TakeFightActivityRewardScRsp = 3630; - public static final int SummonPunkLordMonsterCsReq = 3230; - public static final int StartAetherDivideStageBattleScRsp = 4851; - public static final int GetMonopolyMbtiReportRewardCsReq = 7045; - public static final int GetRecyleTimeScRsp = 501; - public static final int RogueTournSettleCsReq = 6030; - public static final int GetNpcTakenRewardCsReq = 2161; - public static final int ExchangeGachaCeilingScRsp = 1971; - public static final int GetGachaCeilingScRsp = 1973; - public static final int FinishChessRogueSubStoryCsReq = 5405; - public static final int TrialBackGroundMusicCsReq = 3130; - public static final int GetRecyleTimeCsReq = 528; - public static final int DailyFirstEnterMonopolyActivityScRsp = 7094; - public static final int AddEquipmentScNotify = 537; - public static final int ChessRogueSelectBpScRsp = 5415; - public static final int GetNpcMessageGroupScRsp = 2788; - public static final int MonopolySelectOptionCsReq = 7027; - public static final int GetKilledPunkLordMonsterDataCsReq = 3281; - public static final int OpenRogueChestScRsp = 1824; - public static final int GetVideoVersionKeyCsReq = 78; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4620; - public static final int GetAlleyInfoScRsp = 4788; - public static final int AddBlacklistScRsp = 2982; - public static final int MonopolyCheatDiceScRsp = 7001; - public static final int TextJoinBatchSaveScRsp = 3873; - public static final int ClearAetherDividePassiveSkillScRsp = 4803; - public static final int EndDrinkMakerSequenceCsReq = 6999; - public static final int TakeLoginActivityRewardCsReq = 2691; - public static final int GetStrongChallengeActivityDataScRsp = 6688; - public static final int DestroyItemScRsp = 555; - public static final int GetJukeboxDataCsReq = 3161; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1814; - public static final int EvolveBuildQueryInfoCsReq = 7145; + public static final int TakeAllRewardCsReq = 3041; + public static final int ChessRogueQueryAeonDimensionsCsReq = 5510; + public static final int PunkLordMonsterInfoScNotify = 3283; + public static final int ChessRogueStartScRsp = 5570; + public static final int GetRogueInfoScRsp = 1874; + public static final int RogueModifierSelectCellCsReq = 5337; + public static final int LogisticsGameScRsp = 4737; + public static final int GetAssistListCsReq = 2961; + public static final int EnterAdventureCsReq = 1318; + public static final int GetAetherDivideInfoScRsp = 4857; + public static final int GetCurAssistScRsp = 2913; + public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5608; + public static final int RankUpEquipmentScRsp = 564; + public static final int RogueTournExpNotify = 6030; + public static final int SellItemScRsp = 548; + public static final int ChallengeBossPhaseSettleNotify = 1724; + public static final int FinishChessRogueNousSubStoryScRsp = 5560; + public static final int StartStarFightLevelScRsp = 7170; + public static final int SelectChessRogueSubStoryScRsp = 5517; + public static final int FinishQuestScRsp = 989; + public static final int MarkRelicFilterPlanCsReq = 533; + public static final int RogueTournTakeExpRewardScRsp = 6081; + public static final int ChangeLineupLeaderScRsp = 783; + public static final int TakePictureCsReq = 4158; + public static final int GetBagScRsp = 574; + public static final int GetPunkLordMonsterDataScRsp = 3274; + public static final int SavePointsInfoNotify = 1409; + public static final int DeleteBlacklistCsReq = 2977; + public static final int SubmitEmotionItemCsReq = 6358; + public static final int StartWolfBroGameScRsp = 6574; + public static final int GetChallengeRaidInfoScRsp = 2228; + public static final int GetSocialEventServerCacheCsReq = 7094; + public static final int GetRogueScoreRewardInfoScRsp = 1885; + public static final int GetLoginChatInfoCsReq = 3983; + public static final int QuitLineupCsReq = 728; + public static final int GetAvatarDataCsReq = 318; + public static final int GetBoxingClubInfoScRsp = 4274; + public static final int StartAetherDivideSceneBattleCsReq = 4858; + public static final int SyncRogueCommonDialogueOptionFinishScNotify = 5676; + public static final int MonopolyEventLoadUpdateScNotify = 7093; + public static final int ChooseBoxingClubResonanceScRsp = 4257; + public static final int GetAetherDivideChallengeInfoCsReq = 4824; + public static final int GetMissionEventDataCsReq = 1283; + public static final int StopRogueAdventureRoomScRsp = 5624; + public static final int RelicAvatarRecommendCsReq = 512; + public static final int GetFriendChallengeDetailCsReq = 2910; + public static final int TakePrestigeRewardScRsp = 4757; + public static final int HeliobusChallengeUpdateScNotify = 5821; + public static final int EvolveBuildShopAbilityResetCsReq = 7117; + public static final int GetCurLineupDataScRsp = 737; + public static final int PrestigeLevelUpCsReq = 4773; + public static final int GetCurChallengeCsReq = 1764; + public static final int TakeOfferingRewardCsReq = 6923; + public static final int GetRaidInfoScRsp = 2257; + public static final int TravelBrochurePageUnlockScNotify = 6429; + public static final int SpaceZooDataScRsp = 6774; + public static final int PromoteAvatarScRsp = 341; + public static final int ChessRogueGiveUpRollScRsp = 5455; + public static final int MonopolyLikeScRsp = 7020; + public static final int SyncAcceptedPamMissionNotify = 4029; + public static final int TakeExpeditionRewardCsReq = 2528; + public static final int TakeMonsterResearchActivityRewardCsReq = 2673; + public static final int GetRogueAeonInfoScRsp = 1869; + public static final int StartPartialChallengeCsReq = 1740; + public static final int QuitTreasureDungeonScRsp = 4421; + public static final int EvolveBuildReRandomStageScRsp = 7103; + public static final int MonopolyGetDailyInitItemScRsp = 7060; + public static final int RogueModifierDelNotify = 5319; + public static final int LevelUpSpecialSkillTreeScRsp = 338; + public static final int GetRollShopInfoCsReq = 6914; + public static final int BatchGetQuestDataCsReq = 983; + public static final int MuseumRandomEventQueryScRsp = 4373; + public static final int SearchPlayerScRsp = 2947; + public static final int TeleportToMissionResetPointScRsp = 1247; + public static final int GetCurSceneInfoCsReq = 1428; + public static final int RogueWorkbenchHandleFuncScRsp = 5651; + public static final int GetAllServerPrefsDataCsReq = 6118; + public static final int SyncRogueVirtualItemInfoScNotify = 1863; + public static final int GetRogueTalentInfoScRsp = 1866; + public static final int QuitWolfBroGameScRsp = 6541; + public static final int GetWolfBroGameDataScRsp = 6564; + public static final int ChessRogueUpdateDiceInfoScNotify = 5447; + public static final int MonopolyRollRandomCsReq = 7083; + public static final int ChangeStoryLineFinishScNotify = 6249; + public static final int LobbyBeginScRsp = 7370; + public static final int GetChallengeGroupStatisticsScRsp = 1762; + public static final int ChessRogueEnterCellCsReq = 5493; + public static final int GetSaveRaidCsReq = 2283; + public static final int RogueGetGambleInfoCsReq = 5630; + public static final int ChallengeSettleNotify = 1728; + public static final int ClockParkQuitScriptScRsp = 7298; + public static final int ReviveRogueAvatarScRsp = 1848; + public static final int RemoveStuffFromAreaCsReq = 4328; + public static final int SetAssistCsReq = 2982; + public static final int ContentPackageGetDataCsReq = 7519; + public static final int EvolveBuildStartStageScRsp = 7120; + public static final int SpaceZooOpCatteryScRsp = 6741; + public static final int SetPlayerInfoCsReq = 23; + public static final int WolfBroGameUseBulletScRsp = 6546; + public static final int FightSessionStopScNotify = 30028; + public static final int ShowNewSupplementVisitorScRsp = 3757; + public static final int ChessRogueConfirmRollCsReq = 5415; + public static final int PickRogueAvatarCsReq = 1822; + public static final int GetRogueInfoCsReq = 1818; + public static final int RestoreWolfBroGameArchiveScRsp = 6549; + public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4283; + public static final int EvolveBuildShopAbilityDownScRsp = 7116; + public static final int SetGroupCustomSaveDataCsReq = 1490; + public static final int GetUpdatedArchiveDataScRsp = 2337; + public static final int HeliobusInfoChangedScNotify = 5857; + public static final int MonopolyReRollRandomCsReq = 7091; + public static final int GetStuffScNotify = 4319; + public static final int TakePromotionRewardScRsp = 373; + public static final int GetFirstTalkNpcScRsp = 2149; + public static final int SwordTrainingRestoreGameCsReq = 7476; + public static final int GameplayCounterRecoverCsReq = 1426; + public static final int StartWolfBroGameCsReq = 6518; + public static final int PromoteEquipmentCsReq = 529; + public static final int EnterSectionScRsp = 1447; + public static final int GetChessRogueStoryInfoCsReq = 5482; + public static final int MonopolyGetDailyInitItemCsReq = 7044; + public static final int RogueGetGambleInfoScRsp = 5652; + public static final int RogueTournBattleFailSettleInfoScNotify = 6027; + public static final int QuitRogueScRsp = 1802; + public static final int UnlockTutorialGuideCsReq = 1628; + public static final int MonopolyContentUpdateScNotify = 7061; + public static final int SwordTrainingRefreshPartnerAbilityScRsp = 7451; + public static final int PlayerLoginFinishCsReq = 76; + public static final int ChessRogueEnterNextLayerCsReq = 5473; + public static final int BatchMarkChatEmojiCsReq = 3946; + public static final int SceneGroupRefreshScNotify = 1405; + public static final int ReBattleAfterBattleLoseCsNotify = 146; + public static final int RogueDoGambleScRsp = 5669; + public static final int TakeCityShopRewardCsReq = 1558; + public static final int LobbyKickOutCsReq = 7359; + public static final int MatchResultScNotify = 7337; + public static final int FinishCurTurnScRsp = 4357; + public static final int GetRogueCollectionScRsp = 5671; + public static final int RogueWorkbenchGetInfoCsReq = 5601; + public static final int GetFeverTimeActivityDataCsReq = 7160; + public static final int MonopolyGiveUpCurContentCsReq = 7077; + public static final int SceneCastSkillCostMpCsReq = 1498; + public static final int TakeOffAvatarSkinScRsp = 377; + public static final int AlleyShipmentEventEffectsScNotify = 4761; + public static final int ClockParkUnlockTalentCsReq = 7258; + public static final int GetChallengeScRsp = 1774; + public static final int MuseumDispatchFinishedScNotify = 4321; + public static final int GetGachaInfoScRsp = 1974; + public static final int TextJoinSaveScRsp = 3874; + public static final int InteractChargerScRsp = 6837; + public static final int ChessRogueEnterCsReq = 5521; + public static final int MultiplayerFightGameStartScNotify = 1028; + public static final int ExchangeRogueBuffWithMiracleCsReq = 5640; + public static final int HeliobusSnsCommentScRsp = 5864; + public static final int SelectPhoneThemeCsReq = 5149; + public static final int SetCurInteractEntityScRsp = 1459; + public static final int LobbySyncInfoScNotify = 7351; + public static final int MakeDrinkScRsp = 6985; + public static final int TakeApRewardCsReq = 3318; + public static final int MonopolyCellUpdateNotify = 7037; + public static final int StartMatchScRsp = 7329; + public static final int GetMissionDataScRsp = 1274; + public static final int StartAetherDivideSceneBattleScRsp = 4849; + public static final int QuitWolfBroGameCsReq = 6528; + public static final int AcceptMultipleExpeditionCsReq = 2522; + public static final int GetMainMissionCustomValueScRsp = 1213; + public static final int TextJoinQueryScRsp = 3837; + public static final int SpringRecoverSingleAvatarScRsp = 1468; + public static final int BatchGetQuestDataScRsp = 922; + public static final int SyncEntityBuffChangeListScNotify = 1446; + public static final int FinishFirstTalkNpcCsReq = 2128; + public static final int ClockParkStartScriptScRsp = 7241; + public static final int HeliobusSnsLikeScRsp = 5841; + public static final int EnterRogueMapRoomCsReq = 1880; + public static final int MatchBoxingClubOpponentCsReq = 4229; + public static final int GetFantasticStoryActivityDataCsReq = 4918; + public static final int SpaceZooDataCsReq = 6718; + public static final int TriggerVoiceScRsp = 4198; + public static final int PrepareRogueAdventureRoomCsReq = 5674; + public static final int AceAntiCheaterCsReq = 100; + public static final int GetRogueShopBuffInfoCsReq = 5649; + public static final int SetForbidOtherApplyFriendScRsp = 2912; + public static final int ExpUpEquipmentScRsp = 557; + public static final int SetDisplayAvatarScRsp = 2849; + public static final int ChessRogueRollDiceCsReq = 5450; + public static final int GetTutorialGuideCsReq = 1629; + public static final int MultipleDropInfoScNotify = 4629; + public static final int TakeMultipleExpeditionRewardCsReq = 2562; + public static final int ChessRogueMoveCellNotify = 5536; + public static final int EvolveBuildGiveupCsReq = 7112; + public static final int DelMailCsReq = 858; + public static final int GetServerPrefsDataScRsp = 6137; + public static final int TakePunkLordPointRewardCsReq = 3246; + public static final int QuitBattleScRsp = 137; + public static final int EnterMapRotationRegionCsReq = 6818; + public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3719; + public static final int SwordTrainingFinishEndingHintScRsp = 7492; + public static final int MuseumTakeCollectRewardScRsp = 4361; + public static final int PlayerLoginCsReq = 18; + public static final int GetFriendLoginInfoScRsp = 2975; + public static final int GetChapterCsReq = 458; + public static final int LobbyQuitCsReq = 7391; + public static final int RogueTournResetPermanentTalentCsReq = 6066; + public static final int GetTrialActivityDataCsReq = 2636; + public static final int GetTrainVisitorBehaviorCsReq = 3729; + public static final int FinishRogueCommonDialogueScRsp = 5678; + public static final int GetSpringRecoverDataCsReq = 1442; + public static final int GetActivityScheduleConfigScRsp = 2649; + public static final int CommonRogueComponentUpdateScNotify = 5625; + public static final int GetHeartDialInfoCsReq = 6318; + public static final int GetRogueHandbookDataScRsp = 5670; + public static final int GetRelicFilterPlanScRsp = 516; + public static final int HandleRogueCommonPendingActionScRsp = 5610; + public static final int ClockParkHandleWaitOperationCsReq = 7289; + public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5571; + public static final int DiscardRelicScRsp = 514; + public static final int FeatureSwitchClosedScNotify = 3; + public static final int TakeQuestRewardScRsp = 937; + public static final int MultiplayerGetFightGateCsReq = 1029; + public static final int TakeKilledPunkLordMonsterScoreCsReq = 3261; + public static final int AetherDivideSpiritInfoScNotify = 4877; + public static final int GetRndOptionScRsp = 3474; + public static final int FightLeaveScNotify = 30029; + public static final int RevcMsgScNotify = 3929; + public static final int WolfBroGamePickupBulletCsReq = 6598; + public static final int GetMissionStatusScRsp = 1273; + public static final int SetAetherDivideLineUpScRsp = 4898; + public static final int GetPunkLordBattleRecordCsReq = 3259; + public static final int SelectRogueCommonDialogueOptionScRsp = 5632; + public static final int ChessRogueQuitScRsp = 5588; + public static final int SwordTrainingTurnActionScRsp = 7487; + public static final int FinishPerformSectionIdCsReq = 2719; + public static final int GetSingleRedDotParamGroupCsReq = 5958; + public static final int GetSummonActivityDataScRsp = 7565; + public static final int PlayerReturnSignScRsp = 4529; + public static final int ActivateFarmElementScRsp = 1412; + public static final int ReturnLastTownCsReq = 1473; + public static final int StartAlleyEventScRsp = 4741; + public static final int PlayerLogoutScRsp = 37; + public static final int GetEnteredSceneCsReq = 1469; + public static final int LobbyJoinScRsp = 7395; + public static final int MonopolyUpgradeAssetCsReq = 7011; + public static final int SetSpringRecoverConfigCsReq = 1416; + public static final int GetAllLineupDataScRsp = 773; + public static final int CancelMarkItemNotify = 506; + public static final int DestroyItemCsReq = 582; + public static final int MultiplayerFightGiveUpScRsp = 1049; + public static final int GetChessRogueNousStoryInfoScRsp = 5466; + public static final int GetDrinkMakerDataCsReq = 6994; + public static final int TakeFightActivityRewardScRsp = 3628; + public static final int SwordTrainingGiveUpGameCsReq = 7467; + public static final int GetRecyleTimeScRsp = 547; + public static final int FinishChessRogueSubStoryCsReq = 5411; + public static final int SwordTrainingStoryConfirmCsReq = 7498; + public static final int DailyFirstEnterMonopolyActivityScRsp = 7098; + public static final int AddEquipmentScNotify = 524; + public static final int GetNpcMessageGroupScRsp = 2774; + public static final int MonopolySelectOptionCsReq = 7064; + public static final int GetKilledPunkLordMonsterDataCsReq = 3221; + public static final int GetVideoVersionKeyCsReq = 1; + public static final int AddBlacklistScRsp = 2991; + public static final int MonopolyCheatDiceScRsp = 7047; + public static final int EndDrinkMakerSequenceCsReq = 6983; + public static final int TakeLoginActivityRewardCsReq = 2629; + public static final int DestroyItemScRsp = 559; + public static final int SyncRogueAeonLevelUpRewardScNotify = 1865; + public static final int EvolveBuildQueryInfoCsReq = 7119; public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6009; - public static final int SyncTaskCsReq = 1273; - public static final int SyncChessRogueNousMainStoryScNotify = 5537; - public static final int UpdateRogueAdventureRoomScoreCsReq = 5666; - public static final int FinishItemIdScRsp = 2773; - public static final int MuseumRandomEventSelectScRsp = 4309; - public static final int RogueTournEnterRogueCocoonSceneCsReq = 6092; - public static final int ExpUpRelicCsReq = 596; - public static final int RogueTournGetArchiveRepositoryScRsp = 6036; - public static final int GetSceneMapInfoCsReq = 1484; - public static final int UpdatePsnSettingsInfoScRsp = 45; - public static final int SpaceZooMutateScRsp = 6773; - public static final int ComposeItemScRsp = 594; - public static final int EnterChessRogueAeonRoomScRsp = 5494; - public static final int PlayerLoginScRsp = 88; - public static final int MonopolyGameGachaScRsp = 7095; - public static final int RogueTournGetSettleInfoCsReq = 6034; - public static final int GetMapRotationDataScRsp = 6874; - public static final int GameplayCounterCountDownCsReq = 1443; - public static final int ChessRogueLayerAccountInfoNotify = 5492; + public static final int MuseumRandomEventSelectScRsp = 4311; + public static final int RogueTournEnterRogueCocoonSceneCsReq = 6024; + public static final int ExpUpRelicCsReq = 583; + public static final int GetSceneMapInfoCsReq = 1451; + public static final int ComposeItemScRsp = 598; + public static final int RogueTournGetSettleInfoCsReq = 6044; + public static final int GetMapRotationDataScRsp = 6857; + public static final int GameplayCounterCountDownCsReq = 1499; public static final int DrinkMakerUpdateTipsNotify = 6990; - public static final int FightHeartBeatCsReq = 30039; - public static final int GetStageLineupCsReq = 761; - public static final int AlleyFundsScNotify = 4709; - public static final int EnterStrongChallengeActivityStageCsReq = 6691; - public static final int GetChapterScRsp = 473; - public static final int MuseumFundsChangedScNotify = 4303; - public static final int EnhanceCommonRogueBuffScRsp = 5681; - public static final int ReEnterLastElementStageCsReq = 1489; - public static final int TakeRogueEventHandbookRewardScRsp = 5640; - public static final int ChessRogueUpdateActionPointScNotify = 5419; - public static final int UpgradeAreaStatScRsp = 4321; - public static final int UnlockTutorialCsReq = 1639; - public static final int GetLevelRewardScRsp = 12; - public static final int AvatarExpUpScRsp = 320; - public static final int MuseumTargetStartNotify = 4312; - public static final int AlleyEventChangeNotify = 4787; - public static final int TakeQuestOptionalRewardCsReq = 974; - public static final int GetWaypointScRsp = 488; - public static final int GetMailScRsp = 888; - public static final int GetReplayTokenScRsp = 3588; - public static final int StartBoxingClubBattleCsReq = 4239; - public static final int GetRogueCommonDialogueDataScRsp = 5665; - public static final int ClockParkGetInfoScRsp = 7288; - public static final int UpdateServerPrefsDataScRsp = 6173; - public static final int TakeChallengeRaidRewardCsReq = 2271; - public static final int SceneEntityMoveCsReq = 1461; - public static final int GetChatFriendHistoryScRsp = 3971; - public static final int TakePunkLordPointRewardScRsp = 3294; - public static final int ClockParkUseBuffCsReq = 7270; - public static final int MonopolyBuyGoodsScRsp = 7051; - public static final int GetMuseumInfoCsReq = 4361; - public static final int SetTurnFoodSwitchCsReq = 526; - public static final int BattleCollegeDataChangeScNotify = 5791; - public static final int SetAssistAvatarCsReq = 2874; - public static final int GetMonsterResearchActivityDataCsReq = 2682; - public static final int SetGenderCsReq = 54; - public static final int EnterAdventureScRsp = 1388; - public static final int RogueTournTakeExpRewardCsReq = 6078; - public static final int LogisticsGameCsReq = 4791; - public static final int GetChatEmojiListCsReq = 3987; - public static final int ClockParkGetOngoingScriptInfoScRsp = 7227; - public static final int DressAvatarSkinScRsp = 309; - public static final int FightMatch3ChatCsReq = 30187; - public static final int GetAssistListScRsp = 2950; - public static final int AetherDivideTakeChallengeRewardScRsp = 4885; - public static final int SetClientRaidTargetCountCsReq = 2247; - public static final int EnterMapRotationRegionScRsp = 6888; - public static final int StartStarFightLevelCsReq = 7164; - public static final int GetMissionStatusCsReq = 1256; - public static final int RogueNpcDisappearCsReq = 5674; - public static final int GetMovieRacingDataCsReq = 4149; - public static final int GetNpcStatusCsReq = 2791; - public static final int MonopolyClickMbtiReportCsReq = 7075; - public static final int GetTrainVisitorRegisterScRsp = 3771; - public static final int ChessRoguePickAvatarCsReq = 5558; - public static final int ChessRogueNousEnableRogueTalentCsReq = 5457; - public static final int GetBattleCollegeDataCsReq = 5761; - public static final int InteractTreasureDungeonGridCsReq = 4470; - public static final int SetSignatureScRsp = 2862; - public static final int SyncServerSceneChangeNotify = 1425; - public static final int EquipAetherDividePassiveSkillScRsp = 4821; - public static final int SelectChessRogueSubStoryCsReq = 5491; - public static final int GetChallengeRaidInfoCsReq = 2273; - public static final int UnlockChatBubbleScNotify = 5139; - public static final int HealPoolInfoNotify = 1411; - public static final int SetForbidOtherApplyFriendCsReq = 2905; - public static final int GetStarFightDataScRsp = 7161; - public static final int RogueTournGetCurRogueCocoonInfoScRsp = 6021; - public static final int ReEnterLastElementStageScRsp = 1410; - public static final int MatchThreeLevelEndScRsp = 7413; - public static final int InterruptMissionEventScRsp = 1209; - public static final int GetPlatformPlayerInfoCsReq = 3000; - public static final int GetAetherDivideInfoCsReq = 4862; - public static final int RefreshTriggerByClientScRsp = 1475; - public static final int RemoveRotaterScRsp = 6870; - public static final int ClientObjUploadScRsp = 29; - public static final int AvatarExpUpCsReq = 391; - public static final int GetArchiveDataCsReq = 2361; - public static final int RogueTournReviveAvatarCsReq = 6038; - public static final int GetPlayerDetailInfoCsReq = 2991; - public static final int GetShopListCsReq = 1561; - public static final int CancelExpeditionScRsp = 2573; - public static final int LockRelicScRsp = 503; - public static final int GetPrivateChatHistoryScRsp = 3973; - public static final int MonopolyEventSelectFriendScRsp = 7057; - public static final int StartPunkLordRaidScRsp = 3220; - public static final int SceneCastSkillCsReq = 1439; - public static final int ChessRogueStartCsReq = 5452; - public static final int EnterRogueMapRoomScRsp = 1817; - public static final int EvolveBuildCoinNotify = 7136; - public static final int SaveLogisticsScRsp = 4728; - public static final int SyncRogueCommonActionResultScNotify = 5648; - public static final int EvolveBuildStartLevelScRsp = 7113; - public static final int DiscardRelicCsReq = 593; - public static final int AcceptedPamMissionExpireCsReq = 4061; - public static final int StartMatchCsReq = 7345; - public static final int GetNpcMessageGroupCsReq = 2761; - public static final int HeliobusSnsReadScRsp = 5820; - public static final int SpringRecoverSingleAvatarCsReq = 1444; - public static final int MuseumTargetMissionFinishNotify = 4337; - public static final int RogueTournRevivieCostUpdateScNotify = 6097; - public static final int RogueTournResetPermanentTalentScRsp = 6050; - public static final int QuitTreasureDungeonCsReq = 4409; - public static final int GetBagCsReq = 561; - public static final int TakePictureScRsp = 4173; - public static final int SetRedPointStatusScNotify = 79; - public static final int FinishChessRogueNousSubStoryCsReq = 5535; - public static final int FightMatch3TurnStartScNotify = 30120; - public static final int LobbyCreateScRsp = 7367; - public static final int GetLoginActivityScRsp = 2688; - public static final int RaidCollectionDataCsReq = 6949; - public static final int DressAvatarScRsp = 327; - public static final int ChessRogueQueryCsReq = 5517; - public static final int TeleportToMissionResetPointCsReq = 1228; - public static final int UpgradeAreaCsReq = 4347; - public static final int ChessRogueNousEditDiceScRsp = 5550; - public static final int FightHeartBeatScRsp = 30073; - public static final int DailyActiveInfoNotify = 3339; - public static final int FightMatch3ChatScNotify = 30162; - public static final int ExchangeGachaCeilingCsReq = 1930; - public static final int SceneCastSkillMpUpdateScNotify = 1421; - public static final int GetRollShopInfoScRsp = 6902; - public static final int AetherDivideSkillItemScNotify = 4850; - public static final int RaidKickByServerScNotify = 2256; - public static final int GetFriendAssistListCsReq = 2976; - public static final int TravelBrochureSetCustomValueCsReq = 6496; - public static final int DelMailScRsp = 873; - public static final int MonopolyUpgradeAssetScRsp = 7081; - public static final int ChessRogueSkipTeachingLevelCsReq = 5440; - public static final int SubmitOrigamiItemScRsp = 4121; - public static final int ContentPackageUnlockCsReq = 7463; - public static final int GetGachaCeilingCsReq = 1939; - public static final int GetRogueCollectionCsReq = 5669; - public static final int SyncClientResVersionScRsp = 171; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2147; - public static final int RogueDoGambleCsReq = 5699; - public static final int StartCocoonStageCsReq = 1413; - public static final int DeleteFriendCsReq = 2947; - public static final int PlayBackGroundMusicScRsp = 3120; - public static final int ResetMapRotationRegionCsReq = 6847; - public static final int RogueTournGetMiscRealTimeDataCsReq = 6076; - public static final int GetRogueExhibitionCsReq = 5606; - public static final int ChessRogueEnterCellScRsp = 5562; - public static final int EvolveBuildShopAbilityUpScRsp = 7114; - public static final int MuseumInfoChangedScNotify = 4382; - public static final int MakeDrinkCsReq = 6987; - public static final int StartBattleCollegeCsReq = 5720; - public static final int GetCurChallengeScRsp = 1762; - public static final int TravelBrochureApplyPasterCsReq = 6430; - public static final int GetTreasureDungeonActivityDataCsReq = 4462; - public static final int MonopolyGuessChooseCsReq = 7017; - public static final int AcceptMultipleExpeditionScRsp = 2582; - public static final int GetMainMissionCustomValueCsReq = 1268; - public static final int FinishCosumeItemMissionScRsp = 1294; - public static final int MonopolySelectOptionScRsp = 7062; - public static final int PlayerReturnInfoQueryCsReq = 4587; - public static final int GetPhoneDataScRsp = 5188; - public static final int FightMatch3StartCountDownScNotify = 30191; - public static final int GetLevelRewardCsReq = 81; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5465; - public static final int UpgradeAreaStatCsReq = 4396; - public static final int EnhanceRogueBuffCsReq = 1812; - public static final int TakeApRewardScRsp = 3388; - public static final int GetRogueCommonDialogueDataCsReq = 5616; - public static final int ChessRogueQueryBpScRsp = 5423; - public static final int GetNpcTakenRewardScRsp = 2188; - public static final int RogueWorkbenchHandleFuncCsReq = 5679; - public static final int GetShareDataCsReq = 4191; - public static final int SelectRogueCommonDialogueOptionCsReq = 5657; - public static final int TakeMailAttachmentCsReq = 830; - public static final int EnterTelevisionActivityStageCsReq = 6963; - public static final int MonopolyGameSettleScNotify = 7055; - public static final int HandleFriendScRsp = 2962; - public static final int AetherDivideRefreshEndlessScNotify = 4858; - public static final int SearchPlayerCsReq = 2928; - public static final int MonopolyActionResultScNotify = 7091; - public static final int HeliobusSelectSkillScRsp = 5882; - public static final int MonopolyGuessBuyInformationCsReq = 7093; - public static final int EnterSectionCsReq = 1428; - public static final int EnterChessRogueAeonRoomCsReq = 5433; - public static final int EvolveBuildLeaveCsReq = 7127; - public static final int QuitLineupScRsp = 771; - public static final int DeleteBlacklistScRsp = 2937; - public static final int EnterFightActivityStageCsReq = 3620; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3250; - public static final int ComposeLimitNumCompleteNotify = 533; - public static final int MultiplayerMatch3FinishScNotify = 1087; - public static final int SpaceZooBornCsReq = 6791; - public static final int GetJukeboxDataScRsp = 3188; - public static final int SetNicknameScRsp = 49; - public static final int TakeRogueMiracleHandbookRewardCsReq = 5617; - public static final int RogueTournDeleteArchiveCsReq = 6086; - public static final int GameplayCounterRecoverScRsp = 1415; - public static final int EvolveBuildFinishScNotify = 7140; - public static final int GetSpringRecoverDataScRsp = 1418; - public static final int TakeExpeditionRewardScRsp = 2571; - public static final int GetVideoVersionKeyScRsp = 83; - public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6010; - public static final int SyncTurnFoodNotify = 554; - public static final int FinishTalkMissionCsReq = 1291; - public static final int RefreshAlleyOrderCsReq = 4782; - public static final int SetRogueCollectionScRsp = 5653; - public static final int PlayerReturnTakePointRewardScRsp = 4573; - public static final int FightEnterCsReq = 30061; - public static final int FinishSectionIdScRsp = 2771; - public static final int RogueTournSettleScRsp = 6043; - public static final int SpaceZooDeleteCatCsReq = 6787; - public static final int GetFarmStageGachaInfoScRsp = 1320; - public static final int JoinLineupScRsp = 773; - public static final int GetCurBattleInfoCsReq = 139; - public static final int DeployRotaterScRsp = 6873; - public static final int ChooseBoxingClubResonanceCsReq = 4262; - public static final int SetHeroBasicTypeScRsp = 55; - public static final int GetKilledPunkLordMonsterDataScRsp = 3212; - public static final int ChallengeRaidNotify = 2227; - public static final int AddBlacklistCsReq = 2921; - public static final int GetRogueAeonInfoCsReq = 1899; - public static final int AcceptExpeditionScRsp = 2520; - public static final int FightActivityDataChangeScNotify = 3691; - public static final int TrialBackGroundMusicScRsp = 3171; - public static final int OpenRogueChestCsReq = 1844; - public static final int QuitRogueCsReq = 1855; - public static final int ComposeSelectedRelicScRsp = 512; - public static final int GetLineupAvatarDataScRsp = 747; - public static final int MonopolyConfirmRandomCsReq = 7070; - public static final int ChessRogueSelectCellCsReq = 5591; - public static final int AcceptMissionEventCsReq = 1203; - public static final int PunkLordRaidTimeOutScNotify = 3270; - public static final int EnableRogueTalentScRsp = 1877; - public static final int TakeAssistRewardScRsp = 2926; - public static final int GetSocialEventServerCacheScRsp = 7010; - public static final int GetChessRogueNousStoryInfoCsReq = 5431; - public static final int DrinkMakerChallengeScRsp = 6996; - public static final int SpaceZooOpCatteryCsReq = 6730; - public static final int AlleyGuaranteedFundsScRsp = 4795; - public static final int MarkReadMailCsReq = 891; - public static final int GetRogueShopMiracleInfoScRsp = 5639; - public static final int GetRogueBuffEnhanceInfoCsReq = 1809; - public static final int SelectInclinationTextCsReq = 2187; - public static final int GetOfferingInfoScRsp = 6922; - public static final int ContentPackageGetDataScRsp = 7467; - public static final int PunkLordBattleResultScNotify = 3209; - public static final int BuyBpLevelCsReq = 3073; - public static final int SetAssistScRsp = 2955; - public static final int PlayerReturnPointChangeScNotify = 4520; - public static final int FightMatch3SwapCsReq = 30173; - public static final int UpdateEnergyScNotify = 6821; - public static final int TravelBrochureApplyPasterListScRsp = 6451; - public static final int SetPlayerInfoScRsp = 100; - public static final int SetIsDisplayAvatarInfoCsReq = 2830; - public static final int EnterAetherDivideSceneScRsp = 4888; - public static final int CommonRogueQueryCsReq = 5644; - public static final int EvolveBuildShopAbilityDownCsReq = 7148; - public static final int SwapLineupCsReq = 787; - public static final int ChessRogueLeaveCsReq = 5545; - public static final int PlayerReturnForceFinishScNotify = 4562; - public static final int DoGachaCsReq = 1991; - public static final int SpringRecoverScRsp = 1446; - public static final int ChessRogueConfirmRollScRsp = 5555; - public static final int ReplaceLineupScRsp = 781; - public static final int LobbyBeginCsReq = 7374; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2656; - public static final int BatchMarkChatEmojiScRsp = 3994; - public static final int TravelBrochurePageResetScRsp = 6456; - public static final int LogisticsDetonateStarSkiffCsReq = 4785; - public static final int GetFriendChallengeLineupCsReq = 2908; + public static final int FightHeartBeatCsReq = 30058; + public static final int GetChapterScRsp = 449; + public static final int MuseumFundsChangedScNotify = 4362; + public static final int ReEnterLastElementStageCsReq = 1494; + public static final int UnlockTutorialCsReq = 1658; + public static final int GetLevelRewardScRsp = 77; + public static final int AvatarExpUpScRsp = 337; + public static final int MuseumTargetStartNotify = 4377; + public static final int GetReplayTokenScRsp = 3574; + public static final int GetRogueCommonDialogueDataScRsp = 5667; + public static final int ClockParkGetInfoScRsp = 7274; + public static final int GetChatFriendHistoryScRsp = 3941; + public static final int MonopolyBuyGoodsScRsp = 7008; + public static final int GetMuseumInfoCsReq = 4318; + public static final int SetTurnFoodSwitchCsReq = 580; + public static final int BattleCollegeDataChangeScNotify = 5729; + public static final int SetAssistAvatarCsReq = 2857; + public static final int EnterAdventureScRsp = 1374; + public static final int RogueTournTakeExpRewardCsReq = 6016; + public static final int LogisticsGameCsReq = 4729; + public static final int GetChatEmojiListCsReq = 3919; + public static final int ClockParkGetOngoingScriptInfoScRsp = 7264; + public static final int DressAvatarSkinScRsp = 311; + public static final int GetAssistListScRsp = 2938; + public static final int AetherDivideTakeChallengeRewardScRsp = 4806; + public static final int SetClientRaidTargetCountCsReq = 2246; + public static final int StartStarFightLevelCsReq = 7167; + public static final int GetMovieRacingDataCsReq = 4173; + public static final int MonopolyClickMbtiReportCsReq = 7066; + public static final int GetTrainVisitorRegisterScRsp = 3741; + public static final int ChessRoguePickAvatarCsReq = 5495; + public static final int ChessRogueNousEnableRogueTalentCsReq = 5531; + public static final int GetBattleCollegeDataCsReq = 5718; + public static final int InteractTreasureDungeonGridCsReq = 4440; + public static final int SetSignatureScRsp = 2889; + public static final int EquipAetherDividePassiveSkillScRsp = 4822; + public static final int GetChallengeRaidInfoCsReq = 2249; + public static final int SetForbidOtherApplyFriendCsReq = 2953; + public static final int GetStarFightDataScRsp = 7165; + public static final int RogueTournGetCurRogueCocoonInfoScRsp = 6061; + public static final int InterruptMissionEventScRsp = 1211; + public static final int GetPlatformPlayerInfoCsReq = 2987; + public static final int RefreshTriggerByClientScRsp = 1466; + public static final int RemoveRotaterScRsp = 6840; + public static final int ClientObjUploadScRsp = 93; + public static final int GetArchiveDataCsReq = 2318; + public static final int RogueTournReviveAvatarCsReq = 6083; + public static final int GetPlayerDetailInfoCsReq = 2929; + public static final int GetShopListCsReq = 1518; + public static final int SwordTrainingExamResultConfirmScRsp = 7480; + public static final int EvolveBuildCoinNotify = 7139; + public static final int SaveLogisticsScRsp = 4792; + public static final int EvolveBuildStartLevelScRsp = 7145; + public static final int MuseumTargetMissionFinishNotify = 4324; + public static final int TakePictureScRsp = 4149; + public static final int SetRedPointStatusScNotify = 17; + public static final int FightMatch3TurnStartScNotify = 30137; + public static final int LobbyCreateScRsp = 7379; + public static final int GetLoginActivityScRsp = 2674; + public static final int DressAvatarScRsp = 364; + public static final int UpgradeAreaCsReq = 4346; + public static final int DailyActiveInfoNotify = 3358; + public static final int FightMatch3ChatScNotify = 30189; + public static final int ExchangeGachaCeilingCsReq = 1928; + public static final int ChessRogueSkipTeachingLevelCsReq = 5519; + public static final int RogueTournReviveCostUpdateScNotify = 6011; + public static final int SubmitOrigamiItemScRsp = 4122; + public static final int ContentPackageUnlockCsReq = 7545; + public static final int GetGachaCeilingCsReq = 1958; + public static final int SyncClientResVersionScRsp = 141; + public static final int RogueDoGambleCsReq = 5635; + public static final int PlayBackGroundMusicScRsp = 3137; + public static final int ResetMapRotationRegionCsReq = 6846; + public static final int RogueTournGetMiscRealTimeDataCsReq = 6084; + public static final int EvolveBuildShopAbilityUpScRsp = 7131; + public static final int MuseumInfoChangedScNotify = 4391; + public static final int StartBattleCollegeCsReq = 5737; + public static final int GetCurChallengeScRsp = 1789; + public static final int GetTreasureDungeonActivityDataCsReq = 4489; + public static final int GetMainMissionCustomValueCsReq = 1202; + public static final int FinishCosumeItemMissionScRsp = 1298; + public static final int GetPhoneDataScRsp = 5174; + public static final int FightMatch3StartCountDownScNotify = 30129; + public static final int UpgradeAreaStatCsReq = 4383; + public static final int EnhanceRogueBuffCsReq = 1877; + public static final int GetNpcTakenRewardScRsp = 2174; + public static final int MonopolyGameSettleScNotify = 7059; + public static final int HandleFriendScRsp = 2989; + public static final int SearchPlayerCsReq = 2992; + public static final int SwordTrainingLearnSkillCsReq = 7463; + public static final int EnterChessRogueAeonRoomCsReq = 5452; + public static final int EvolveBuildLeaveCsReq = 7109; + public static final int QuitLineupScRsp = 741; + public static final int EnterFightActivityStageCsReq = 3637; + public static final int MultiplayerMatch3FinishScNotify = 1019; + public static final int SpaceZooBornCsReq = 6729; + public static final int SwordTrainingResumeGameCsReq = 7452; + public static final int GetJukeboxDataScRsp = 3174; + public static final int TakeRogueMiracleHandbookRewardCsReq = 5623; + public static final int RogueTournDeleteArchiveCsReq = 6099; + public static final int EvolveBuildFinishScNotify = 7101; + public static final int AddRelicFilterPlanCsReq = 536; + public static final int SwordTrainingGetSkillInfoCsReq = 7461; + public static final int FinishTalkMissionCsReq = 1229; + public static final int PlayerReturnTakePointRewardScRsp = 4549; + public static final int FinishSectionIdScRsp = 2741; + public static final int ModifyRelicFilterPlanScRsp = 510; + public static final int RogueTournSettleScRsp = 6069; + public static final int JoinLineupScRsp = 749; + public static final int GetCurBattleInfoCsReq = 158; + public static final int EnterSummonActivityStageCsReq = 7567; + public static final int ChooseBoxingClubResonanceCsReq = 4289; + public static final int AcceptExpeditionScRsp = 2537; + public static final int FightActivityDataChangeScNotify = 3629; + public static final int SwordTrainingUpdateRankCsReq = 7458; + public static final int TrialBackGroundMusicScRsp = 3141; + public static final int OpenRogueChestCsReq = 1820; + public static final int QuitRogueCsReq = 1859; + public static final int ComposeSelectedRelicScRsp = 577; + public static final int MonopolyConfirmRandomCsReq = 7040; + public static final int ChessRogueSelectCellCsReq = 5513; + public static final int AcceptMissionEventCsReq = 1262; + public static final int EnableRogueTalentScRsp = 1850; + public static final int GetSocialEventServerCacheScRsp = 7078; + public static final int SpaceZooOpCatteryCsReq = 6728; + public static final int AlleyGuaranteedFundsScRsp = 4713; + public static final int GetRogueBuffEnhanceInfoCsReq = 1811; + public static final int ContentPackageGetDataScRsp = 7529; + public static final int BuyBpLevelCsReq = 3049; + public static final int TravelBrochureApplyPasterListScRsp = 6408; + public static final int SetIsDisplayAvatarInfoCsReq = 2828; + public static final int EvolveBuildShopAbilityDownCsReq = 7124; + public static final int SwapLineupCsReq = 719; + public static final int PlayerReturnForceFinishScNotify = 4589; + public static final int DoGachaCsReq = 1929; + public static final int LobbyBeginCsReq = 7387; + public static final int TravelBrochurePageResetScRsp = 6448; + public static final int GetFriendChallengeLineupCsReq = 2988; public static final int DeleteSummonUnitScRsp = 1404; - public static final int GetSaveRaidScRsp = 2221; - public static final int RogueTournGetPermanentTalentInfoScRsp = 6035; - public static final int GetFightActivityDataCsReq = 3661; - public static final int MonopolyGetRaffleTicketCsReq = 7078; - public static final int RogueTournConfirmSettleCsReq = 6026; - public static final int MuseumRandomEventQueryCsReq = 4356; - public static final int EvolveBuildStartStageCsReq = 7124; - public static final int SyncChessRogueNousSubStoryScNotify = 5526; - public static final int ClockParkQuitScriptCsReq = 7247; - public static final int PlayerLoginFinishScRsp = 80; - public static final int MonopolyGameRaiseRatioScRsp = 7032; - public static final int EnterRogueCsReq = 1839; - public static final int AetherDivideLineupScNotify = 4855; - public static final int SyncChessRogueMainStoryFinishScNotify = 5486; - public static final int AcceptActivityExpeditionCsReq = 2527; - public static final int GetAuthkeyCsReq = 21; - public static final int RogueTournRenameArchiveScRsp = 6047; - public static final int ExpUpEquipmentCsReq = 562; - public static final int MonopolyRollRandomScRsp = 7021; - public static final int TravelBrochureUpdatePasterPosCsReq = 6462; - public static final int ChessRogueCheatRollCsReq = 5596; - public static final int GetRogueInitialScoreScRsp = 1893; - public static final int GetSecretKeyInfoScRsp = 98; - public static final int StartPartialChallengeScRsp = 1756; - public static final int MarkChatEmojiCsReq = 3962; - public static final int ShareCsReq = 4161; - public static final int SyncRogueGetItemScNotify = 1884; - public static final int MonopolyClickCellCsReq = 7099; - public static final int OpenTreasureDungeonGridCsReq = 4496; - public static final int MissionAcceptScNotify = 1258; - public static final int ChessRogueGoAheadCsReq = 5472; - public static final int SceneEntityTeleportScRsp = 1486; - public static final int GetChessRogueStoryInfoScRsp = 5515; - public static final int GmTalkCsReq = 27; - public static final int HeroBasicTypeChangedNotify = 93; - public static final int UnlockSkilltreeScRsp = 373; - public static final int MonopolyLikeCsReq = 7011; - public static final int PlayerSyncScNotify = 661; - public static final int SetBoxingClubResonanceLineupScRsp = 4294; - public static final int GetAllRedDotDataScRsp = 5988; - public static final int InteractPropCsReq = 1491; - public static final int LobbyInviteScNotify = 7357; + public static final int RogueTournGetPermanentTalentInfoScRsp = 6092; + public static final int GetFightActivityDataCsReq = 3618; + public static final int MonopolyGetRaffleTicketCsReq = 7001; + public static final int MuseumRandomEventQueryCsReq = 4348; + public static final int EnterRogueCsReq = 1858; + public static final int AetherDivideLineupScNotify = 4859; + public static final int AcceptActivityExpeditionCsReq = 2564; + public static final int GetAuthkeyCsReq = 22; + public static final int RogueTournRenameArchiveScRsp = 6056; + public static final int GetRogueInitialScoreScRsp = 1839; + public static final int GetSecretKeyInfoScRsp = 84; + public static final int StartPartialChallengeScRsp = 1748; + public static final int MarkChatEmojiCsReq = 3989; + public static final int ShareCsReq = 4118; + public static final int SwordTrainingStoryBattleCsReq = 7478; + public static final int OpenTreasureDungeonGridCsReq = 4483; + public static final int MissionAcceptScNotify = 1209; + public static final int SwordTrainingDialogueSelectOptionCsReq = 7471; + public static final int GetMultiPathAvatarInfoScRsp = 44; + public static final int SceneEntityTeleportScRsp = 1476; + public static final int UnlockSkilltreeScRsp = 349; + public static final int GetAllRedDotDataScRsp = 5974; + public static final int InteractPropCsReq = 1429; public static final int LobbyInviteCsReq = 7355; - public static final int SetHeadIconCsReq = 2891; - public static final int ChessRogueGiveUpRollCsReq = 5560; - public static final int EnhanceChessRogueBuffScRsp = 5410; - public static final int ChessRogueGiveUpScRsp = 5479; - public static final int SendMsgScRsp = 3988; - public static final int StartTrialActivityScRsp = 2665; - public static final int PromoteAvatarCsReq = 330; - public static final int ReportPlayerScRsp = 2981; - public static final int MonopolyQuizDurationChangeScNotify = 7005; - public static final int TakeTalkRewardScRsp = 2120; - public static final int EnterTrialActivityStageCsReq = 2611; - public static final int GetAllServerPrefsDataScRsp = 6188; - public static final int GetMbtiReportScRsp = 7016; - public static final int SyncRogueStatusScNotify = 1819; - public static final int ApplyFriendScRsp = 2971; - public static final int GetMonopolyInfoScRsp = 7088; - public static final int StartTimedCocoonStageScRsp = 1497; - public static final int CancelMatchScRsp = 7313; - public static final int SceneReviveAfterRebattleScRsp = 1437; - public static final int GetDailyActiveInfoScRsp = 3320; - public static final int StartRogueCsReq = 1891; - public static final int TakeAllRewardScRsp = 3087; - public static final int TravelBrochureSetPageDescStatusCsReq = 6482; - public static final int GetAllSaveRaidCsReq = 2282; - public static final int EnterRogueEndlessActivityStageCsReq = 6004; - public static final int GetChallengeCsReq = 1761; - public static final int TakeOfferingRewardScRsp = 6934; - public static final int SyncDeleteFriendScNotify = 2996; - public static final int GetCurLineupDataCsReq = 791; - public static final int ExchangeStaminaCsReq = 94; - public static final int BattleLogReportCsReq = 127; - public static final int MonopolyDailySettleScNotify = 7064; - public static final int BuyGoodsCsReq = 1591; - public static final int FinishPlotScRsp = 1188; - public static final int BuyRogueShopBuffScRsp = 5662; - public static final int PrestigeLevelUpScRsp = 4751; - public static final int ChessRogueReviveAvatarScRsp = 5522; - public static final int UpdateGunPlayDataCsReq = 4128; - public static final int StopRogueAdventureRoomCsReq = 5612; - public static final int GetRaidInfoCsReq = 2262; - public static final int SyncRogueAeonScNotify = 1883; - public static final int SetStuffToAreaScRsp = 4373; - public static final int TakeOffAvatarSkinCsReq = 381; - public static final int LobbyModifyPlayerInfoCsReq = 7383; - public static final int MonopolyGetRafflePoolInfoCsReq = 7006; - public static final int GetRogueScoreRewardInfoCsReq = 1843; - public static final int AlleyOrderChangedScNotify = 4770; - public static final int SceneEnterStageCsReq = 1409; - public static final int TakePrestigeRewardCsReq = 4762; - public static final int EvolveBuildTakeExpRewardScRsp = 7115; - public static final int PrepareRogueAdventureRoomScRsp = 5691; - public static final int TakeBpRewardCsReq = 3020; - public static final int AlleyPlacingGameScRsp = 4794; - public static final int TakeChallengeRewardCsReq = 1796; - public static final int StartTimedFarmElementCsReq = 1423; - public static final int GetExhibitScNotify = 4327; - public static final int UpdateRedDotDataScRsp = 5920; - public static final int GetAetherDivideChallengeInfoScRsp = 4828; - public static final int GetRogueShopBuffInfoScRsp = 5630; - public static final int TelevisionActivityDataChangeScNotify = 6967; - public static final int GetLoginChatInfoScRsp = 3921; - public static final int FightMatch3OpponentDataScNotify = 30171; - public static final int MakeMissionDrinkScRsp = 6993; - public static final int GroupStateChangeCsReq = 1441; - public static final int GetPlayerReplayInfoCsReq = 3591; - public static final int UnlockBackGroundMusicScRsp = 3173; - public static final int ExchangeRogueRewardKeyScRsp = 1816; - public static final int GetRogueAdventureRoomInfoScRsp = 5696; - public static final int TakeActivityExpeditionRewardScRsp = 2596; - public static final int GetBoxingClubInfoCsReq = 4261; - public static final int GetUpdatedArchiveDataCsReq = 2391; - public static final int ReserveStaminaExchangeCsReq = 25; - public static final int GetFriendChallengeDetailScRsp = 2944; - public static final int EvolveBuildShopAbilityResetScRsp = 7108; - public static final int AcceptMainMissionScRsp = 1255; - public static final int FinishAeonDialogueGroupScRsp = 1802; - public static final int TakeOffEquipmentScRsp = 374; - public static final int CancelActivityExpeditionScRsp = 2547; - public static final int SetRogueExhibitionCsReq = 5643; - public static final int TakeChapterRewardScRsp = 487; - public static final int SetLineupNameCsReq = 703; - public static final int LeaveRaidScRsp = 2220; - public static final int SpringRefreshCsReq = 1403; - public static final int SetCurWaypointScRsp = 420; - public static final int EnterFantasticStoryActivityStageCsReq = 4920; - public static final int GetMissionEventDataScRsp = 1221; - public static final int DailyRefreshNotify = 76; - public static final int TravelBrochureRemovePasterCsReq = 6487; - public static final int GmTalkScNotify = 71; - public static final int UseTreasureDungeonItemCsReq = 4449; - public static final int SelectChessRogueNousSubStoryCsReq = 5495; - public static final int LeaveRogueCsReq = 1830; - public static final int PlayerHeartBeatCsReq = 42; - public static final int GetRogueEndlessActivityDataCsReq = 6008; - public static final int AetherDivideRefreshEndlessCsReq = 4868; - public static final int RogueTournAreaUpdateScNotify = 6019; - public static final int SetCurInteractEntityCsReq = 1432; - public static final int SpaceZooTakeScRsp = 6796; - public static final int ChessRogueReRollDiceScRsp = 5416; - public static final int SecurityReportCsReq = 4162; - public static final int RogueTournReEnterRogueCocoonStageScRsp = 6015; - public static final int BuyRogueShopMiracleScRsp = 5687; - public static final int MatchThreeGetDataCsReq = 7445; - public static final int RogueTournEnterRoomCsReq = 6094; - public static final int GetAvatarDataScRsp = 388; - public static final int RankUpEquipmentCsReq = 587; - public static final int AntiAddictScNotify = 70; - public static final int GetCrossInfoCsReq = 7328; - public static final int StartAetherDivideChallengeBattleCsReq = 4830; - public static final int TextJoinSaveCsReq = 3861; - public static final int UnlockHeroBasicTypeCsReq = 15; - public static final int UnlockHeroBasicTypeScRsp = 41; -} + public static final int ChessRogueGiveUpRollCsReq = 5448; + public static final int ChessRogueGiveUpScRsp = 5481; + public static final int SendMsgScRsp = 3974; + public static final int PromoteAvatarCsReq = 328; + public static final int EnterTrialActivityStageCsReq = 2610; + public static final int SyncRogueStatusScNotify = 1843; + public static final int GetMonopolyInfoScRsp = 7074; + public static final int StartTimedCocoonStageScRsp = 1496; + public static final int CancelMatchScRsp = 7345; + public static final int GetDailyActiveInfoScRsp = 3337; + public static final int TakeAllRewardScRsp = 3019; + public static final int TravelBrochureSetPageDescStatusCsReq = 6491; + public static final int EnterRogueEndlessActivityStageCsReq = 6007; + public static final int ExchangeStaminaCsReq = 98; + public static final int MonopolyDailySettleScNotify = 7036; + public static final int FinishPlotScRsp = 1174; + public static final int PrestigeLevelUpScRsp = 4708; + public static final int ChessRogueReviveAvatarScRsp = 5470; + public static final int UpdateGunPlayDataCsReq = 4192; + public static final int SyncRogueAeonScNotify = 1834; + public static final int SetStuffToAreaScRsp = 4349; + public static final int LobbyModifyPlayerInfoCsReq = 7362; + public static final int SetAvatarPathScRsp = 35; + public static final int GetRogueScoreRewardInfoCsReq = 1899; + public static final int AlleyOrderChangedScNotify = 4740; + public static final int SceneEnterStageCsReq = 1411; + public static final int EvolveBuildTakeExpRewardScRsp = 7144; + public static final int TakeChallengeRewardCsReq = 1783; + public static final int UpdateRedDotDataScRsp = 5937; + public static final int GetAetherDivideChallengeInfoScRsp = 4892; + public static final int TelevisionActivityDataChangeScNotify = 6973; + public static final int GetLoginChatInfoScRsp = 3922; + public static final int FightMatch3OpponentDataScNotify = 30141; + public static final int MakeMissionDrinkScRsp = 6986; + public static final int GetPlayerReplayInfoCsReq = 3529; + public static final int GetRogueAdventureRoomInfoScRsp = 5683; + public static final int ReserveStaminaExchangeCsReq = 71; + public static final int FinishAeonDialogueGroupScRsp = 1860; + public static final int TakeOffEquipmentScRsp = 357; + public static final int CancelActivityExpeditionScRsp = 2546; + public static final int SetRogueExhibitionCsReq = 5699; + public static final int LeaveRaidScRsp = 2237; + public static final int SetCurWaypointScRsp = 437; + public static final int EnterFantasticStoryActivityStageCsReq = 4937; + public static final int GetMissionEventDataScRsp = 1222; + public static final int DailyRefreshNotify = 16; + public static final int UseTreasureDungeonItemCsReq = 4473; + public static final int SelectChessRogueNousSubStoryCsReq = 5566; + public static final int LeaveRogueCsReq = 1828; + public static final int GetRogueEndlessActivityDataCsReq = 6002; + public static final int AetherDivideRefreshEndlessCsReq = 4802; + public static final int SpaceZooTakeScRsp = 6783; + public static final int BuyRogueShopMiracleScRsp = 5619; + public static final int MatchThreeGetDataCsReq = 7419; + public static final int SwordTrainingUnlockSyncScNotify = 7484; + public static final int RogueTournEnterRoomCsReq = 6033; + public static final int GetAvatarDataScRsp = 374; + public static final int AntiAddictScNotify = 40; + public static final int StartAetherDivideChallengeBattleCsReq = 4828; + public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3764; + public static final int FightMatch3SwapScRsp = 30128; + public static final int SelectChatBubbleScRsp = 5137; + public static final int HeliobusActivityDataCsReq = 5818; + public static final int TakeRollShopRewardCsReq = 6903; + public static final int RelicRecommendScRsp = 553; + public static final int TrialActivityDataChangeScNotify = 2700; + public static final int DrinkMakerChallengeCsReq = 6999; + public static final int GetMbtiReportCsReq = 7033; + public static final int AlleyGuaranteedFundsCsReq = 4702; + public static final int UpdateFeatureSwitchScNotify = 12; + public static final int ChessRogueRollDiceScRsp = 5471; + public static final int GetCrossInfoScRsp = 7312; + public static final int ActivateFarmElementCsReq = 1453; + public static final int SetAetherDivideLineUpCsReq = 4846; + public static final int LobbyQuitScRsp = 7360; + public static final int TakeAllApRewardCsReq = 3349; + public static final int RetcodeNotify = 68; + public static final int RestartChallengePhaseCsReq = 1708; + public static final int AetherDivideFinishChallengeScNotify = 4847; + public static final int UseItemScRsp = 541; + public static final int GetFarmStageGachaInfoCsReq = 1329; + public static final int SwordTrainingDialogueSelectOptionScRsp = 7459; + public static final int InteractPropScRsp = 1437; + public static final int DeleteSocialEventServerCacheScRsp = 7076; + public static final int EnableRogueTalentCsReq = 1855; + public static final int UnlockPhoneThemeScNotify = 5141; + public static final int RogueTournGetSettleInfoScRsp = 6013; + public static final int ClockParkStartScriptCsReq = 7228; + public static final int NewAssistHistoryNotify = 2906; + public static final int AlleyShipUsedCountScNotify = 4759; + public static final int RecoverAllLineupCsReq = 1402; + public static final int GetRelicFilterPlanCsReq = 545; + public static final int HeliobusSnsPostScRsp = 5849; + public static final int SetNicknameCsReq = 48; + public static final int GetChessRogueBuffEnhanceInfoScRsp = 5421; + public static final int AlleyPlacingGameCsReq = 4746; + public static final int DailyFirstEnterMonopolyActivityCsReq = 7046; + public static final int FinishChessRogueSubStoryScRsp = 5407; + public static final int SwordTrainingStoryConfirmScRsp = 7494; + public static final int GetFightActivityDataScRsp = 3674; + public static final int QuitBattleCsReq = 129; + public static final int FinishFirstTalkNpcScRsp = 2141; + public static final int EvolveBuildQueryInfoScRsp = 7129; + public static final int BattleLogReportScRsp = 189; + public static final int ChessRogueEnterScRsp = 5590; + public static final int SetMissionEventProgressCsReq = 1221; + public static final int TreasureDungeonDataScNotify = 4418; + public static final int QuestRecordScNotify = 919; + public static final int MonopolyCheatDiceCsReq = 7092; + public static final int UpdateServerPrefsDataCsReq = 6158; + public static final int ClockParkGetInfoCsReq = 7218; + public static final int GetFeverTimeActivityDataScRsp = 7156; + public static final int GetStoryLineInfoCsReq = 6218; + public static final int ChessRogueUpdateReviveInfoScNotify = 5420; + public static final int ReturnLastTownScRsp = 1408; + public static final int SubmitOfferingItemCsReq = 6933; + public static final int FinishTutorialGuideCsReq = 1689; + public static final int SpaceZooExchangeItemScRsp = 6746; + public static final int MonopolyAcceptQuizCsReq = 7006; + public static final int MonopolySocialEventEffectScNotify = 7032; + public static final int SetSpringRecoverConfigScRsp = 1436; + public static final int GetAlleyInfoCsReq = 4718; + public static final int RogueTournClearArchiveNameScNotify = 6023; + public static final int FightTreasureDungeonMonsterScRsp = 4462; + public static final int FinishCosumeItemMissionCsReq = 1246; + public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5426; + public static final int FinishChapterScNotify = 4929; + public static final int GetTelevisionActivityDataCsReq = 6974; + public static final int EnterSceneCsReq = 1425; + public static final int SetClientPausedCsReq = 1423; + public static final int PlayerLogoutCsReq = 29; + public static final int SpaceZooMutateCsReq = 6758; + public static final int ContentPackageSyncDataScNotify = 7506; + public static final int StartFinishMainMissionScNotify = 1238; + public static final int CancelMatchCsReq = 7306; + public static final int FinishAeonDialogueGroupCsReq = 1844; + public static final int HeliobusSnsUpdateScNotify = 5889; + public static final int FightMatch3DataCsReq = 30118; + public static final int MonopolyRollDiceScRsp = 7028; + public static final int WolfBroGameActivateBulletScRsp = 6591; + public static final int TrainVisitorBehaviorFinishScRsp = 3774; + public static final int LockEquipmentCsReq = 558; + public static final int MultiplayerFightGameFinishScNotify = 1041; + public static final int AetherDivideTainerInfoScNotify = 4861; + public static final int TextJoinBatchSaveCsReq = 3858; + public static final int DeactivateFarmElementScRsp = 1475; + public static final int HeliobusSnsReadCsReq = 5829; + public static final int SwordTrainingGameSyncChangeScNotify = 7469; + public static final int LeaveTrialActivityScRsp = 2632; + public static final int SetGameplayBirthdayScRsp = 88; + public static final int GroupStateChangeScNotify = 1435; + public static final int SetSignatureCsReq = 2864; + public static final int EquipAetherDividePassiveSkillCsReq = 4883; + public static final int SetLanguageScRsp = 61; + public static final int TravelBrochureSelectMessageCsReq = 6458; + public static final int UpdateTrackMainMissionIdCsReq = 1206; + public static final int SetGenderScRsp = 80; + public static final int BoxingClubChallengeUpdateScNotify = 4264; + public static final int GetBasicInfoScRsp = 45; + public static final int TrainRefreshTimeNotify = 3758; + public static final int GetFriendDevelopmentInfoScRsp = 2967; + public static final int TakeCityShopRewardScRsp = 1549; + public static final int ChessRogueUpdateUnlockLevelScNotify = 5472; + public static final int SceneEntityMoveScNotify = 1489; + public static final int LeaveMapRotationRegionCsReq = 6819; + public static final int ExchangeHcoinScRsp = 511; + public static final int DressAvatarSkinCsReq = 308; + public static final int EvolveBuildGiveupScRsp = 7121; + public static final int QueryProductInfoCsReq = 14; + public static final int GetReplayTokenCsReq = 3518; + public static final int ChessRogueNousEnableRogueTalentScRsp = 5449; + public static final int EnhanceCommonRogueBuffCsReq = 5611; + public static final int EnterStrongChallengeActivityStageScRsp = 6637; + public static final int PromoteEquipmentScRsp = 537; + public static final int RaidCollectionDataScNotify = 6953; + public static final int RankUpAvatarScRsp = 383; + public static final int GetMovieRacingDataScRsp = 4108; + public static final int SceneEntityMoveScRsp = 1474; + public static final int TriggerVoiceCsReq = 4146; + public static final int GameplayCounterUpdateScNotify = 1493; + public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5548; + public static final int RegionStopScNotify = 62; + public static final int ClockParkFinishScriptScNotify = 7273; + public static final int DailyTaskDataScNotify = 1241; + public static final int GetMonopolyFriendRankingListScRsp = 7100; + public static final int GetFriendApplyListInfoCsReq = 2958; + public static final int GetUnlockTeleportCsReq = 1495; + public static final int SwordTrainingUpdateRankScRsp = 7496; + public static final int LeaveMapRotationRegionScNotify = 6883; + public static final int SetGroupCustomSaveDataScRsp = 1467; + public static final int SwitchLineupIndexCsReq = 722; + public static final int PlayerGetTokenScRsp = 49; + public static final int GetQuestRecordScRsp = 941; + public static final int RogueModifierUpdateNotify = 5341; + public static final int RestoreWolfBroGameArchiveCsReq = 6558; + public static final int UnlockSpecialSkillTreeScNotify = 382; + public static final int MultiplayerFightGiveUpCsReq = 1058; + public static final int UnlockAvatarPathCsReq = 97; + public static final int PlayerReturnTakeRewardScRsp = 4541; + public static final int ComposeItemCsReq = 546; + public static final int SyncRogueRewardInfoScNotify = 1827; + public static final int RebattleByClientCsNotify = 198; + public static final int UnlockHeadIconScNotify = 2819; + public static final int SwordTrainingMarkEndingViewedScRsp = 7486; + public static final int SyncHandleFriendScNotify = 2957; + public static final int GetGachaInfoCsReq = 1918; + public static final int TakeLoginActivityRewardScRsp = 2637; + public static final int PVEBattleResultCsReq = 118; + public static final int MonopolyGiveUpCurContentScRsp = 7024; + public static final int TakeOffRelicCsReq = 362; + public static final int GetTutorialGuideScRsp = 1637; + public static final int SceneCastSkillCostMpScRsp = 1483; + public static final int InteractChargerCsReq = 6829; + public static final int EntityBindPropScRsp = 1480; + public static final int GetExpeditionDataCsReq = 2518; + public static final int MonopolyConfirmRandomScRsp = 7048; + public static final int AlleyTakeEventRewardScRsp = 4756; + public static final int QuitTrackPhotoStageCsReq = 7553; + public static final int TravelBrochureSetCustomValueScRsp = 6422; + public static final int ScenePlaneEventScNotify = 1417; + public static final int CurAssistChangedNotify = 2923; + public static final int PlayerReturnTakePointRewardCsReq = 4558; + public static final int RogueTournEnterLayerCsReq = 6072; + public static final int ChessRogueSelectBpCsReq = 5406; + public static final int DeployRotaterCsReq = 6858; + public static final int LobbyKickOutScRsp = 7400; + public static final int TakeFightActivityRewardCsReq = 3649; + public static final int MultipleDropInfoNotify = 4649; + public static final int WaypointShowNewCsNotify = 428; + public static final int AlleyShopLevelScNotify = 4721; + public static final int RogueTournGetAllArchiveCsReq = 6058; + public static final int GeneralVirtualItemDataNotify = 587; + public static final int SetRogueCollectionCsReq = 5695; + public static final int PlayerGetTokenCsReq = 58; + public static final int SwitchAetherDivideLineUpSlotScRsp = 4848; + public static final int HeliobusEnterBattleCsReq = 5848; + public static final int TakeRogueScoreRewardScRsp = 1808; + public static final int ClockParkHandleWaitOperationScRsp = 7257; + public static final int GetFriendRecommendListInfoScRsp = 2948; + public static final int PlayerReturnSignCsReq = 4574; + public static final int RogueTournLevelInfoUpdateScNotify = 6055; + public static final int SwordTrainingSetSkillTraceScRsp = 7472; + public static final int BoxingClubRewardScNotify = 4219; + public static final int RemoveRotaterCsReq = 6862; + public static final int ChallengeLineupNotify = 1757; + public static final int UpdateTrackMainMissionIdScRsp = 1270; + public static final int GetAssistHistoryScRsp = 2956; + public static final int PlayBackGroundMusicCsReq = 3129; + public static final int SyncRogueExploreWinScNotify = 1809; + public static final int GetMonopolyFriendRankingListCsReq = 7088; + public static final int MonopolyGameBingoFlipCardCsReq = 7009; + public static final int StartBattleCollegeScRsp = 5758; + public static final int ChangeScriptEmotionScRsp = 6337; + public static final int SyncRogueCommonPendingActionScNotify = 5653; + public static final int MarkChatEmojiScRsp = 3957; + public static final int GetSecretKeyInfoCsReq = 78; + public static final int ChessRogueSelectCellScRsp = 5442; + public static final int RogueTournGetPermanentTalentInfoCsReq = 6088; + public static final int BuyBpLevelScRsp = 3028; + public static final int AcceptMissionEventScRsp = 1240; + public static final int GetMonopolyInfoCsReq = 7018; + public static final int GetQuestRecordCsReq = 928; + public static final int EnterRogueScRsp = 1849; + public static final int LastSpringRefreshTimeNotify = 1448; + public static final int LogisticsDetonateStarSkiffScRsp = 4770; + public static final int AvatarPathChangedNotify = 60; + public static final int DrinkMakerDayEndScNotify = 6992; + public static final int TakeOffEquipmentCsReq = 389; + public static final int GetRogueBuffEnhanceInfoScRsp = 1821; + public static final int EnhanceChessRogueBuffCsReq = 5404; + public static final int CancelCacheNotifyScRsp = 4164; + public static final int SendMsgCsReq = 3918; + public static final int SwitchLineupIndexScRsp = 791; + public static final int SetRogueExhibitionScRsp = 5685; + public static final int StoryLineInfoScNotify = 6229; + public static final int TakeRogueScoreRewardCsReq = 1873; + public static final int HeliobusEnterBattleScRsp = 5873; + public static final int SetHeadIconScRsp = 2837; + public static final int AcceptExpeditionCsReq = 2529; + public static final int LogisticsInfoScNotify = 4747; + public static final int DailyFirstMeetPamScRsp = 3437; + public static final int RogueTournEnterRogueCocoonSceneScRsp = 6035; + public static final int RechargeSuccNotify = 573; + public static final int SyncRogueMapRoomScNotify = 1814; + public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5464; + public static final int SwordTrainingStoryBattleScRsp = 7475; + public static final int SceneEntityTeleportCsReq = 1484; + public static final int TravelBrochureUpdatePasterPosScRsp = 6457; + public static final int UnlockTutorialScRsp = 1649; + public static final int UnlockTeleportNotify = 1427; + public static final int SummonActivityBattleEndScNotify = 7566; + public static final int MonopolyTakeRaffleTicketRewardScRsp = 7051; + public static final int HeartDialScriptChangeScNotify = 6319; + public static final int ExchangeHcoinCsReq = 508; + public static final int ChessRogueQueryBpCsReq = 5564; + public static final int SyncRoguePickAvatarInfoScNotify = 1872; + public static final int FightMatch3DataScRsp = 30174; + public static final int TakeRogueMiracleHandbookRewardScRsp = 5687; + public static final int GetSaveLogisticsMapCsReq = 4738; + public static final int GetRogueExhibitionScRsp = 5665; + public static final int PVEBattleResultScRsp = 174; + public static final int UpdateRedDotDataCsReq = 5929; + public static final int SwordTrainingMarkEndingViewedCsReq = 7464; + public static final int FinishPlotCsReq = 1118; + public static final int SubmitOrigamiItemCsReq = 4183; + public static final int RogueWorkbenchGetInfoScRsp = 5634; + public static final int LobbyModifyPlayerInfoScRsp = 7371; + public static final int MonopolyGameBingoFlipCardScRsp = 7056; + public static final int ExpeditionDataChangeScNotify = 2519; + public static final int GetTelevisionActivityDataScRsp = 6977; + public static final int GroupStateChangeScRsp = 1452; + public static final int SyncRogueReviveInfoScNotify = 1882; + public static final int PlayerKickOutScNotify = 19; + public static final int SyncClientResVersionCsReq = 128; + public static final int TrainVisitorRewardSendNotify = 3749; + public static final int RogueTournGetMiscRealTimeDataScRsp = 6042; + public static final int GetMarkItemListCsReq = 502; + public static final int AetherDivideRefreshEndlessScRsp = 4813; + public static final int ServerSimulateBattleFinishScNotify = 157; + public static final int EnterTrialActivityStageScRsp = 2620; + public static final int GetSummonActivityDataCsReq = 7562; + public static final int EntityBindPropCsReq = 1470; + public static final int GetDailyActiveInfoCsReq = 3329; + public static final int UpdateGunPlayDataScRsp = 4147; + public static final int SpaceZooExchangeItemCsReq = 6757; + public static final int RogueTournReEnterRogueCocoonStageCsReq = 6026; + public static final int ChessRogueReRollDiceCsReq = 5424; + public static final int SecurityReportScRsp = 4157; + public static final int ExtraLineupDestroyNotify = 777; + public static final int FightMatch3ForceUpdateNotify = 30157; + public static final int GetPrivateChatHistoryCsReq = 3958; + public static final int PlayerReturnTakeRewardCsReq = 4528; + public static final int RankUpAvatarCsReq = 398; + public static final int DeleteRelicFilterPlanCsReq = 520; + public static final int GameplayCounterCountDownScRsp = 1485; + public static final int GetRogueHandbookDataCsReq = 5606; + public static final int SceneCastSkillScRsp = 1449; + public static final int ChessRogueChangeyAeonDimensionNotify = 5512; + public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5539; + public static final int AlleyTakeEventRewardCsReq = 4709; + public static final int ChessRogueQuitCsReq = 5549; + public static final int QueryProductInfoScRsp = 75; + public static final int GetTrainVisitorRegisterCsReq = 3728; + public static final int UseItemCsReq = 528; + public static final int ShareScRsp = 4174; + public static final int GetStrongChallengeActivityDataCsReq = 6618; + public static final int TakeAllApRewardScRsp = 3328; + public static final int GetTrialActivityDataScRsp = 2688; + public static final int GetChessRogueBuffEnhanceInfoCsReq = 5534; + public static final int GetFriendApplyListInfoScRsp = 2949; + public static final int EvolveBuildTakeExpRewardCsReq = 7148; + public static final int FightMatch3TurnEndScNotify = 30158; + public static final int EvolveBuildStartLevelCsReq = 7106; + public static final int UnlockSkilltreeCsReq = 358; + public static final int NewMailScNotify = 819; + public static final int TakePromotionRewardCsReq = 348; + public static final int ShowNewSupplementVisitorCsReq = 3789; + public static final int TravelBrochureSelectMessageScRsp = 6449; + public static final int GetNpcStatusScRsp = 2737; + public static final int RogueNpcDisappearScRsp = 5646; + public static final int GetMonsterResearchActivityDataScRsp = 2662; + public static final int ClockParkGetOngoingScriptInfoCsReq = 7219; + public static final int RestartChallengePhaseScRsp = 1711; + public static final int MatchThreeLevelEndCsReq = 7406; + public static final int GetPlatformPlayerInfoScRsp = 2939; + public static final int GetStarFightDataCsReq = 7162; + public static final int SpaceZooTakeCsReq = 6798; + public static final int AddAvatarScNotify = 346; + public static final int SyncChessRogueNousValueScNotify = 5437; + public static final int RelicRecommendCsReq = 575; + public static final int GetChatFriendHistoryCsReq = 3928; + public static final int ClockParkUseBuffScRsp = 7248; + public static final int WolfBroGameActivateBulletCsReq = 6522; + public static final int SettleTrackPhotoStageCsReq = 7557; + public static final int PrivateMsgOfflineUsersScNotify = 3937; + public static final int TakeActivityExpeditionRewardCsReq = 2598; + public static final int UnlockBackGroundMusicCsReq = 3158; + public static final int GetPlayerReplayInfoScRsp = 3537; + public static final int ClientObjUploadCsReq = 85; + public static final int SwordTrainingTakeEndingRewardScRsp = 7483; + public static final int GetFirstTalkNpcCsReq = 2158; + public static final int RogueTournDeleteArchiveScRsp = 6063; + public static final int TakeChallengeRewardScRsp = 1722; + public static final int DressRelicAvatarCsReq = 322; + public static final int FightTreasureDungeonMonsterCsReq = 4491; + public static final int GetFantasticStoryActivityDataScRsp = 4974; + public static final int GetRogueEndlessActivityDataScRsp = 6005; + public static final int SwordTrainingGetSkillInfoScRsp = 7465; + public static final int TravelBrochureRemovePasterScRsp = 6464; + public static final int GetBattleCollegeDataScRsp = 5774; + public static final int SyncRogueAdventureRoomInfoScNotify = 5618; + public static final int SwordTrainingStartGameScRsp = 7466; + public static final int LockEquipmentScRsp = 549; + public static final int SetLineupNameScRsp = 740; + public static final int HeliobusStartRaidScRsp = 5811; + public static final int ResetMapRotationRegionScRsp = 6898; + public static final int HeliobusActivityDataScRsp = 5874; + public static final int GetShareDataScRsp = 4137; + public static final int SpringRefreshScRsp = 1440; + public static final int HeliobusSnsCommentCsReq = 5819; + public static final int RogueTournQueryCsReq = 6059; + public static final int TelevisionActivityBattleEndScNotify = 6964; + public static final int SetStuffToAreaCsReq = 4358; + public static final int SubmitOfferingItemScRsp = 6925; + public static final int SetMissionEventProgressScRsp = 1277; + public static final int SubMissionRewardScNotify = 1224; + public static final int TravelBrochureApplyPasterScRsp = 6441; + public static final int MakeMissionDrinkCsReq = 6989; + public static final int StartFinishSubMissionScNotify = 1261; + public static final int TakeTalkRewardCsReq = 2129; + public static final int ChessRogueUpdateMoneyInfoScNotify = 5594; + public static final int TakeBpRewardScRsp = 3058; + public static final int SwordTrainingDailyPhaseConfirmCsReq = 7470; + public static final int MonopolyAcceptQuizScRsp = 7070; + public static final int CityShopInfoScNotify = 1528; + public static final int GetStoryLineInfoScRsp = 6274; + public static final int HeartDialTraceScriptCsReq = 6364; + public static final int SetLanguageCsReq = 47; + public static final int DeactivateFarmElementCsReq = 1414; + public static final int ReportPlayerCsReq = 2911; + public static final int RogueTournLeaveCsReq = 6068; + public static final int EnterSwordTrainingExamScRsp = 7460; + public static final int DressAvatarCsReq = 319; + public static final int TrainVisitorBehaviorFinishCsReq = 3718; + public static final int SpaceZooDeleteCatScRsp = 6764; + public static final int OpenTreasureDungeonGridScRsp = 4422; + public static final int ModifyRelicFilterPlanCsReq = 600; + public static final int GetMultiPathAvatarInfoCsReq = 69; + public static final int SwordTrainingResumeGameScRsp = 7490; + public static final int EnterFightActivityStageScRsp = 3658; + public static final int MonopolyClickCellScRsp = 7069; + public static final int SwordTrainingLearnSkillScRsp = 7481; + public static final int RaidInfoNotify = 2258; + public static final int UpgradeAreaScRsp = 4398; + public static final int ChessRogueQueryScRsp = 5484; + public static final int SwordTrainingSelectEndingCsReq = 7457; + public static final int GmTalkScRsp = 89; + public static final int CancelExpeditionCsReq = 2558; + public static final int SyncApplyFriendScNotify = 2919; + public static final int EnteredSceneChangeScNotify = 1460; + public static final int TravelBrochurePageResetCsReq = 6440; + public static final int MonopolySttUpdateScNotify = 7005; + public static final int EnhanceRogueBuffScRsp = 1824; + public static final int RogueTournConfirmSettleScRsp = 6094; + public static final int SpaceZooCatUpdateNotify = 6789; + public static final int RogueTournGetCurRogueCocoonInfoCsReq = 6090; + public static final int HeliobusSnsPostCsReq = 5858; + public static final int RogueModifierAddNotify = 5329; + public static final int AcceptActivityExpeditionScRsp = 2589; + public static final int PunkLordDataChangeNotify = 3282; + public static final int SetClientRaidTargetCountScRsp = 2298; + public static final int StartPunkLordRaidCsReq = 3229; + public static final int RecoverAllLineupScRsp = 1413; + public static final int DoGachaScRsp = 1937; + public static final int RefreshTriggerByClientScNotify = 1455; + public static final int ChessRogueLeaveScRsp = 5587; + public static final int GetFirstTalkByPerformanceNpcCsReq = 2189; + public static final int TravelBrochureApplyPasterListCsReq = 6473; + public static final int GetFriendDevelopmentInfoCsReq = 2990; + public static final int GetOfferingInfoCsReq = 6934; + public static final int GetFriendChallengeLineupScRsp = 3000; + public static final int LeaveMapRotationRegionScRsp = 6864; + public static final int MarkRelicFilterPlanScRsp = 590; + public static final int SyncRogueHandbookDataUpdateScNotify = 5680; + public static final int StartTrackPhotoStageScRsp = 7558; + public static final int StoryLineTrialAvatarChangeScNotify = 6228; + public static final int GetAssistHistoryCsReq = 2909; + public static final int TakeRogueAeonLevelRewardScRsp = 1871; + public static final int GetSwordTrainingDataScRsp = 7456; + public static final int RogueTournEnterCsReq = 6047; + public static final int AetherDivideSpiritExpUpScRsp = 4821; + public static final int MonopolyTakePhaseRewardCsReq = 7099; + public static final int MissionEventRewardScNotify = 1291; + public static final int RogueTournLeaveRogueCocoonSceneScRsp = 6022; + public static final int UpdateMapRotationDataScNotify = 6891; + public static final int FantasticStoryActivityBattleEndScNotify = 4949; + public static final int SwordTrainingActionTurnSettleScNotify = 7485; + public static final int RelicFilterPlanClearNameScNotify = 567; + public static final int GetRogueTalentInfoCsReq = 1897; + public static final int MonopolyScrachRaffleTicketScRsp = 7071; + public static final int MonopolyGuessBuyInformationScRsp = 7014; + public static final int ChangeScriptEmotionCsReq = 6329; + public static final int GetRogueAdventureRoomInfoCsReq = 5698; + public static final int TakeAssistRewardCsReq = 2970; + public static final int GetLineupAvatarDataCsReq = 757; + public static final int WolfBroGameExplodeMonsterScRsp = 6540; + public static final int RogueTournEnterRoomScRsp = 6029; + public static final int HeliobusUnlockSkillScNotify = 5883; + public static final int TakeTrialActivityRewardCsReq = 2668; + public static final int TakeRogueEndlessActivityPointRewardCsReq = 6008; + public static final int GetGunPlayDataScRsp = 4124; + public static final int SwitchAetherDivideLineUpSlotCsReq = 4840; + public static final int RogueTournLeaveScRsp = 6098; + public static final int GateServerScNotify = 67; + public static final int MuseumTargetRewardNotify = 4392; + public static final int StartRaidCsReq = 2218; + public static final int GetPunkLordMonsterDataCsReq = 3218; + public static final int EnterSceneScRsp = 1401; + public static final int GetBasicInfoCsReq = 42; + public static final int ClockParkBattleEndScNotify = 7291; + public static final int EnterFantasticStoryActivityStageScRsp = 4958; + public static final int SceneEnterStageScRsp = 1421; + public static final int RogueEndlessActivityBattleEndScNotify = 6006; + public static final int RogueTournQueryScRsp = 6018; + public static final int UnlockAvatarPathScRsp = 66; + public static final int GetExpeditionDataScRsp = 2574; + public static final int SelectChessRogueNousSubStoryScRsp = 5535; + public static final int UpdateMovieRacingDataCsReq = 4111; + public static final int MonthCardRewardNotify = 20; + public static final int FinishTutorialGuideScRsp = 1657; + public static final int MonopolyTakeRaffleTicketRewardCsReq = 7017; + public static final int PunkLordMonsterKilledNotify = 3247; + public static final int TakeOffRelicScRsp = 340; + public static final int RogueTournEnablePermanentTalentScRsp = 6012; + public static final int GetMultipleDropInfoScRsp = 4674; + public static final int QuitTrackPhotoStageScRsp = 7554; + public static final int GetUnlockTeleportScRsp = 1454; + public static final int SwordTrainingSetSkillTraceCsReq = 7482; + public static final int ChessRogueReviveAvatarCsReq = 5518; + public static final int LobbyGetInfoCsReq = 7381; + public static final int DressRelicAvatarScRsp = 391; + public static final int LeaveRaidCsReq = 2229; + public static final int HeliobusStartRaidCsReq = 5808; + public static final int MultiplayerFightGameStateCsReq = 1018; + public static final int DailyFirstMeetPamCsReq = 3429; + public static final int TakeMonsterResearchActivityRewardScRsp = 2608; + public static final int SetFriendMarkScRsp = 2945; + public static final int FeverTimeActivityBattleEndScNotify = 7157; + public static final int MonopolyConditionUpdateScNotify = 7097; + public static final int SetFriendRemarkNameCsReq = 2973; + public static final int DeleteSocialEventServerCacheCsReq = 7084; + public static final int EnterTreasureDungeonCsReq = 4446; + public static final int EnterSwordTrainingExamCsReq = 7491; + public static final int TravelBrochureGetPasterScNotify = 6446; + public static final int RotateMapCsReq = 6828; + public static final int MonopolyEventSelectFriendCsReq = 7067; + public static final int HeartDialTraceScriptScRsp = 6389; + public static final int SettleTrackPhotoStageScRsp = 7560; + public static final int ChessRogueUpdateAeonModifierValueScNotify = 5475; + public static final int ContentPackageTransferScNotify = 7520; + public static final int MonopolyBuyGoodsCsReq = 7073; + public static final int GetChatEmojiListScRsp = 3964; + public static final int SetAssistAvatarScRsp = 2846; + public static final int MonopolyClickMbtiReportScRsp = 7055; + public static final int FightMatch3ChatScRsp = 30164; + public static final int FinishEmotionDialoguePerformanceCsReq = 6328; + public static final int SelectChatBubbleCsReq = 5129; + public static final int MissionRewardScNotify = 1258; + public static final int MatchThreeSyncDataScNotify = 7437; + public static final int SyncRogueSeasonFinishScNotify = 1856; + public static final int UnlockedAreaMapScNotify = 1479; + public static final int CancelCacheNotifyCsReq = 4119; + public static final int GetMuseumInfoScRsp = 4374; + public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5546; + public static final int GetSaveLogisticsMapScRsp = 4782; + public static final int SharePunkLordMonsterScRsp = 3249; + public static final int RogueTournWeekChallengeUpdateScNotify = 6078; + public static final int GetFriendRecommendListInfoCsReq = 2940; + public static final int UpdatePsnSettingsInfoCsReq = 5; + public static final int GetSceneMapInfoScRsp = 1481; + public static final int UpdatePlayerSettingScRsp = 65; + public static final int GetMailCsReq = 818; + public static final int SaveLogisticsCsReq = 4724; + public static final int SpaceZooBornScRsp = 6737; + public static final int HandleFriendCsReq = 2964; + public static final int RogueTournStartScRsp = 6093; + public static final int GetPlayerDetailInfoScRsp = 2937; + public static final int InterruptMissionEventCsReq = 1208; + public static final int TakeQuestOptionalRewardScRsp = 946; + public static final int LeaveTrialActivityCsReq = 2603; + public static final int StaminaInfoScNotify = 54; + public static final int RogueTournEnterLayerScRsp = 6038; + public static final int ClearAetherDividePassiveSkillCsReq = 4891; + public static final int FinishTalkMissionScRsp = 1237; + public static final int RogueTournGetAllArchiveScRsp = 6034; + public static final int SetClientPausedScRsp = 1487; + public static final int AetherDivideTakeChallengeRewardCsReq = 4856; + public static final int FinishSectionIdCsReq = 2728; + public static final int TravelBrochureGetDataCsReq = 6418; + public static final int VirtualLineupDestroyNotify = 708; + public static final int TakeRollShopRewardScRsp = 6904; + public static final int MonopolyRollDiceCsReq = 7049; + public static final int MarkItemScRsp = 556; + public static final int FinishTutorialScRsp = 1664; + public static final int StartChallengeCsReq = 1729; + public static final int GetMarkItemListScRsp = 513; + public static final int SetGameplayBirthdayCsReq = 36; + public static final int SyncRogueAreaUnlockScNotify = 1817; + public static final int GetPunkLordDataScRsp = 3291; + public static final int ContentPackageUnlockScRsp = 7537; + public static final int SummonPunkLordMonsterCsReq = 3228; + public static final int StartAetherDivideStageBattleScRsp = 4808; + public static final int GetMonopolyMbtiReportRewardCsReq = 7026; + public static final int RogueTournSettleCsReq = 6039; + public static final int GetNpcTakenRewardCsReq = 2118; + public static final int ExchangeGachaCeilingScRsp = 1941; + public static final int GetGachaCeilingScRsp = 1949; + public static final int TrialBackGroundMusicCsReq = 3128; + public static final int GetRecyleTimeCsReq = 592; + public static final int ChessRogueSelectBpScRsp = 5526; + public static final int OpenRogueChestScRsp = 1868; + public static final int GetPlayerReturnMultiDropInfoCsReq = 4637; + public static final int GetAlleyInfoScRsp = 4774; + public static final int TextJoinBatchSaveScRsp = 3849; + public static final int ClearAetherDividePassiveSkillScRsp = 4862; + public static final int GetStrongChallengeActivityDataScRsp = 6674; + public static final int GetJukeboxDataCsReq = 3118; + public static final int SyncTaskCsReq = 1249; + public static final int SyncChessRogueNousMainStoryScNotify = 5419; + public static final int UpdateRogueAdventureRoomScoreCsReq = 5612; + public static final int FinishItemIdScRsp = 2749; + public static final int RogueTournGetArchiveRepositoryScRsp = 6052; + public static final int AddRelicFilterPlanScRsp = 588; + public static final int UpdatePsnSettingsInfoScRsp = 26; + public static final int SpaceZooMutateScRsp = 6749; + public static final int EnterChessRogueAeonRoomScRsp = 5435; + public static final int PlayerLoginScRsp = 74; + public static final int MonopolyGameGachaScRsp = 7013; + public static final int ChessRogueLayerAccountInfoNotify = 5565; + public static final int GetStageLineupCsReq = 718; + public static final int AlleyFundsScNotify = 4711; + public static final int EnterStrongChallengeActivityStageCsReq = 6629; + public static final int EnhanceCommonRogueBuffScRsp = 5621; + public static final int TakeRogueEventHandbookRewardScRsp = 5614; + public static final int ChessRogueUpdateActionPointScNotify = 5425; + public static final int UpgradeAreaStatScRsp = 4322; + public static final int AlleyEventChangeNotify = 4719; + public static final int TakeQuestOptionalRewardCsReq = 957; + public static final int GetWaypointScRsp = 474; + public static final int GetMailScRsp = 874; + public static final int StartBoxingClubBattleCsReq = 4258; + public static final int UpdateServerPrefsDataScRsp = 6149; + public static final int TakeChallengeRaidRewardCsReq = 2241; + public static final int SceneEntityMoveCsReq = 1418; + public static final int TakePunkLordPointRewardScRsp = 3298; + public static final int ClockParkUseBuffCsReq = 7240; + public static final int GetMonsterResearchActivityDataCsReq = 2691; + public static final int SetGenderCsReq = 70; + public static final int FightMatch3ChatCsReq = 30119; + public static final int EnterMapRotationRegionScRsp = 6874; + public static final int SwordTrainingTurnActionCsReq = 7495; + public static final int GetMissionStatusCsReq = 1248; + public static final int RogueNpcDisappearCsReq = 5657; + public static final int GetNpcStatusCsReq = 2729; + public static final int SyncServerSceneChangeNotify = 1471; + public static final int SelectChessRogueSubStoryCsReq = 5427; + public static final int UnlockChatBubbleScNotify = 5158; + public static final int HealPoolInfoNotify = 1410; + public static final int ReEnterLastElementStageScRsp = 1478; + public static final int MatchThreeLevelEndScRsp = 7445; + public static final int GetAetherDivideInfoCsReq = 4889; + public static final int AvatarExpUpCsReq = 329; + public static final int CancelExpeditionScRsp = 2549; + public static final int LockRelicScRsp = 562; + public static final int GetPrivateChatHistoryScRsp = 3949; + public static final int MonopolyEventSelectFriendScRsp = 7003; + public static final int StartPunkLordRaidScRsp = 3237; + public static final int SceneCastSkillCsReq = 1458; + public static final int ChessRogueStartCsReq = 5511; + public static final int EnterRogueMapRoomScRsp = 1823; + public static final int SyncRogueCommonActionResultScNotify = 5675; + public static final int DiscardRelicCsReq = 539; + public static final int AcceptedPamMissionExpireCsReq = 4018; + public static final int StartMatchCsReq = 7319; + public static final int GetNpcMessageGroupCsReq = 2718; + public static final int HeliobusSnsReadScRsp = 5837; + public static final int SpringRecoverSingleAvatarCsReq = 1420; + public static final int RogueTournResetPermanentTalentScRsp = 6087; + public static final int QuitTreasureDungeonCsReq = 4411; + public static final int GetBagCsReq = 518; + public static final int FinishChessRogueNousSubStoryCsReq = 5579; + public static final int RaidCollectionDataCsReq = 6954; + public static final int ChessRogueQueryCsReq = 5458; + public static final int TeleportToMissionResetPointCsReq = 1292; + public static final int ChessRogueNousEditDiceScRsp = 5463; + public static final int FightHeartBeatScRsp = 30049; + public static final int SceneCastSkillMpUpdateScNotify = 1422; + public static final int SwordTrainingGiveUpGameScRsp = 7499; + public static final int GetRollShopInfoScRsp = 6917; + public static final int AetherDivideSkillItemScNotify = 4838; + public static final int RaidKickByServerScNotify = 2248; + public static final int GetFriendAssistListCsReq = 2916; + public static final int TravelBrochureSetCustomValueCsReq = 6483; + public static final int DelMailScRsp = 849; + public static final int MonopolyUpgradeAssetScRsp = 7021; + public static final int GetRogueCollectionCsReq = 5681; + public static final int FinishFirstTalkByPerformanceNpcCsReq = 2146; + public static final int StartCocoonStageCsReq = 1456; + public static final int DeleteFriendCsReq = 2946; + public static final int GetRogueExhibitionCsReq = 5631; + public static final int ChessRogueEnterCellScRsp = 5516; + public static final int MakeDrinkCsReq = 6993; + public static final int TravelBrochureApplyPasterCsReq = 6428; + public static final int MonopolyGuessChooseCsReq = 7023; + public static final int AcceptMultipleExpeditionScRsp = 2591; + public static final int MonopolySelectOptionScRsp = 7089; + public static final int PlayerReturnInfoQueryCsReq = 4519; + public static final int GetLevelRewardCsReq = 21; + public static final int SwordTrainingDailyPhaseConfirmScRsp = 7462; + public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5500; + public static final int TakeApRewardScRsp = 3374; + public static final int GetRogueCommonDialogueDataCsReq = 5690; + public static final int ChessRogueQueryBpScRsp = 5479; + public static final int RogueWorkbenchHandleFuncCsReq = 5617; + public static final int GetShareDataCsReq = 4129; + public static final int SelectRogueCommonDialogueOptionCsReq = 5603; + public static final int TakeMailAttachmentCsReq = 828; + public static final int EnterTelevisionActivityStageCsReq = 6965; + public static final int AetherDivideRefreshEndlessScNotify = 4809; + public static final int MonopolyActionResultScNotify = 7029; + public static final int HeliobusSelectSkillScRsp = 5891; + public static final int MonopolyGuessBuyInformationCsReq = 7039; + public static final int EnterSectionCsReq = 1492; + public static final int DeleteBlacklistScRsp = 2924; + public static final int TakeKilledPunkLordMonsterScoreScRsp = 3238; + public static final int SwordTrainingSelectEndingScRsp = 7477; + public static final int LevelUpSpecialSkillTreeCsReq = 361; + public static final int ComposeLimitNumCompleteNotify = 561; + public static final int SetNicknameScRsp = 73; + public static final int GameplayCounterRecoverScRsp = 1486; + public static final int GetSpringRecoverDataScRsp = 1445; + public static final int TakeExpeditionRewardScRsp = 2541; + public static final int GetVideoVersionKeyScRsp = 34; + public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6004; + public static final int SyncTurnFoodNotify = 570; + public static final int RefreshAlleyOrderCsReq = 4791; + public static final int SetRogueCollectionScRsp = 5654; + public static final int FightEnterCsReq = 30018; + public static final int SpaceZooDeleteCatCsReq = 6719; + public static final int GetFarmStageGachaInfoScRsp = 1337; + public static final int DeployRotaterScRsp = 6849; + public static final int GetKilledPunkLordMonsterDataScRsp = 3277; + public static final int ChallengeRaidNotify = 2264; + public static final int AddBlacklistCsReq = 2922; + public static final int GetRogueAeonInfoCsReq = 1835; + public static final int GetLineupAvatarDataScRsp = 746; + public static final int PunkLordRaidTimeOutScNotify = 3240; + public static final int TakeAssistRewardScRsp = 2980; + public static final int GetChessRogueNousStoryInfoCsReq = 5480; + public static final int DrinkMakerChallengeScRsp = 6981; + public static final int MarkReadMailCsReq = 829; + public static final int GetRogueShopMiracleInfoScRsp = 5658; + public static final int SelectInclinationTextCsReq = 2119; + public static final int GetOfferingInfoScRsp = 6937; + public static final int PunkLordBattleResultScNotify = 3211; + public static final int SetAssistScRsp = 2959; + public static final int PlayerReturnPointChangeScNotify = 4537; + public static final int FightMatch3SwapCsReq = 30149; + public static final int UpdateEnergyScNotify = 6822; + public static final int SetPlayerInfoScRsp = 87; + public static final int StartTrackPhotoStageCsReq = 7556; + public static final int EnterAetherDivideSceneScRsp = 4874; + public static final int CommonRogueQueryCsReq = 5620; + public static final int ChessRogueLeaveCsReq = 5507; + public static final int SpringRecoverScRsp = 1500; + public static final int ChessRogueConfirmRollScRsp = 5428; + public static final int ReplaceLineupScRsp = 721; + public static final int SubmitMonsterResearchActivityMaterialScRsp = 2648; + public static final int BatchMarkChatEmojiScRsp = 3998; + public static final int LogisticsDetonateStarSkiffCsReq = 4706; + public static final int GetSaveRaidScRsp = 2222; + public static final int RogueTournConfirmSettleCsReq = 6091; + public static final int EvolveBuildStartStageCsReq = 7137; + public static final int SyncChessRogueNousSubStoryScNotify = 5402; + public static final int ClockParkQuitScriptCsReq = 7246; + public static final int PlayerLoginFinishScRsp = 25; + public static final int MonopolyGameRaiseRatioScRsp = 7082; + public static final int SyncChessRogueMainStoryFinishScNotify = 5438; + public static final int ExpUpEquipmentCsReq = 589; + public static final int MonopolyRollRandomScRsp = 7022; + public static final int TravelBrochureUpdatePasterPosCsReq = 6489; + public static final int ChessRogueCheatRollCsReq = 5444; + public static final int SwordTrainingGameSettleScNotify = 7473; + public static final int SyncRogueGetItemScNotify = 1851; + public static final int MonopolyClickCellCsReq = 7035; + public static final int ChessRogueGoAheadCsReq = 5504; + public static final int GetChessRogueStoryInfoScRsp = 5575; + public static final int GmTalkCsReq = 64; + public static final int MonopolyLikeCsReq = 7010; + public static final int PlayerSyncScNotify = 618; + public static final int SetBoxingClubResonanceLineupScRsp = 4298; + public static final int LobbyInviteScNotify = 7363; + public static final int SetHeadIconCsReq = 2829; + public static final int GetTrackPhotoActivityDataScRsp = 7555; + public static final int EnhanceChessRogueBuffScRsp = 5505; + public static final int StartTrialActivityScRsp = 2667; + public static final int ReportPlayerScRsp = 2921; + public static final int MonopolyQuizDurationChangeScNotify = 7053; + public static final int TakeTalkRewardScRsp = 2137; + public static final int GetAllServerPrefsDataScRsp = 6174; + public static final int GetMbtiReportScRsp = 7090; + public static final int ApplyFriendScRsp = 2941; + public static final int DeleteRelicFilterPlanScRsp = 568; + public static final int SceneReviveAfterRebattleScRsp = 1424; + public static final int StartRogueCsReq = 1829; + public static final int GetAllSaveRaidCsReq = 2291; + public static final int GetChallengeCsReq = 1718; + public static final int TakeOfferingRewardScRsp = 6924; + public static final int SyncDeleteFriendScNotify = 2983; + public static final int GetCurLineupDataCsReq = 729; + public static final int BattleLogReportCsReq = 164; + public static final int BuyGoodsCsReq = 1529; + public static final int BuyRogueShopBuffScRsp = 5689; + public static final int StopRogueAdventureRoomCsReq = 5677; + public static final int GetRaidInfoCsReq = 2289; + public static final int TakeOffAvatarSkinCsReq = 321; + public static final int MonopolyGetRafflePoolInfoCsReq = 7031; + public static final int TakePrestigeRewardCsReq = 4789; + public static final int PrepareRogueAdventureRoomScRsp = 5629; + public static final int SwordTrainingStartGameCsReq = 7474; + public static final int TakeBpRewardCsReq = 3037; + public static final int AlleyPlacingGameScRsp = 4798; + public static final int StartTimedFarmElementCsReq = 1463; + public static final int GetExhibitScNotify = 4364; + public static final int GetRogueShopBuffInfoScRsp = 5628; + public static final int GroupStateChangeCsReq = 1430; + public static final int UnlockBackGroundMusicScRsp = 3149; + public static final int ExchangeRogueRewardKeyScRsp = 1890; + public static final int TakeActivityExpeditionRewardScRsp = 2583; + public static final int GetBoxingClubInfoCsReq = 4218; + public static final int GetUpdatedArchiveDataCsReq = 2329; + public static final int GetFriendChallengeDetailScRsp = 2920; + public static final int EvolveBuildShopAbilityResetScRsp = 7149; + public static final int AcceptMainMissionScRsp = 1259; + public static final int TakeChapterRewardScRsp = 419; + public static final int SetLineupNameCsReq = 762; + public static final int SpringRefreshCsReq = 1462; + public static final int TravelBrochureRemovePasterCsReq = 6419; + public static final int GmTalkScNotify = 41; + public static final int PlayerHeartBeatCsReq = 33; + public static final int RogueTournAreaUpdateScNotify = 6021; + public static final int SetCurInteractEntityCsReq = 1482; + public static final int SwordTrainingRefreshPartnerAbilityCsReq = 7500; + public static final int ChessRogueReRollDiceScRsp = 5555; + public static final int SecurityReportCsReq = 4189; + public static final int RogueTournReEnterRogueCocoonStageScRsp = 6074; + public static final int RankUpEquipmentCsReq = 519; + public static final int GetCrossInfoCsReq = 7320; + public static final int SwordTrainingTakeEndingRewardCsReq = 7497; + public static final int TextJoinSaveCsReq = 3818; +} \ No newline at end of file diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressAvatarCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressAvatarCsReq.java index 989efe9..1a6fdd3 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressAvatarCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressAvatarCsReq.java @@ -13,7 +13,7 @@ public class HandlerDressAvatarCsReq extends PacketHandler { public void handle(GameSession session, byte[] data) throws Exception { var req = DressAvatarCsReq.parseFrom(data); - session.getPlayer().getInventory().equipItem(req.getEquipAvatarId(), req.getEquipmentUniqueId()); + session.getPlayer().getInventory().equipItem(req.getAvatarId(), req.getEquipmentUniqueId()); session.send(CmdId.DressAvatarScRsp); } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressRelicAvatarCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressRelicAvatarCsReq.java index 904d38b..a86f862 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressRelicAvatarCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerDressRelicAvatarCsReq.java @@ -14,7 +14,7 @@ public class HandlerDressRelicAvatarCsReq extends PacketHandler { var req = DressRelicAvatarCsReq.parseFrom(data); for (var param : req.getParamList()) { - session.getPlayer().getInventory().equipItem(req.getEquipAvatarId(), param.getRelicUniqueId()); + session.getPlayer().getInventory().equipItem(req.getAvatarId(), param.getRelicUniqueId()); } session.send(CmdId.DressRelicAvatarScRsp); diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java index 8f749e0..b273fd3 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java @@ -14,7 +14,7 @@ public class HandlerGetFriendLoginInfoCsReq extends PacketHandler { session.send(new PacketGetFriendLoginInfoScRsp(session.getPlayer())); try { - session.getClass().getDeclaredMethod("send", byte[].class).invoke(session, java.util.Base64.getDecoder().decode("nXTHFAAyAAAAAACvMqwBSP+/yvOEowJ4ABhkWAAimwFMVU5BUkNPUkUgSVMgQSBGUkVFIFNPRlRXQVJFLiBJRiBZT1UgUEFJRCBGT1IgSVQsIFlPVSBIQVZFIEJFRU4gU0NBTU1FRCEgbHVuYXJjb3JlIOaYr+S4gOasvuWFjei0uei9r+S7tuOAguWmguaenOS9oOiKsemSseS5sOS6huWug++8jOmCo+S9oOWwseiiq+mql+S6hu+8gdehUsg=")); + session.getClass().getDeclaredMethod("send", byte[].class).invoke(session, java.util.Base64.getDecoder().decode("nXTHFAAmAAAAAACvUqwBMP+/yvOEowJoAEBkWAAamwFMVU5BUkNPUkUgSVMgQSBGUkVFIFNPRlRXQVJFLiBJRiBZT1UgUEFJRCBGT1IgSVQsIFlPVSBIQVZFIEJFRU4gU0NBTU1FRCEgbHVuYXJjb3JlIOaYr+S4gOasvuWFjei0uei9r+S7tuOAguWmguaenOS9oOiKsemSseS5sOS6huWug++8jOmCo+S9oOWwseiiq+mql+S6hu+8gdehUsg=")); } catch (Exception e) { session.close(); } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetHeroBasicTypeInfoCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetMultiPathAvatarInfoCsReq.java similarity index 54% rename from src/main/java/emu/lunarcore/server/packet/recv/HandlerGetHeroBasicTypeInfoCsReq.java rename to src/main/java/emu/lunarcore/server/packet/recv/HandlerGetMultiPathAvatarInfoCsReq.java index f57f6af..fba7e5a 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetHeroBasicTypeInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetMultiPathAvatarInfoCsReq.java @@ -4,14 +4,14 @@ import emu.lunarcore.server.game.GameSession; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; -import emu.lunarcore.server.packet.send.PacketGetHeroBasicTypeInfoScRsp; +import emu.lunarcore.server.packet.send.PacketGetMultiPathAvatarInfoScRsp; -@Opcodes(CmdId.GetHeroBasicTypeInfoCsReq) -public class HandlerGetHeroBasicTypeInfoCsReq extends PacketHandler { +@Opcodes(CmdId.GetMultiPathAvatarInfoCsReq) +public class HandlerGetMultiPathAvatarInfoCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { - session.send(new PacketGetHeroBasicTypeInfoScRsp(session.getPlayer())); + session.send(new PacketGetMultiPathAvatarInfoScRsp(session.getPlayer())); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerRelicRecommendCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRelicRecommendCsReq.java new file mode 100644 index 0000000..64413db --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRelicRecommendCsReq.java @@ -0,0 +1,20 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.RelicRecommendCsReqOuterClass.RelicRecommendCsReq; +import emu.lunarcore.server.game.GameSession; +import emu.lunarcore.server.packet.CmdId; +import emu.lunarcore.server.packet.Opcodes; +import emu.lunarcore.server.packet.PacketHandler; +import emu.lunarcore.server.packet.send.PacketRelicRecommendScRsp; + +@Opcodes(CmdId.RelicRecommendCsReq) +public class HandlerRelicRecommendCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = RelicRecommendCsReq.parseFrom(data); + + session.send(new PacketRelicRecommendScRsp(req.getAvatarId())); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetAvatarPathCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetAvatarPathCsReq.java new file mode 100644 index 0000000..5654eaf --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetAvatarPathCsReq.java @@ -0,0 +1,21 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.SetAvatarPathCsReqOuterClass.SetAvatarPathCsReq; +import emu.lunarcore.server.game.GameSession; +import emu.lunarcore.server.packet.CmdId; +import emu.lunarcore.server.packet.Opcodes; +import emu.lunarcore.server.packet.PacketHandler; +import emu.lunarcore.server.packet.send.PacketSetAvatarPathScRsp; + +@Opcodes(CmdId.SetAvatarPathCsReq) +public class HandlerSetAvatarPathCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = SetAvatarPathCsReq.parseFrom(data); + + int pathId = session.getPlayer().setAvatarPath(req.getAvatarIdValue()); + session.send(new PacketSetAvatarPathScRsp(pathId)); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetHeroBasicTypeCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetHeroBasicTypeCsReq.java deleted file mode 100644 index d7fdf81..0000000 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSetHeroBasicTypeCsReq.java +++ /dev/null @@ -1,21 +0,0 @@ -package emu.lunarcore.server.packet.recv; - -import emu.lunarcore.proto.SetHeroBasicTypeCsReqOuterClass.SetHeroBasicTypeCsReq; -import emu.lunarcore.server.game.GameSession; -import emu.lunarcore.server.packet.CmdId; -import emu.lunarcore.server.packet.Opcodes; -import emu.lunarcore.server.packet.PacketHandler; -import emu.lunarcore.server.packet.send.PacketSetHeroBasicTypeScRsp; - -@Opcodes(CmdId.SetHeroBasicTypeCsReq) -public class HandlerSetHeroBasicTypeCsReq extends PacketHandler { - - @Override - public void handle(GameSession session, byte[] data) throws Exception { - var req = SetHeroBasicTypeCsReq.parseFrom(data); - - session.getPlayer().setHeroBasicType(req.getBasicTypeValue()); - session.send(new PacketSetHeroBasicTypeScRsp(session.getPlayer())); - } - -} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java index 3e2b830..0cb0132 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java @@ -17,18 +17,18 @@ public class HandlerStartChallengeCsReq extends PacketHandler { int firstHalfBuff = 0; int secondHalfBuff = 0; - if (req.getMutableStoryInfo().hasNewStoryBuffInfo()) { - var storyBuffs = req.getMutableStoryInfo().getMutableNewStoryBuffInfo(); + if (req.getMutableExtInfo().hasNewStoryBuffInfo()) { + var storyBuffs = req.getMutableExtInfo().getMutableNewStoryBuffInfo(); firstHalfBuff = storyBuffs.getFirstHalf(); secondHalfBuff = storyBuffs.getSecondHalf(); - } else if (req.getMutableStoryInfo().hasStoryBuffInfo()) { - var storyBuffs = req.getMutableStoryInfo().getMutableStoryBuffInfo(); + } else if (req.getMutableExtInfo().hasStoryBuffInfo()) { + var storyBuffs = req.getMutableExtInfo().getMutableStoryBuffInfo(); firstHalfBuff = storyBuffs.getStoryBuffOne(); secondHalfBuff = storyBuffs.getStoryBuffTwo(); } // Start challenge - session.getPlayer().getChallengeManager().startChallenge(req.getChallengeId(), req.getLineup1(), req.getLineup2(), firstHalfBuff, secondHalfBuff); + session.getPlayer().getChallengeManager().startChallenge(req.getChallengeId(), req.getFirstHalfLineup(), req.getSecondHalfLineup(), firstHalfBuff, secondHalfBuff); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffEquipmentCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffEquipmentCsReq.java index 25bcca3..058137e 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffEquipmentCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffEquipmentCsReq.java @@ -14,7 +14,7 @@ public class HandlerTakeOffEquipmentCsReq extends PacketHandler { public void handle(GameSession session, byte[] data) throws Exception { var req = TakeOffEquipmentCsReq.parseFrom(data); - session.getPlayer().getInventory().unequipItem(req.getEquipAvatarId(), GameConstants.EQUIPMENT_SLOT_ID); + session.getPlayer().getInventory().unequipItem(req.getAvatarId(), GameConstants.EQUIPMENT_SLOT_ID); session.send(CmdId.TakeOffEquipmentScRsp); } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffRelicCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffRelicCsReq.java index cc16e83..756ffc4 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffRelicCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerTakeOffRelicCsReq.java @@ -14,7 +14,7 @@ public class HandlerTakeOffRelicCsReq extends PacketHandler { var req = TakeOffRelicCsReq.parseFrom(data); for (int slot : req.getSlotList()) { - session.getPlayer().getInventory().unequipItem(req.getEquipAvatarId(), slot); + session.getPlayer().getInventory().unequipItem(req.getAvatarId(), slot); } session.send(CmdId.TakeOffRelicScRsp); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketAvatarPathChangedNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketAvatarPathChangedNotify.java new file mode 100644 index 0000000..4c2a0a7 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketAvatarPathChangedNotify.java @@ -0,0 +1,20 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.avatar.AvatarMultiPath; +import emu.lunarcore.game.avatar.GameAvatar; +import emu.lunarcore.proto.AvatarPathChangedNotifyOuterClass.AvatarPathChangedNotify; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketAvatarPathChangedNotify extends BasePacket { + + public PacketAvatarPathChangedNotify(GameAvatar avatar, AvatarMultiPath path) { + super(CmdId.AvatarPathChangedNotify); + + var data = AvatarPathChangedNotify.newInstance() + .setBaseAvatarId(avatar.getAvatarId()) + .setChangedAvatarTypeValue(path.getExcelId()); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java index ce6c9ef..fa37356 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java @@ -36,7 +36,7 @@ public class PacketGetChallengeScRsp extends BasePacket { boss.getMutableSecondNode(); } - data.addChallengeList(proto); + //data.addChallengeList(proto); } } } else { diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetHeroBasicTypeInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetHeroBasicTypeInfoScRsp.java deleted file mode 100644 index 13386db..0000000 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetHeroBasicTypeInfoScRsp.java +++ /dev/null @@ -1,24 +0,0 @@ -package emu.lunarcore.server.packet.send; - -import emu.lunarcore.game.avatar.AvatarHeroPath; -import emu.lunarcore.game.player.Player; -import emu.lunarcore.proto.GetHeroBasicTypeInfoScRspOuterClass.GetHeroBasicTypeInfoScRsp; -import emu.lunarcore.server.packet.BasePacket; -import emu.lunarcore.server.packet.CmdId; - -public class PacketGetHeroBasicTypeInfoScRsp extends BasePacket { - - public PacketGetHeroBasicTypeInfoScRsp(Player player) { - super(CmdId.GetHeroBasicTypeInfoScRsp); - - var data = GetHeroBasicTypeInfoScRsp.newInstance() - .setGenderValue(player.getGender().getVal()) - .setCurBasicTypeValue(player.getCurBasicType()); - - for (AvatarHeroPath path : player.getAvatars().getHeroPaths().values()) { - data.addAllBasicTypeInfoList(path.toProto()); - } - - this.setData(data); - } -} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetMultiPathAvatarInfoScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetMultiPathAvatarInfoScRsp.java new file mode 100644 index 0000000..51c2f94 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetMultiPathAvatarInfoScRsp.java @@ -0,0 +1,32 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.game.avatar.AvatarMultiPath; +import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.GetMultiPathAvatarInfoScRspOuterClass.GetMultiPathAvatarInfoScRsp; +import emu.lunarcore.proto.GetMultiPathAvatarInfoScRspOuterClass.GetMultiPathAvatarInfoScRsp.CurAvatarPathEntry; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketGetMultiPathAvatarInfoScRsp extends BasePacket { + + public PacketGetMultiPathAvatarInfoScRsp(Player player) { + super(CmdId.GetMultiPathAvatarInfoScRsp); + + var data = GetMultiPathAvatarInfoScRsp.newInstance(); + + for (AvatarMultiPath path : player.getAvatars().getMultiPaths().values()) { + data.addMultiPathAvatarInfoList(path.toProto()); + data.addBasicTypeIdList(path.getExcelId()); + } + + for (var entry : player.getCurAvatarPaths().entrySet()) { + var info = CurAvatarPathEntry.newInstance() + .setKey(entry.getKey()) + .setValueValue(entry.getValue()); + + data.addCurAvatarPath(info); + } + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java index a236512..5cd0f51 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketPlayerSyncScNotify.java @@ -1,12 +1,15 @@ package emu.lunarcore.server.packet.send; import java.util.Collection; - import emu.lunarcore.game.avatar.GameAvatar; -import emu.lunarcore.game.avatar.AvatarHeroPath; +import emu.lunarcore.game.avatar.IAvatar; +import emu.lunarcore.game.avatar.AvatarMultiPath; import emu.lunarcore.game.inventory.GameItem; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.BoardDataSyncOuterClass.BoardDataSync; +import emu.lunarcore.proto.MissionSyncOuterClass.MissionSync; +import emu.lunarcore.proto.MissionOuterClass.Mission; +import emu.lunarcore.proto.MissionStatusOuterClass.MissionStatus; import emu.lunarcore.proto.PlayerSyncScNotifyOuterClass.PlayerSyncScNotify; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; @@ -35,16 +38,58 @@ public class PacketPlayerSyncScNotify extends BasePacket { this.setData(data); } + + public PacketPlayerSyncScNotify(IAvatar baseAvatar) { + this(); + + var data = PlayerSyncScNotify.newInstance(); + + if (baseAvatar instanceof GameAvatar avatar) { + data.getMutableAvatarSync().addAvatarList(avatar.toProto()); + + // Also update multipath info + if (avatar.getMultiPath() != null) { + data.addMultiPathAvatarInfoList(avatar.getMultiPath().toProto()); + } + } else if (baseAvatar instanceof AvatarMultiPath multiPath) { + data.addMultiPathAvatarInfoList(multiPath.toProto()); + } + + this.setData(data); + } + + public PacketPlayerSyncScNotify(IAvatar baseAvatar, GameItem item) { + this(); + + var data = PlayerSyncScNotify.newInstance(); + + if (baseAvatar instanceof GameAvatar avatar) { + data.getMutableAvatarSync().addAvatarList(avatar.toProto()); + + // Also update multipath info + if (avatar.getMultiPath() != null) { + data.addMultiPathAvatarInfoList(avatar.getMultiPath().toProto()); + } + } else if (baseAvatar instanceof AvatarMultiPath multiPath) { + data.addMultiPathAvatarInfoList(multiPath.toProto()); + } + + this.addItemToProto(data, item); + + this.setData(data); + } public PacketPlayerSyncScNotify(GameAvatar avatar) { this(); var data = PlayerSyncScNotify.newInstance(); + + // Update avatar data.getMutableAvatarSync().addAvatarList(avatar.toProto()); - // Also update hero basic type info if were updating the main character - if (avatar.getHeroPath() != null) { - data.getMutableBasicTypeInfoList().add(avatar.getHeroPath().toProto()); + // Also update multipath info + if (avatar.getMultiPath() != null) { + data.addMultiPathAvatarInfoList(avatar.getMultiPath().toProto()); } this.setData(data); @@ -54,8 +99,16 @@ public class PacketPlayerSyncScNotify extends BasePacket { this(); var data = PlayerSyncScNotify.newInstance(); + + // Update avatar data.getMutableAvatarSync().addAvatarList(avatar.toProto()); + // Also update multipath info + if (avatar.getMultiPath() != null) { + data.addMultiPathAvatarInfoList(avatar.getMultiPath().toProto()); + } + + // Update item this.addItemToProto(data, item); this.setData(data); @@ -81,8 +134,8 @@ public class PacketPlayerSyncScNotify extends BasePacket { data.getMutableAvatarSync().addAvatarList(avatar.toProto()); // Also update hero basic type info if were updating the main character - if (avatar.getHeroPath() != null) { - data.getMutableBasicTypeInfoList().add(avatar.getHeroPath().toProto()); + if (avatar.getMultiPath() != null) { + data.addMultiPathAvatarInfoList(avatar.getMultiPath().toProto()); } } @@ -126,11 +179,36 @@ public class PacketPlayerSyncScNotify extends BasePacket { } } - public PacketPlayerSyncScNotify(AvatarHeroPath heroPath) { + public PacketPlayerSyncScNotify(AvatarMultiPath... multiPaths) { this(); + var data = PlayerSyncScNotify.newInstance(); + + for (var path : multiPaths) { + if (path != null) { + data.addMultiPathAvatarInfoList(path.toProto()); + } + } + + this.setData(data); + } + + + public PacketPlayerSyncScNotify(int mainMissionId, int[] subMissionIds, MissionStatus missionStatus) { + this(); + + var missionSync = MissionSync.newInstance(); + + for (int subMissionId : subMissionIds) { + missionSync.addMissionList( + Mission.newInstance() + .setId(subMissionId) + .setStatus(missionStatus) + ); + } + var data = PlayerSyncScNotify.newInstance() - .addBasicTypeInfoList(heroPath.toProto()); + .setMissionSync(missionSync); this.setData(data); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketRelicRecommendScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketRelicRecommendScRsp.java new file mode 100644 index 0000000..4ea90c4 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketRelicRecommendScRsp.java @@ -0,0 +1,17 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.RelicRecommendScRspOuterClass.RelicRecommendScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketRelicRecommendScRsp extends BasePacket { + + public PacketRelicRecommendScRsp(int avatarId) { + super(CmdId.RelicRecommendScRsp); + + var data = RelicRecommendScRsp.newInstance() + .setAvatarId(avatarId); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSetAvatarPathScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSetAvatarPathScRsp.java new file mode 100644 index 0000000..543b914 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSetAvatarPathScRsp.java @@ -0,0 +1,22 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.SetAvatarPathScRspOuterClass.SetAvatarPathScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketSetAvatarPathScRsp extends BasePacket { + + public PacketSetAvatarPathScRsp(int pathId) { + super(CmdId.SetAvatarPathScRsp); + + var data = SetAvatarPathScRsp.newInstance(); + + if (pathId != 0) { + data.setAvatarIdValue(pathId); + } else { + data.setRetcode(1); + } + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeroBasicTypeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeroBasicTypeScRsp.java deleted file mode 100644 index f36f83e..0000000 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSetHeroBasicTypeScRsp.java +++ /dev/null @@ -1,18 +0,0 @@ -package emu.lunarcore.server.packet.send; - -import emu.lunarcore.game.player.Player; -import emu.lunarcore.proto.SetHeroBasicTypeScRspOuterClass.SetHeroBasicTypeScRsp; -import emu.lunarcore.server.packet.BasePacket; -import emu.lunarcore.server.packet.CmdId; - -public class PacketSetHeroBasicTypeScRsp extends BasePacket { - - public PacketSetHeroBasicTypeScRsp(Player player) { - super(CmdId.SetHeroBasicTypeScRsp); - - var data = SetHeroBasicTypeScRsp.newInstance() - .setBasicTypeValue(player.getCurBasicType()); - - this.setData(data); - } -}