diff --git a/README.md b/README.md index 416eab7..7a522d7 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.2.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.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)
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 1e3cea2..fe13aec 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 world_level = 11; - */ - private int worldLevel; - - /** - * optional uint32 entity_id = 14; + * optional uint32 entity_id = 4; */ private int entityId; + /** + * optional uint32 world_level = 9; + */ + private int worldLevel; + private ActivateFarmElementCsReq() { } @@ -39,62 +39,25 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 world_level = 11; - * @return whether the worldLevel field is set + * optional uint32 entity_id = 4; + * @return whether the entityId field is set */ - public boolean hasWorldLevel() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 world_level = 11; - * @return this - */ - public ActivateFarmElementCsReq clearWorldLevel() { - bitField0_ &= ~0x00000001; - worldLevel = 0; - return this; - } - - /** - * optional uint32 world_level = 11; - * @return the worldLevel - */ - public int getWorldLevel() { - return worldLevel; - } - - /** - * optional uint32 world_level = 11; - * @param value the worldLevel to set - * @return this - */ - public ActivateFarmElementCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - - /** - * optional uint32 entity_id = 14; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 14; + * optional uint32 entity_id = 4; * @return this */ public ActivateFarmElementCsReq clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 14; + * optional uint32 entity_id = 4; * @return the entityId */ public int getEntityId() { @@ -102,23 +65,60 @@ public final class ActivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 14; + * optional uint32 entity_id = 4; * @param value the entityId to set * @return this */ public ActivateFarmElementCsReq setEntityId(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public ActivateFarmElementCsReq clearWorldLevel() { + bitField0_ &= ~0x00000002; + worldLevel = 0; + return this; + } + + /** + * optional uint32 world_level = 9; + * @return the worldLevel + */ + public int getWorldLevel() { + return worldLevel; + } + + /** + * optional uint32 world_level = 9; + * @param value the worldLevel to set + * @return this + */ + public ActivateFarmElementCsReq setWorldLevel(final int value) { + bitField0_ |= 0x00000002; + worldLevel = value; + return this; + } + @Override public ActivateFarmElementCsReq copyFrom(final ActivateFarmElementCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; entityId = other.entityId; + worldLevel = other.worldLevel; } return this; } @@ -129,12 +129,12 @@ public final class ActivateFarmElementCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); + } return this; } @@ -145,8 +145,8 @@ public final class ActivateFarmElementCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; entityId = 0; + worldLevel = 0; return this; } @@ -170,19 +170,19 @@ public final class ActivateFarmElementCsReqOuterClass { } ActivateFarmElementCsReq other = (ActivateFarmElementCsReq) o; return bitField0_ == other.bitField0_ - && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasEntityId() || entityId == other.entityId); + && (!hasEntityId() || entityId == other.entityId) + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(worldLevel); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(entityId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(worldLevel); } } @@ -190,10 +190,10 @@ public final class ActivateFarmElementCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -205,18 +205,18 @@ public final class ActivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // worldLevel - worldLevel = input.readUInt32(); + case 32: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { - // entityId - entityId = input.readUInt32(); + case 72: { + // worldLevel + worldLevel = 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.worldLevel, worldLevel); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ActivateFarmElementCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ActivateFarmElementCsReqOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class ActivateFarmElementCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + + static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java index 13c87d8..1135f0e 100644 --- a/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ActivateFarmElementScRspOuterClass.java @@ -19,20 +19,20 @@ public final class ActivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 3; - */ - private int entityId; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional uint32 world_level = 14; + * optional uint32 world_level = 11; */ private int worldLevel; + /** + * optional uint32 entity_id = 12; + */ + private int entityId; + private ActivateFarmElementScRsp() { } @@ -44,62 +44,25 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 3; - * @return whether the entityId field is set + * optional uint32 retcode = 10; + * @return whether the retcode field is set */ - public boolean hasEntityId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entity_id = 3; - * @return this - */ - public ActivateFarmElementScRsp 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 ActivateFarmElementScRsp setEntityId(final int value) { - bitField0_ |= 0x00000001; - entityId = 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 = 10; * @return this */ public ActivateFarmElementScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -107,36 +70,36 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ public ActivateFarmElementScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 world_level = 14; + * optional uint32 world_level = 11; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 world_level = 14; + * optional uint32 world_level = 11; * @return this */ public ActivateFarmElementScRsp clearWorldLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; worldLevel = 0; return this; } /** - * optional uint32 world_level = 14; + * optional uint32 world_level = 11; * @return the worldLevel */ public int getWorldLevel() { @@ -144,24 +107,61 @@ public final class ActivateFarmElementScRspOuterClass { } /** - * optional uint32 world_level = 14; + * optional uint32 world_level = 11; * @param value the worldLevel to set * @return this */ public ActivateFarmElementScRsp setWorldLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; worldLevel = value; return this; } + /** + * optional uint32 entity_id = 12; + * @return whether the entityId field is set + */ + public boolean hasEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entity_id = 12; + * @return this + */ + public ActivateFarmElementScRsp clearEntityId() { + bitField0_ &= ~0x00000004; + entityId = 0; + return this; + } + + /** + * optional uint32 entity_id = 12; + * @return the entityId + */ + public int getEntityId() { + return entityId; + } + + /** + * optional uint32 entity_id = 12; + * @param value the entityId to set + * @return this + */ + public ActivateFarmElementScRsp setEntityId(final int value) { + bitField0_ |= 0x00000004; + entityId = value; + return this; + } + @Override public ActivateFarmElementScRsp copyFrom(final ActivateFarmElementScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entityId = other.entityId; retcode = other.retcode; worldLevel = other.worldLevel; + entityId = other.entityId; } return this; } @@ -172,15 +172,15 @@ public final class ActivateFarmElementScRspOuterClass { return this; } cachedSize = -1; - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } + if (other.hasEntityId()) { + setEntityId(other.entityId); + } return this; } @@ -191,9 +191,9 @@ public final class ActivateFarmElementScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - entityId = 0; retcode = 0; worldLevel = 0; + entityId = 0; return this; } @@ -217,39 +217,39 @@ public final class ActivateFarmElementScRspOuterClass { } ActivateFarmElementScRsp other = (ActivateFarmElementScRsp) o; return bitField0_ == other.bitField0_ - && (!hasEntityId() || entityId == other.entityId) && (!hasRetcode() || retcode == other.retcode) - && (!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) 24); - output.writeUInt32NoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(entityId); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + } return size; } @@ -260,27 +260,27 @@ public final class ActivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // entityId - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 80: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 88) { break; } } - case 112: { + case 88: { // worldLevel worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // entityId + entityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class ActivateFarmElementScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entityId, entityId); + } output.endObject(); } @@ -323,23 +323,11 @@ public final class ActivateFarmElementScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { - if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -351,6 +339,18 @@ public final class ActivateFarmElementScRspOuterClass { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { + if (!input.trySkipNullValue()) { + entityId = 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 entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName retcode = FieldName.forField("retcode"); 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/ActivityScheduleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ActivityScheduleInfoOuterClass.java index 275369e..ad54b0b 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 end_time = 9; - */ - private long endTime; - - /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 9; */ private long beginTime; + /** + * optional int64 end_time = 10; + */ + private long endTime; + /** * optional uint32 module_id = 3; */ private int moduleId; /** - * optional uint32 activity_id = 6; + * optional uint32 activity_id = 12; */ private int activityId; @@ -49,62 +49,25 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 end_time = 9; - * @return whether the endTime field is set + * optional int64 begin_time = 9; + * @return whether the beginTime field is set */ - public boolean hasEndTime() { + public boolean hasBeginTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 end_time = 9; - * @return this - */ - public ActivityScheduleInfo clearEndTime() { - bitField0_ &= ~0x00000001; - endTime = 0L; - return this; - } - - /** - * optional int64 end_time = 9; - * @return the endTime - */ - public long getEndTime() { - return endTime; - } - - /** - * optional int64 end_time = 9; - * @param value the endTime to set - * @return this - */ - public ActivityScheduleInfo setEndTime(final long value) { - bitField0_ |= 0x00000001; - endTime = value; - return this; - } - - /** - * optional int64 begin_time = 13; - * @return whether the beginTime field is set - */ - public boolean hasBeginTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 9; * @return this */ public ActivityScheduleInfo clearBeginTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; beginTime = 0L; return this; } /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 9; * @return the beginTime */ public long getBeginTime() { @@ -112,16 +75,53 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional int64 begin_time = 13; + * optional int64 begin_time = 9; * @param value the beginTime to set * @return this */ public ActivityScheduleInfo setBeginTime(final long value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public ActivityScheduleInfo 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 ActivityScheduleInfo setEndTime(final long value) { + bitField0_ |= 0x00000002; + endTime = value; + return this; + } + /** * optional uint32 module_id = 3; * @return whether the moduleId field is set @@ -160,7 +160,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 6; + * optional uint32 activity_id = 12; * @return whether the activityId field is set */ public boolean hasActivityId() { @@ -168,7 +168,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 6; + * optional uint32 activity_id = 12; * @return this */ public ActivityScheduleInfo clearActivityId() { @@ -178,7 +178,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 6; + * optional uint32 activity_id = 12; * @return the activityId */ public int getActivityId() { @@ -186,7 +186,7 @@ public final class ActivityScheduleInfoOuterClass { } /** - * optional uint32 activity_id = 6; + * optional uint32 activity_id = 12; * @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_; - endTime = other.endTime; beginTime = other.beginTime; + endTime = other.endTime; moduleId = other.moduleId; activityId = other.activityId; } @@ -215,12 +215,12 @@ public final class ActivityScheduleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasEndTime()) { - setEndTime(other.endTime); - } if (other.hasBeginTime()) { setBeginTime(other.beginTime); } + if (other.hasEndTime()) { + setEndTime(other.endTime); + } if (other.hasModuleId()) { setModuleId(other.moduleId); } @@ -237,8 +237,8 @@ public final class ActivityScheduleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - endTime = 0L; beginTime = 0L; + endTime = 0L; moduleId = 0; activityId = 0; return this; @@ -264,8 +264,8 @@ public final class ActivityScheduleInfoOuterClass { } ActivityScheduleInfo other = (ActivityScheduleInfo) o; return bitField0_ == other.bitField0_ - && (!hasEndTime() || endTime == other.endTime) && (!hasBeginTime() || beginTime == other.beginTime) + && (!hasEndTime() || endTime == other.endTime) && (!hasModuleId() || moduleId == other.moduleId) && (!hasActivityId() || activityId == other.activityId); } @@ -274,18 +274,18 @@ public final class ActivityScheduleInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 72); - output.writeInt64NoTag(endTime); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 80); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(moduleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 96); 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(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(moduleId); @@ -316,17 +316,17 @@ public final class ActivityScheduleInfoOuterClass { while (true) { switch (tag) { case 72: { - // endTime - endTime = input.readInt64(); + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { - // beginTime - beginTime = input.readInt64(); + case 80: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 24) { @@ -338,11 +338,11 @@ public final class ActivityScheduleInfoOuterClass { moduleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 96) { break; } } - case 48: { + case 96: { // 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.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.moduleId, moduleId); @@ -390,11 +390,11 @@ public final class ActivityScheduleInfoOuterClass { } 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 { @@ -402,11 +402,11 @@ public final class ActivityScheduleInfoOuterClass { } 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 { @@ -491,10 +491,10 @@ public final class ActivityScheduleInfoOuterClass { * 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 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 bdf1df3..d6f3404 100644 --- a/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ApplyFriendCsReqOuterClass.java @@ -24,7 +24,7 @@ public final class ApplyFriendCsReqOuterClass { private int uid; /** - * optional .FriendApplySource source = 5; + * optional .FriendApplySource source = 14; */ private int source; @@ -76,7 +76,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 5; + * optional .FriendApplySource source = 14; * @return whether the source field is set */ public boolean hasSource() { @@ -84,7 +84,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 5; + * optional .FriendApplySource source = 14; * @return this */ public ApplyFriendCsReq clearSource() { @@ -94,7 +94,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 5; + * optional .FriendApplySource source = 14; * @return the source */ public FriendApplySourceOuterClass.FriendApplySource getSource() { @@ -127,7 +127,7 @@ public final class ApplyFriendCsReqOuterClass { } /** - * optional .FriendApplySource source = 5; + * optional .FriendApplySource source = 14; * @param value the source to set * @return this */ @@ -206,7 +206,7 @@ public final class ApplyFriendCsReqOuterClass { output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeEnumNoTag(source); } } @@ -235,11 +235,11 @@ public final class ApplyFriendCsReqOuterClass { uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 112) { break; } } - case 40: { + case 112: { // 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 1a26098..332542c 100644 --- a/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ArchiveDataOuterClass.java @@ -22,34 +22,21 @@ public final class ArchiveDataOuterClass { /** * 
-     *  isnt used
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
      *
* - * repeated uint32 archive_missing_avatar_id_list = 2; - */ - private final RepeatedInt archiveMissingAvatarIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 archive_equipment_id_list = 5; + * repeated uint32 archive_equipment_id_list = 14; */ private final RepeatedInt archiveEquipmentIdList = RepeatedInt.newEmptyInstance(); /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_id_list = 14; - */ - private final RepeatedInt archiveMissingEquipmentIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_id_list = 3; */ private final RepeatedMessage archiveMonsterIdList = RepeatedMessage.newEmptyInstance(MonsterArchiveOuterClass.MonsterArchive.getFactory()); /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive relic_list = 11; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicArchiveOuterClass.RelicArchive.getFactory()); @@ -65,116 +52,39 @@ public final class ArchiveDataOuterClass { /** * 
-     *  isnt used
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
      *
* - * repeated uint32 archive_missing_avatar_id_list = 2; - * @return whether the archiveMissingAvatarIdList field is set + * repeated uint32 archive_equipment_id_list = 14; + * @return whether the archiveEquipmentIdList field is set */ - public boolean hasArchiveMissingAvatarIdList() { + public boolean hasArchiveEquipmentIdList() { return (bitField0_ & 0x00000001) != 0; } /** * 
-     *  isnt used
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
      *
* - * repeated uint32 archive_missing_avatar_id_list = 2; - * @return this - */ - public ArchiveData clearArchiveMissingAvatarIdList() { - bitField0_ &= ~0x00000001; - archiveMissingAvatarIdList.clear(); - return this; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_avatar_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. - * - * Use {@link #getMutableArchiveMissingAvatarIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getArchiveMissingAvatarIdList() { - return archiveMissingAvatarIdList; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_avatar_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableArchiveMissingAvatarIdList() { - bitField0_ |= 0x00000001; - return archiveMissingAvatarIdList; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_avatar_id_list = 2; - * @param value the archiveMissingAvatarIdList to add - * @return this - */ - public ArchiveData addArchiveMissingAvatarIdList(final int value) { - bitField0_ |= 0x00000001; - archiveMissingAvatarIdList.add(value); - return this; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_avatar_id_list = 2; - * @param values the archiveMissingAvatarIdList to add - * @return this - */ - public ArchiveData addAllArchiveMissingAvatarIdList(final int... values) { - bitField0_ |= 0x00000001; - archiveMissingAvatarIdList.addAll(values); - return this; - } - - /** - * repeated uint32 archive_equipment_id_list = 5; - * @return whether the archiveEquipmentIdList field is set - */ - public boolean hasArchiveEquipmentIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 archive_equipment_id_list = 5; + * repeated uint32 archive_equipment_id_list = 14; * @return this */ public ArchiveData clearArchiveEquipmentIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; archiveEquipmentIdList.clear(); return this; } /** - * repeated uint32 archive_equipment_id_list = 5; + * 
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
+     *
+ * + * repeated uint32 archive_equipment_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. @@ -188,7 +98,12 @@ public final class ArchiveDataOuterClass { } /** - * repeated uint32 archive_equipment_id_list = 5; + * 
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
+     *
+ * + * repeated uint32 archive_equipment_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 @@ -197,144 +112,62 @@ public final class ArchiveDataOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableArchiveEquipmentIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return archiveEquipmentIdList; } /** - * repeated uint32 archive_equipment_id_list = 5; + * 
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
+     *
+ * + * repeated uint32 archive_equipment_id_list = 14; * @param value the archiveEquipmentIdList to add * @return this */ public ArchiveData addArchiveEquipmentIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; archiveEquipmentIdList.add(value); return this; } /** - * repeated uint32 archive_equipment_id_list = 5; + * 
+     *  repeated uint32 archive_missing_avatar_id_list = 2; // isnt used
+     *  repeated uint32 archive_missing_equipment_id_list = 14; // isnt used
+     *
+ * + * repeated uint32 archive_equipment_id_list = 14; * @param values the archiveEquipmentIdList to add * @return this */ public ArchiveData addAllArchiveEquipmentIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; archiveEquipmentIdList.addAll(values); return this; } /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_id_list = 14; - * @return whether the archiveMissingEquipmentIdList field is set - */ - public boolean hasArchiveMissingEquipmentIdList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_id_list = 14; - * @return this - */ - public ArchiveData clearArchiveMissingEquipmentIdList() { - bitField0_ &= ~0x00000004; - archiveMissingEquipmentIdList.clear(); - return this; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_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. - * - * Use {@link #getMutableArchiveMissingEquipmentIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getArchiveMissingEquipmentIdList() { - return archiveMissingEquipmentIdList; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableArchiveMissingEquipmentIdList() { - bitField0_ |= 0x00000004; - return archiveMissingEquipmentIdList; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_id_list = 14; - * @param value the archiveMissingEquipmentIdList to add - * @return this - */ - public ArchiveData addArchiveMissingEquipmentIdList(final int value) { - bitField0_ |= 0x00000004; - archiveMissingEquipmentIdList.add(value); - return this; - } - - /** - * 
-     *  isnt used
-     *
- * - * repeated uint32 archive_missing_equipment_id_list = 14; - * @param values the archiveMissingEquipmentIdList to add - * @return this - */ - public ArchiveData addAllArchiveMissingEquipmentIdList(final int... values) { - bitField0_ |= 0x00000004; - archiveMissingEquipmentIdList.addAll(values); - return this; - } - - /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_id_list = 3; * @return whether the archiveMonsterIdList field is set */ public boolean hasArchiveMonsterIdList() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_id_list = 3; * @return this */ public ArchiveData clearArchiveMonsterIdList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; archiveMonsterIdList.clear(); return this; } /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_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. @@ -348,7 +181,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_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 @@ -358,54 +191,54 @@ public final class ArchiveDataOuterClass { */ public RepeatedMessage getMutableArchiveMonsterIdList( ) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return archiveMonsterIdList; } /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_id_list = 3; * @param value the archiveMonsterIdList to add * @return this */ public ArchiveData addArchiveMonsterIdList( final MonsterArchiveOuterClass.MonsterArchive value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; archiveMonsterIdList.add(value); return this; } /** - * repeated .MonsterArchive archive_monster_id_list = 8; + * repeated .MonsterArchive archive_monster_id_list = 3; * @param values the archiveMonsterIdList to add * @return this */ public ArchiveData addAllArchiveMonsterIdList( final MonsterArchiveOuterClass.MonsterArchive... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; archiveMonsterIdList.addAll(values); return this; } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive relic_list = 11; * @return whether the relicList field is set */ public boolean hasRelicList() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive relic_list = 11; * @return this */ public ArchiveData clearRelicList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; relicList.clear(); return this; } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive 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. @@ -419,7 +252,7 @@ public final class ArchiveDataOuterClass { } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive 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 @@ -428,28 +261,28 @@ public final class ArchiveDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return relicList; } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive relic_list = 11; * @param value the relicList to add * @return this */ public ArchiveData addRelicList(final RelicArchiveOuterClass.RelicArchive value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; relicList.add(value); return this; } /** - * repeated .RelicArchive relic_list = 10; + * repeated .RelicArchive relic_list = 11; * @param values the relicList to add * @return this */ public ArchiveData addAllRelicList(final RelicArchiveOuterClass.RelicArchive... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; relicList.addAll(values); return this; } @@ -459,9 +292,7 @@ public final class ArchiveDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - archiveMissingAvatarIdList.copyFrom(other.archiveMissingAvatarIdList); archiveEquipmentIdList.copyFrom(other.archiveEquipmentIdList); - archiveMissingEquipmentIdList.copyFrom(other.archiveMissingEquipmentIdList); archiveMonsterIdList.copyFrom(other.archiveMonsterIdList); relicList.copyFrom(other.relicList); } @@ -474,15 +305,9 @@ public final class ArchiveDataOuterClass { return this; } cachedSize = -1; - if (other.hasArchiveMissingAvatarIdList()) { - getMutableArchiveMissingAvatarIdList().addAll(other.archiveMissingAvatarIdList); - } if (other.hasArchiveEquipmentIdList()) { getMutableArchiveEquipmentIdList().addAll(other.archiveEquipmentIdList); } - if (other.hasArchiveMissingEquipmentIdList()) { - getMutableArchiveMissingEquipmentIdList().addAll(other.archiveMissingEquipmentIdList); - } if (other.hasArchiveMonsterIdList()) { getMutableArchiveMonsterIdList().addAll(other.archiveMonsterIdList); } @@ -499,9 +324,7 @@ public final class ArchiveDataOuterClass { } cachedSize = -1; bitField0_ = 0; - archiveMissingAvatarIdList.clear(); archiveEquipmentIdList.clear(); - archiveMissingEquipmentIdList.clear(); archiveMonsterIdList.clear(); relicList.clear(); return this; @@ -514,9 +337,7 @@ public final class ArchiveDataOuterClass { } cachedSize = -1; bitField0_ = 0; - archiveMissingAvatarIdList.clear(); archiveEquipmentIdList.clear(); - archiveMissingEquipmentIdList.clear(); archiveMonsterIdList.clearQuick(); relicList.clearQuick(); return this; @@ -532,9 +353,7 @@ public final class ArchiveDataOuterClass { } ArchiveData other = (ArchiveData) o; return bitField0_ == other.bitField0_ - && (!hasArchiveMissingAvatarIdList() || archiveMissingAvatarIdList.equals(other.archiveMissingAvatarIdList)) && (!hasArchiveEquipmentIdList() || archiveEquipmentIdList.equals(other.archiveEquipmentIdList)) - && (!hasArchiveMissingEquipmentIdList() || archiveMissingEquipmentIdList.equals(other.archiveMissingEquipmentIdList)) && (!hasArchiveMonsterIdList() || archiveMonsterIdList.equals(other.archiveMonsterIdList)) && (!hasRelicList() || relicList.equals(other.relicList)); } @@ -542,32 +361,20 @@ public final class ArchiveDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < archiveMissingAvatarIdList.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(archiveMissingAvatarIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < archiveEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(archiveEquipmentIdList.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < archiveMissingEquipmentIdList.length(); i++) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(archiveMissingEquipmentIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < archiveMonsterIdList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 26); output.writeMessageNoTag(archiveMonsterIdList.get(i)); } } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 90); output.writeMessageNoTag(relicList.get(i)); } } @@ -577,18 +384,12 @@ public final class ArchiveDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * archiveMissingAvatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingAvatarIdList); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * archiveEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveEquipmentIdList); } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * archiveMissingEquipmentIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveMissingEquipmentIdList); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * archiveMonsterIdList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(archiveMonsterIdList); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } return size; @@ -601,45 +402,27 @@ public final class ArchiveDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // archiveMissingAvatarIdList [packed=true] - input.readPackedUInt32(archiveMissingAvatarIdList, tag); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 42) { - break; - } - } - case 42: { + case 114: { // archiveEquipmentIdList [packed=true] input.readPackedUInt32(archiveEquipmentIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 26) { break; } } - case 114: { - // archiveMissingEquipmentIdList [packed=true] - input.readPackedUInt32(archiveMissingEquipmentIdList, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 66) { - break; - } - } - case 66: { + case 26: { // archiveMonsterIdList tag = input.readRepeatedMessage(archiveMonsterIdList, tag); - bitField0_ |= 0x00000008; - if (tag != 82) { + bitField0_ |= 0x00000002; + if (tag != 90) { break; } } - case 82: { + case 90: { // relicList tag = input.readRepeatedMessage(relicList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; if (tag != 0) { break; } @@ -654,22 +437,10 @@ public final class ArchiveDataOuterClass { tag = input.readTag(); break; } - case 16: { - // archiveMissingAvatarIdList [packed=false] - tag = input.readRepeatedUInt32(archiveMissingAvatarIdList, tag); - bitField0_ |= 0x00000001; - break; - } - case 40: { + case 112: { // archiveEquipmentIdList [packed=false] tag = input.readRepeatedUInt32(archiveEquipmentIdList, tag); - bitField0_ |= 0x00000002; - break; - } - case 112: { - // archiveMissingEquipmentIdList [packed=false] - tag = input.readRepeatedUInt32(archiveMissingEquipmentIdList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; break; } } @@ -680,18 +451,12 @@ public final class ArchiveDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveMissingAvatarIdList, archiveMissingAvatarIdList); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.archiveEquipmentIdList, archiveEquipmentIdList); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.archiveMissingEquipmentIdList, archiveMissingEquipmentIdList); - } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.archiveMonsterIdList, archiveMonsterIdList); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } output.endObject(); @@ -704,36 +469,12 @@ public final class ArchiveDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 891812726: - case 1757924466: { - if (input.isAtField(FieldNames.archiveMissingAvatarIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveMissingAvatarIdList); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 1521227365: case 967463252: { if (input.isAtField(FieldNames.archiveEquipmentIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(archiveEquipmentIdList); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1781811363: - case 1210317755: { - if (input.isAtField(FieldNames.archiveMissingEquipmentIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(archiveMissingEquipmentIdList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -745,7 +486,7 @@ public final class ArchiveDataOuterClass { if (input.isAtField(FieldNames.archiveMonsterIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(archiveMonsterIdList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -757,7 +498,7 @@ public final class ArchiveDataOuterClass { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -816,12 +557,8 @@ public final class ArchiveDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName archiveMissingAvatarIdList = FieldName.forField("archiveMissingAvatarIdList", "archive_missing_avatar_id_list"); - static final FieldName archiveEquipmentIdList = FieldName.forField("archiveEquipmentIdList", "archive_equipment_id_list"); - static final FieldName archiveMissingEquipmentIdList = FieldName.forField("archiveMissingEquipmentIdList", "archive_missing_equipment_id_list"); - static final FieldName archiveMonsterIdList = FieldName.forField("archiveMonsterIdList", "archive_monster_id_list"); static final FieldName relicList = FieldName.forField("relicList", "relic_list"); diff --git a/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/AssistMonsterWaveOuterClass.java index 982db4c..aceede1 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 = 10; + * repeated uint32 entity_id_list = 2; */ private final RepeatedInt entityIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_id_list = 2; * @return whether the entityIdList field is set */ public boolean hasEntityIdList() { @@ -43,7 +43,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_id_list = 2; * @return this */ public AssistMonsterWave clearEntityIdList() { @@ -53,7 +53,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_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 AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_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 AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_id_list = 2; * @param value the entityIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class AssistMonsterWaveOuterClass { } /** - * repeated uint32 entity_id_list = 10; + * repeated uint32 entity_id_list = 2; * @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) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(entityIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class AssistMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 18: { // entityIdList [packed=true] input.readPackedUInt32(entityIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class AssistMonsterWaveOuterClass { tag = input.readTag(); break; } - case 80: { + case 16: { // 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 e692587..606bc12 100644 --- a/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/AssistSimpleInfoOuterClass.java @@ -19,25 +19,25 @@ public final class AssistSimpleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 avatar_id = 7; - */ - private int avatarId; - - /** - * optional uint32 level = 8; + * optional uint32 level = 1; */ private int level; /** - * optional uint32 dressed_skin_id = 11; + * optional uint32 avatar_id = 3; */ - private int dressedSkinId; + private int avatarId; /** - * optional uint32 pos = 14; + * optional uint32 pos = 6; */ private int pos; + /** + * optional uint32 dressed_skin_id = 10; + */ + private int dressedSkinId; + private AssistSimpleInfo() { } @@ -49,62 +49,25 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 avatar_id = 7; - * @return whether the avatarId field is set + * optional uint32 level = 1; + * @return whether the level field is set */ - public boolean hasAvatarId() { + public boolean hasLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 7; - * @return this - */ - public AssistSimpleInfo clearAvatarId() { - bitField0_ &= ~0x00000001; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 7; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 7; - * @param value the avatarId to set - * @return this - */ - public AssistSimpleInfo setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = 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 = 1; * @return this */ public AssistSimpleInfo clearLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; level = 0; return this; } /** - * optional uint32 level = 8; + * optional uint32 level = 1; * @return the level */ public int getLevel() { @@ -112,73 +75,73 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 1; * @param value the level to set * @return this */ public AssistSimpleInfo setLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; level = value; return this; } /** - * optional uint32 dressed_skin_id = 11; - * @return whether the dressedSkinId field is set + * optional uint32 avatar_id = 3; + * @return whether the avatarId field is set */ - public boolean hasDressedSkinId() { + public boolean hasAvatarId() { + 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 dressed_skin_id = 11; - * @return this - */ - public AssistSimpleInfo clearDressedSkinId() { - bitField0_ &= ~0x00000004; - dressedSkinId = 0; - return this; - } - - /** - * optional uint32 dressed_skin_id = 11; - * @return the dressedSkinId - */ - public int getDressedSkinId() { - return dressedSkinId; - } - - /** - * optional uint32 dressed_skin_id = 11; - * @param value the dressedSkinId to set - * @return this - */ - public AssistSimpleInfo setDressedSkinId(final int value) { - bitField0_ |= 0x00000004; - dressedSkinId = value; - return this; - } - - /** - * optional uint32 pos = 14; - * @return whether the pos field is set - */ - public boolean hasPos() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 pos = 14; + * optional uint32 pos = 6; * @return this */ public AssistSimpleInfo clearPos() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; pos = 0; return this; } /** - * optional uint32 pos = 14; + * optional uint32 pos = 6; * @return the pos */ public int getPos() { @@ -186,25 +149,62 @@ public final class AssistSimpleInfoOuterClass { } /** - * optional uint32 pos = 14; + * optional uint32 pos = 6; * @param value the pos to set * @return this */ public AssistSimpleInfo setPos(final int value) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public AssistSimpleInfo clearDressedSkinId() { + bitField0_ &= ~0x00000008; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 10; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 10; + * @param value the dressedSkinId to set + * @return this + */ + public AssistSimpleInfo setDressedSkinId(final int value) { + bitField0_ |= 0x00000008; + dressedSkinId = value; + return this; + } + @Override public AssistSimpleInfo copyFrom(final AssistSimpleInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; level = other.level; - dressedSkinId = other.dressedSkinId; + avatarId = other.avatarId; pos = other.pos; + dressedSkinId = other.dressedSkinId; } return this; } @@ -215,18 +215,18 @@ public final class AssistSimpleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } 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; } @@ -237,10 +237,10 @@ public final class AssistSimpleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; level = 0; - dressedSkinId = 0; + avatarId = 0; pos = 0; + dressedSkinId = 0; return this; } @@ -264,29 +264,29 @@ public final class AssistSimpleInfoOuterClass { } AssistSimpleInfo other = (AssistSimpleInfo) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) && (!hasLevel() || level == other.level) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) - && (!hasPos() || pos == other.pos); + && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasPos() || pos == other.pos) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(avatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(avatarId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(dressedSkinId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(pos); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(dressedSkinId); } } @@ -294,16 +294,16 @@ public final class AssistSimpleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } return size; } @@ -315,36 +315,36 @@ public final class AssistSimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // avatarId - avatarId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 8: { // level level = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 48) { break; } } - case 88: { - // dressedSkinId - dressedSkinId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 48: { // pos pos = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class AssistSimpleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.avatarId, avatarId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.pos, pos); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.pos, pos); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } output.endObject(); } @@ -390,11 +390,10 @@ public final class AssistSimpleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,10 +401,11 @@ public final class AssistSimpleInfoOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -413,22 +413,22 @@ public final class AssistSimpleInfoOuterClass { } break; } + case 111188: { + 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_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 111188: { - if (input.isAtField(FieldNames.pos)) { - if (!input.trySkipNullValue()) { - pos = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -489,13 +489,13 @@ public final class AssistSimpleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - 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 721a74f..26e5922 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 = 5; + * optional uint32 base_avatar_id = 2; */ private int baseAvatarId; /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 2; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -47,7 +47,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 2; * @return this */ public AvatarExpUpCsReq clearBaseAvatarId() { @@ -57,7 +57,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 2; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -65,7 +65,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 5; + * optional uint32 base_avatar_id = 2; * @param value the baseAvatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_list = 8; * @return this */ public AvatarExpUpCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class AvatarExpUpCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 6; + * optional .ItemCostList item_cost_list = 8; * @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) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class AvatarExpUpCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 66) { break; } } - case 50: { + case 66: { // 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 ffd757f..db165f9 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 = 10; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem return_item_list = 5; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return this */ public AvatarExpUpScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem return_item_list = 5; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem return_item_list = 5; * @return this */ public AvatarExpUpScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem 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. @@ -109,7 +109,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem 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 @@ -123,7 +123,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem return_item_list = 5; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class AvatarExpUpScRspOuterClass { } /** - * repeated .PileItem return_item_list = 1; + * repeated .PileItem return_item_list = 5; * @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) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class AvatarExpUpScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // 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 228526c..8933e5c 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 = 2; + * optional uint64 first_met_timestamp = 14; */ private long firstMetTimestamp; /** - * optional uint32 dressed_skin_id = 1; - */ - private int dressedSkinId; - - /** - * optional uint32 promotion = 4; - */ - private int promotion; - - /** - * optional uint32 equipment_unique_id = 6; - */ - private int equipmentUniqueId; - - /** - * optional uint32 exp = 9; - */ - private int exp; - - /** - * optional uint32 level = 13; - */ - private int level; - - /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 1; */ private int baseAvatarId; /** - * optional uint32 rank = 15; + * 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; */ private int rank; /** - * optional bool is_marked = 10; + * optional uint32 promotion = 13; + */ + private int promotion; + + /** + * optional uint32 dressed_skin_id = 15; + */ + private int dressedSkinId; + + /** + * optional bool is_marked = 2; */ private boolean isMarked; /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 6; */ private final RepeatedInt takenRewards = RepeatedInt.newEmptyInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 3; - */ - private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); - - /** - * repeated .EquipRelic equip_relic_list = 5; + * repeated .EquipRelic equip_relic_list = 7; */ private final RepeatedMessage equipRelicList = RepeatedMessage.newEmptyInstance(EquipRelicOuterClass.EquipRelic.getFactory()); + /** + * repeated .AvatarSkillTree skilltree_list = 12; + */ + private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + private Avatar() { } @@ -91,7 +91,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 2; + * optional uint64 first_met_timestamp = 14; * @return whether the firstMetTimestamp field is set */ public boolean hasFirstMetTimestamp() { @@ -99,7 +99,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 2; + * optional uint64 first_met_timestamp = 14; * @return this */ public Avatar clearFirstMetTimestamp() { @@ -109,7 +109,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 2; + * optional uint64 first_met_timestamp = 14; * @return the firstMetTimestamp */ public long getFirstMetTimestamp() { @@ -117,7 +117,7 @@ public final class AvatarOuterClass { } /** - * optional uint64 first_met_timestamp = 2; + * optional uint64 first_met_timestamp = 14; * @param value the firstMetTimestamp to set * @return this */ @@ -128,99 +128,62 @@ public final class AvatarOuterClass { } /** - * optional uint32 dressed_skin_id = 1; - * @return whether the dressedSkinId field is set + * optional uint32 base_avatar_id = 1; + * @return whether the baseAvatarId field is set */ - public boolean hasDressedSkinId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 dressed_skin_id = 1; + * optional uint32 base_avatar_id = 1; * @return this */ - public Avatar clearDressedSkinId() { + public Avatar clearBaseAvatarId() { bitField0_ &= ~0x00000002; - dressedSkinId = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 dressed_skin_id = 1; - * @return the dressedSkinId + * optional uint32 base_avatar_id = 1; + * @return the baseAvatarId */ - public int getDressedSkinId() { - return dressedSkinId; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 dressed_skin_id = 1; - * @param value the dressedSkinId to set + * optional uint32 base_avatar_id = 1; + * @param value the baseAvatarId to set * @return this */ - public Avatar setDressedSkinId(final int value) { + public Avatar setBaseAvatarId(final int value) { bitField0_ |= 0x00000002; - dressedSkinId = value; + baseAvatarId = value; return this; } /** - * optional uint32 promotion = 4; - * @return whether the promotion field is set + * optional uint32 equipment_unique_id = 5; + * @return whether the equipmentUniqueId field is set */ - public boolean hasPromotion() { + public boolean hasEquipmentUniqueId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 promotion = 4; - * @return this - */ - public Avatar clearPromotion() { - bitField0_ &= ~0x00000004; - 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 Avatar setPromotion(final int value) { - bitField0_ |= 0x00000004; - promotion = value; - return this; - } - - /** - * optional uint32 equipment_unique_id = 6; - * @return whether the equipmentUniqueId field is set - */ - public boolean hasEquipmentUniqueId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @return this */ public Avatar clearEquipmentUniqueId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; equipmentUniqueId = 0; return this; } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -228,18 +191,55 @@ public final class AvatarOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 5; * @param value the equipmentUniqueId to set * @return this */ public Avatar setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; equipmentUniqueId = value; return this; } /** - * optional uint32 exp = 9; + * 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() { @@ -247,7 +247,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @return this */ public Avatar clearExp() { @@ -257,7 +257,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @return the exp */ public int getExp() { @@ -265,7 +265,7 @@ public final class AvatarOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 10; * @param value the exp to set * @return this */ @@ -276,99 +276,25 @@ public final class AvatarOuterClass { } /** - * optional uint32 level = 13; - * @return whether the level field is set + * optional uint32 rank = 11; + * @return whether the rank field is set */ - public boolean hasLevel() { + public boolean hasRank() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 level = 13; - * @return this - */ - public Avatar 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 Avatar setLevel(final int value) { - bitField0_ |= 0x00000020; - level = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 14; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional uint32 base_avatar_id = 14; - * @return this - */ - public Avatar clearBaseAvatarId() { - bitField0_ &= ~0x00000040; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 14; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 14; - * @param value the baseAvatarId to set - * @return this - */ - public Avatar setBaseAvatarId(final int value) { - bitField0_ |= 0x00000040; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 rank = 15; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional uint32 rank = 15; + * optional uint32 rank = 11; * @return this */ public Avatar clearRank() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; rank = 0; return this; } /** - * optional uint32 rank = 15; + * optional uint32 rank = 11; * @return the rank */ public int getRank() { @@ -376,18 +302,92 @@ public final class AvatarOuterClass { } /** - * optional uint32 rank = 15; + * optional uint32 rank = 11; * @param value the rank to set * @return this */ public Avatar setRank(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; rank = value; return this; } /** - * optional bool is_marked = 10; + * optional uint32 promotion = 13; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional uint32 promotion = 13; + * @return this + */ + public Avatar clearPromotion() { + bitField0_ &= ~0x00000040; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 13; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 13; + * @param value the promotion to set + * @return this + */ + public Avatar setPromotion(final int value) { + bitField0_ |= 0x00000040; + promotion = value; + return this; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @return whether the dressedSkinId field is set + */ + public boolean hasDressedSkinId() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @return this + */ + public Avatar clearDressedSkinId() { + bitField0_ &= ~0x00000080; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 15; + * @param value the dressedSkinId to set + * @return this + */ + public Avatar setDressedSkinId(final int value) { + bitField0_ |= 0x00000080; + dressedSkinId = value; + return this; + } + + /** + * optional bool is_marked = 2; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -395,7 +395,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @return this */ public Avatar clearIsMarked() { @@ -405,7 +405,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @return the isMarked */ public boolean getIsMarked() { @@ -413,7 +413,7 @@ public final class AvatarOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @param value the isMarked to set * @return this */ @@ -424,7 +424,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 6; * @return whether the takenRewards field is set */ public boolean hasTakenRewards() { @@ -432,7 +432,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 6; * @return this */ public Avatar clearTakenRewards() { @@ -442,7 +442,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 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. @@ -456,7 +456,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 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 @@ -470,7 +470,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 6; * @param value the takenRewards to add * @return this */ @@ -481,7 +481,7 @@ public final class AvatarOuterClass { } /** - * repeated uint32 taken_rewards = 8; + * repeated uint32 taken_rewards = 6; * @param values the takenRewards to add * @return this */ @@ -492,93 +492,25 @@ public final class AvatarOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 3; - * @return whether the skilltreeList field is set + * repeated .EquipRelic equip_relic_list = 7; + * @return whether the equipRelicList field is set */ - public boolean hasSkilltreeList() { + public boolean hasEquipRelicList() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .AvatarSkillTree skilltree_list = 3; - * @return this - */ - public Avatar clearSkilltreeList() { - bitField0_ &= ~0x00000400; - skilltreeList.clear(); - return this; - } - - /** - * repeated .AvatarSkillTree 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 #getMutableSkilltreeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getSkilltreeList() { - return skilltreeList; - } - - /** - * repeated .AvatarSkillTree 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 getMutableSkilltreeList() { - bitField0_ |= 0x00000400; - return skilltreeList; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 3; - * @param value the skilltreeList to add - * @return this - */ - public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) { - bitField0_ |= 0x00000400; - skilltreeList.add(value); - return this; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 3; - * @param values the skilltreeList to add - * @return this - */ - public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { - bitField0_ |= 0x00000400; - skilltreeList.addAll(values); - return this; - } - - /** - * repeated .EquipRelic equip_relic_list = 5; - * @return whether the equipRelicList field is set - */ - public boolean hasEquipRelicList() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .EquipRelic equip_relic_list = 5; + * repeated .EquipRelic equip_relic_list = 7; * @return this */ public Avatar clearEquipRelicList() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00000400; equipRelicList.clear(); return this; } /** - * repeated .EquipRelic equip_relic_list = 5; + * 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. @@ -592,7 +524,7 @@ public final class AvatarOuterClass { } /** - * repeated .EquipRelic equip_relic_list = 5; + * 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 @@ -601,49 +533,117 @@ public final class AvatarOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipRelicList() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return equipRelicList; } /** - * repeated .EquipRelic equip_relic_list = 5; + * repeated .EquipRelic equip_relic_list = 7; * @param value the equipRelicList to add * @return this */ public Avatar addEquipRelicList(final EquipRelicOuterClass.EquipRelic value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; equipRelicList.add(value); return this; } /** - * repeated .EquipRelic equip_relic_list = 5; + * repeated .EquipRelic equip_relic_list = 7; * @param values the equipRelicList to add * @return this */ public Avatar addAllEquipRelicList(final EquipRelicOuterClass.EquipRelic... values) { - bitField0_ |= 0x00000800; + 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; + * @return this + */ + public Avatar clearSkilltreeList() { + bitField0_ &= ~0x00000800; + skilltreeList.clear(); + return this; + } + + /** + * repeated .AvatarSkillTree skilltree_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 #getMutableSkilltreeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getSkilltreeList() { + return skilltreeList; + } + + /** + * repeated .AvatarSkillTree skilltree_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 getMutableSkilltreeList() { + bitField0_ |= 0x00000800; + return skilltreeList; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 12; + * @param value the skilltreeList to add + * @return this + */ + public Avatar addSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + bitField0_ |= 0x00000800; + skilltreeList.add(value); + return this; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 12; + * @param values the skilltreeList to add + * @return this + */ + public Avatar addAllSkilltreeList(final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + bitField0_ |= 0x00000800; + skilltreeList.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; - dressedSkinId = other.dressedSkinId; - promotion = other.promotion; - equipmentUniqueId = other.equipmentUniqueId; - exp = other.exp; - level = other.level; baseAvatarId = other.baseAvatarId; + equipmentUniqueId = other.equipmentUniqueId; + level = other.level; + exp = other.exp; rank = other.rank; + promotion = other.promotion; + dressedSkinId = other.dressedSkinId; isMarked = other.isMarked; takenRewards.copyFrom(other.takenRewards); - skilltreeList.copyFrom(other.skilltreeList); equipRelicList.copyFrom(other.equipRelicList); + skilltreeList.copyFrom(other.skilltreeList); } return this; } @@ -657,39 +657,39 @@ public final class AvatarOuterClass { if (other.hasFirstMetTimestamp()) { setFirstMetTimestamp(other.firstMetTimestamp); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); - } - if (other.hasPromotion()) { - setPromotion(other.promotion); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasEquipmentUniqueId()) { setEquipmentUniqueId(other.equipmentUniqueId); } - if (other.hasExp()) { - setExp(other.exp); - } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasExp()) { + setExp(other.exp); } if (other.hasRank()) { setRank(other.rank); } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } + if (other.hasDressedSkinId()) { + setDressedSkinId(other.dressedSkinId); + } if (other.hasIsMarked()) { setIsMarked(other.isMarked); } if (other.hasTakenRewards()) { getMutableTakenRewards().addAll(other.takenRewards); } - if (other.hasSkilltreeList()) { - getMutableSkilltreeList().addAll(other.skilltreeList); - } if (other.hasEquipRelicList()) { getMutableEquipRelicList().addAll(other.equipRelicList); } + if (other.hasSkilltreeList()) { + getMutableSkilltreeList().addAll(other.skilltreeList); + } return this; } @@ -701,17 +701,17 @@ public final class AvatarOuterClass { cachedSize = -1; bitField0_ = 0; firstMetTimestamp = 0L; - dressedSkinId = 0; - promotion = 0; - equipmentUniqueId = 0; - exp = 0; - level = 0; baseAvatarId = 0; + equipmentUniqueId = 0; + level = 0; + exp = 0; rank = 0; + promotion = 0; + dressedSkinId = 0; isMarked = false; takenRewards.clear(); - skilltreeList.clear(); equipRelicList.clear(); + skilltreeList.clear(); return this; } @@ -723,8 +723,8 @@ public final class AvatarOuterClass { cachedSize = -1; bitField0_ = 0; takenRewards.clear(); - skilltreeList.clearQuick(); equipRelicList.clearQuick(); + skilltreeList.clearQuick(); return this; } @@ -739,73 +739,73 @@ public final class AvatarOuterClass { Avatar other = (Avatar) o; return bitField0_ == other.bitField0_ && (!hasFirstMetTimestamp() || firstMetTimestamp == other.firstMetTimestamp) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) - && (!hasPromotion() || promotion == other.promotion) - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) - && (!hasExp() || exp == other.exp) - && (!hasLevel() || level == other.level) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) + && (!hasLevel() || level == other.level) + && (!hasExp() || exp == other.exp) && (!hasRank() || rank == other.rank) + && (!hasPromotion() || promotion == other.promotion) + && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) && (!hasIsMarked() || isMarked == other.isMarked) && (!hasTakenRewards() || takenRewards.equals(other.takenRewards)) - && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) - && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)); + && (!hasEquipRelicList() || equipRelicList.equals(other.equipRelicList)) + && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt64NoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(dressedSkinId); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(equipmentUniqueId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(rank); + output.writeUInt32NoTag(dressedSkinId); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isMarked); } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < takenRewards.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(takenRewards.array()[i]); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(skilltreeList.get(i)); + for (int i = 0; i < equipRelicList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(equipRelicList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { - for (int i = 0; i < equipRelicList.length(); i++) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(equipRelicList.get(i)); + for (int i = 0; i < skilltreeList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(skilltreeList.get(i)); } } } @@ -817,25 +817,25 @@ public final class AvatarOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(firstMetTimestamp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); } 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 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); + size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); } if ((bitField0_ & 0x00000800) != 0) { - size += (1 * equipRelicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipRelicList); + size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } return size; } @@ -859,7 +859,7 @@ public final class AvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 112: { // firstMetTimestamp firstMetTimestamp = input.readUInt64(); bitField0_ |= 0x00000001; @@ -869,53 +869,53 @@ public final class AvatarOuterClass { } } case 8: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 40: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // exp exp = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 120) { @@ -923,43 +923,43 @@ public final class AvatarOuterClass { } } case 120: { - // rank - rank = input.readUInt32(); + // dressedSkinId + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 80) { + if (tag != 16) { break; } } - case 80: { + case 16: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 66) { + if (tag != 50) { break; } } - case 66: { + case 50: { // takenRewards [packed=true] input.readPackedUInt32(takenRewards, tag); bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { - // skilltreeList - tag = input.readRepeatedMessage(skilltreeList, tag); - bitField0_ |= 0x00000400; - if (tag != 42) { - break; - } - } - case 42: { + case 58: { // equipRelicList tag = input.readRepeatedMessage(equipRelicList, tag); + bitField0_ |= 0x00000400; + if (tag != 98) { + break; + } + } + case 98: { + // skilltreeList + tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000800; if (tag != 0) { break; @@ -975,7 +975,7 @@ public final class AvatarOuterClass { tag = input.readTag(); break; } - case 64: { + case 48: { // 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.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.rank, rank); + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); } 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.skilltreeList, skilltreeList); + output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.equipRelicList, equipRelicList); + output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } output.endObject(); } @@ -1046,11 +1046,11 @@ public final class AvatarOuterClass { } break; } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1058,22 +1058,22 @@ public final class AvatarOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - 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 { @@ -1092,10 +1092,10 @@ public final class AvatarOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1103,11 +1103,10 @@ public final class AvatarOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -1115,10 +1114,11 @@ public final class AvatarOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case -407000018: + case 2012697844: { + if (input.isAtField(FieldNames.dressedSkinId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + dressedSkinId = input.readUInt32(); bitField0_ |= 0x00000080; } } else { @@ -1150,11 +1150,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_ |= 0x00000400; } } else { @@ -1162,11 +1162,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_ |= 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 dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); - - static final FieldName promotion = FieldName.forField("promotion"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); - static final FieldName exp = FieldName.forField("exp"); - static final FieldName level = FieldName.forField("level"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName exp = FieldName.forField("exp"); static final FieldName rank = FieldName.forField("rank"); + static final FieldName promotion = FieldName.forField("promotion"); + + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName isMarked = FieldName.forField("isMarked", "is_marked"); static final FieldName takenRewards = FieldName.forField("takenRewards", "taken_rewards"); - static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); - static final FieldName equipRelicList = FieldName.forField("equipRelicList", "equip_relic_list"); + + static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/AvatarSyncOuterClass.java index a65251f..2f04107 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 = 5; + * repeated .Avatar avatar_list = 7; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -35,7 +35,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar avatar_list = 7; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -43,7 +43,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar avatar_list = 7; * @return this */ public AvatarSync clearAvatarList() { @@ -53,7 +53,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar 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 AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar 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 AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar avatar_list = 7; * @param value the avatarList to add * @return this */ @@ -92,7 +92,7 @@ public final class AvatarSyncOuterClass { } /** - * repeated .Avatar avatar_list = 5; + * repeated .Avatar avatar_list = 7; * @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) 42); + output.writeRawByte((byte) 58); output.writeMessageNoTag(avatarList.get(i)); } } @@ -185,7 +185,7 @@ public final class AvatarSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 58: { // 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 e95afe0..e765191 100644 --- a/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BattlePassInfoNotifyOuterClass.java @@ -21,57 +21,57 @@ public final class BattlePassInfoNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 taken_free_reward = 2; - */ - private long takenFreeReward; - - /** - * optional uint64 taken_free_extended_reward = 3; - */ - private long takenFreeExtendedReward; - - /** - * optional uint64 taken_premium_reward2 = 6; - */ - private long takenPremiumReward2; - - /** - * optional uint64 taken_premium_optional_reward = 8; + * optional uint64 taken_premium_optional_reward = 2; */ private long takenPremiumOptionalReward; /** - * optional uint64 taken_premium_reward1 = 10; + * optional uint64 taken_premium_reward2 = 3; */ - private long takenPremiumReward1; + private long takenPremiumReward2; /** - * optional uint64 taken_premium_extended_reward = 13; + * optional uint64 taken_premium_extended_reward = 4; */ private long takenPremiumExtendedReward; /** - * optional uint32 cur_bp_id = 1; + * optional uint64 taken_free_extended_reward = 8; */ - private int curBpId; + private long takenFreeExtendedReward; /** - * optional uint32 exp = 7; + * optional uint64 taken_premium_reward1 = 9; */ - private int exp; + private long takenPremiumReward1; /** - * optional uint32 level = 9; + * optional uint64 taken_free_reward = 10; */ - private int level; + private long takenFreeReward; /** - * optional uint32 cur_week_add_exp_sum = 15; + * optional uint32 cur_week_add_exp_sum = 1; */ private int curWeekAddExpSum; /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4; + * optional uint32 cur_bp_id = 5; + */ + private int curBpId; + + /** + * optional uint32 exp = 12; + */ + private int exp; + + /** + * optional uint32 level = 13; + */ + private int level; + + /** + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; */ private int bpTierType; @@ -86,136 +86,25 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_free_reward = 2; - * @return whether the takenFreeReward field is set + * optional uint64 taken_premium_optional_reward = 2; + * @return whether the takenPremiumOptionalReward field is set */ - public boolean hasTakenFreeReward() { + public boolean hasTakenPremiumOptionalReward() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 taken_free_reward = 2; - * @return this - */ - public BattlePassInfoNotify clearTakenFreeReward() { - bitField0_ &= ~0x00000001; - takenFreeReward = 0L; - return this; - } - - /** - * optional uint64 taken_free_reward = 2; - * @return the takenFreeReward - */ - public long getTakenFreeReward() { - return takenFreeReward; - } - - /** - * optional uint64 taken_free_reward = 2; - * @param value the takenFreeReward to set - * @return this - */ - public BattlePassInfoNotify setTakenFreeReward(final long value) { - bitField0_ |= 0x00000001; - takenFreeReward = value; - return this; - } - - /** - * optional uint64 taken_free_extended_reward = 3; - * @return whether the takenFreeExtendedReward field is set - */ - public boolean hasTakenFreeExtendedReward() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint64 taken_free_extended_reward = 3; - * @return this - */ - public BattlePassInfoNotify clearTakenFreeExtendedReward() { - bitField0_ &= ~0x00000002; - takenFreeExtendedReward = 0L; - return this; - } - - /** - * optional uint64 taken_free_extended_reward = 3; - * @return the takenFreeExtendedReward - */ - public long getTakenFreeExtendedReward() { - return takenFreeExtendedReward; - } - - /** - * optional uint64 taken_free_extended_reward = 3; - * @param value the takenFreeExtendedReward to set - * @return this - */ - public BattlePassInfoNotify setTakenFreeExtendedReward(final long value) { - bitField0_ |= 0x00000002; - takenFreeExtendedReward = value; - return this; - } - - /** - * optional uint64 taken_premium_reward2 = 6; - * @return whether the takenPremiumReward2 field is set - */ - public boolean hasTakenPremiumReward2() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint64 taken_premium_reward2 = 6; - * @return this - */ - public BattlePassInfoNotify clearTakenPremiumReward2() { - bitField0_ &= ~0x00000004; - takenPremiumReward2 = 0L; - return this; - } - - /** - * optional uint64 taken_premium_reward2 = 6; - * @return the takenPremiumReward2 - */ - public long getTakenPremiumReward2() { - return takenPremiumReward2; - } - - /** - * optional uint64 taken_premium_reward2 = 6; - * @param value the takenPremiumReward2 to set - * @return this - */ - public BattlePassInfoNotify setTakenPremiumReward2(final long value) { - bitField0_ |= 0x00000004; - takenPremiumReward2 = value; - return this; - } - - /** - * optional uint64 taken_premium_optional_reward = 8; - * @return whether the takenPremiumOptionalReward field is set - */ - public boolean hasTakenPremiumOptionalReward() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint64 taken_premium_optional_reward = 8; + * optional uint64 taken_premium_optional_reward = 2; * @return this */ public BattlePassInfoNotify clearTakenPremiumOptionalReward() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; takenPremiumOptionalReward = 0L; return this; } /** - * optional uint64 taken_premium_optional_reward = 8; + * optional uint64 taken_premium_optional_reward = 2; * @return the takenPremiumOptionalReward */ public long getTakenPremiumOptionalReward() { @@ -223,18 +112,129 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_optional_reward = 8; + * optional uint64 taken_premium_optional_reward = 2; * @param value the takenPremiumOptionalReward to set * @return this */ public BattlePassInfoNotify setTakenPremiumOptionalReward(final long value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; takenPremiumOptionalReward = value; return this; } /** - * optional uint64 taken_premium_reward1 = 10; + * 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; + * @return this + */ + public BattlePassInfoNotify clearTakenPremiumReward2() { + bitField0_ &= ~0x00000002; + takenPremiumReward2 = 0L; + return this; + } + + /** + * optional uint64 taken_premium_reward2 = 3; + * @return the takenPremiumReward2 + */ + public long getTakenPremiumReward2() { + return takenPremiumReward2; + } + + /** + * optional uint64 taken_premium_reward2 = 3; + * @param value the takenPremiumReward2 to set + * @return this + */ + public BattlePassInfoNotify setTakenPremiumReward2(final long value) { + bitField0_ |= 0x00000002; + 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() { @@ -242,7 +242,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 10; + * optional uint64 taken_premium_reward1 = 9; * @return this */ public BattlePassInfoNotify clearTakenPremiumReward1() { @@ -252,7 +252,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 10; + * optional uint64 taken_premium_reward1 = 9; * @return the takenPremiumReward1 */ public long getTakenPremiumReward1() { @@ -260,7 +260,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_reward1 = 10; + * optional uint64 taken_premium_reward1 = 9; * @param value the takenPremiumReward1 to set * @return this */ @@ -271,173 +271,62 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint64 taken_premium_extended_reward = 13; - * @return whether the takenPremiumExtendedReward field is set + * optional uint64 taken_free_reward = 10; + * @return whether the takenFreeReward field is set */ - public boolean hasTakenPremiumExtendedReward() { + public boolean hasTakenFreeReward() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint64 taken_premium_extended_reward = 13; + * optional uint64 taken_free_reward = 10; * @return this */ - public BattlePassInfoNotify clearTakenPremiumExtendedReward() { + public BattlePassInfoNotify clearTakenFreeReward() { bitField0_ &= ~0x00000020; - takenPremiumExtendedReward = 0L; + takenFreeReward = 0L; return this; } /** - * optional uint64 taken_premium_extended_reward = 13; - * @return the takenPremiumExtendedReward + * optional uint64 taken_free_reward = 10; + * @return the takenFreeReward */ - public long getTakenPremiumExtendedReward() { - return takenPremiumExtendedReward; + public long getTakenFreeReward() { + return takenFreeReward; } /** - * optional uint64 taken_premium_extended_reward = 13; - * @param value the takenPremiumExtendedReward to set + * optional uint64 taken_free_reward = 10; + * @param value the takenFreeReward to set * @return this */ - public BattlePassInfoNotify setTakenPremiumExtendedReward(final long value) { + public BattlePassInfoNotify setTakenFreeReward(final long value) { bitField0_ |= 0x00000020; - takenPremiumExtendedReward = value; + takenFreeReward = value; return this; } /** - * optional uint32 cur_bp_id = 1; - * @return whether the curBpId field is set + * optional uint32 cur_week_add_exp_sum = 1; + * @return whether the curWeekAddExpSum field is set */ - public boolean hasCurBpId() { + public boolean hasCurWeekAddExpSum() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 cur_bp_id = 1; - * @return this - */ - public BattlePassInfoNotify clearCurBpId() { - bitField0_ &= ~0x00000040; - curBpId = 0; - return this; - } - - /** - * optional uint32 cur_bp_id = 1; - * @return the curBpId - */ - public int getCurBpId() { - return curBpId; - } - - /** - * optional uint32 cur_bp_id = 1; - * @param value the curBpId to set - * @return this - */ - public BattlePassInfoNotify setCurBpId(final int value) { - bitField0_ |= 0x00000040; - curBpId = value; - return this; - } - - /** - * optional uint32 exp = 7; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional uint32 exp = 7; - * @return this - */ - public BattlePassInfoNotify clearExp() { - bitField0_ &= ~0x00000080; - 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 BattlePassInfoNotify setExp(final int value) { - bitField0_ |= 0x00000080; - exp = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public BattlePassInfoNotify clearLevel() { - bitField0_ &= ~0x00000100; - 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 BattlePassInfoNotify setLevel(final int value) { - bitField0_ |= 0x00000100; - level = value; - return this; - } - - /** - * optional uint32 cur_week_add_exp_sum = 15; - * @return whether the curWeekAddExpSum field is set - */ - public boolean hasCurWeekAddExpSum() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional uint32 cur_week_add_exp_sum = 15; + * optional uint32 cur_week_add_exp_sum = 1; * @return this */ public BattlePassInfoNotify clearCurWeekAddExpSum() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000040; curWeekAddExpSum = 0; return this; } /** - * optional uint32 cur_week_add_exp_sum = 15; + * optional uint32 cur_week_add_exp_sum = 1; * @return the curWeekAddExpSum */ public int getCurWeekAddExpSum() { @@ -445,18 +334,129 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional uint32 cur_week_add_exp_sum = 15; + * optional uint32 cur_week_add_exp_sum = 1; * @param value the curWeekAddExpSum to set * @return this */ public BattlePassInfoNotify setCurWeekAddExpSum(final int value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; curWeekAddExpSum = value; return this; } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4; + * 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; + * @return this + */ + public BattlePassInfoNotify clearCurBpId() { + bitField0_ &= ~0x00000080; + curBpId = 0; + return this; + } + + /** + * optional uint32 cur_bp_id = 5; + * @return the curBpId + */ + public int getCurBpId() { + return curBpId; + } + + /** + * optional uint32 cur_bp_id = 5; + * @param value the curBpId to set + * @return this + */ + public BattlePassInfoNotify setCurBpId(final int value) { + bitField0_ |= 0x00000080; + curBpId = value; + return this; + } + + /** + * optional uint32 exp = 12; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional uint32 exp = 12; + * @return this + */ + public BattlePassInfoNotify clearExp() { + bitField0_ &= ~0x00000100; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 12; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 12; + * @param value the exp to set + * @return this + */ + public BattlePassInfoNotify setExp(final int value) { + bitField0_ |= 0x00000100; + exp = value; + return this; + } + + /** + * optional uint32 level = 13; + * @return whether the level field is set + */ + public boolean hasLevel() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional uint32 level = 13; + * @return this + */ + public BattlePassInfoNotify clearLevel() { + bitField0_ &= ~0x00000200; + 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 BattlePassInfoNotify setLevel(final int value) { + bitField0_ |= 0x00000200; + level = value; + return this; + } + + /** + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; * @return whether the bpTierType field is set */ public boolean hasBpTierType() { @@ -464,7 +464,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; * @return this */ public BattlePassInfoNotify clearBpTierType() { @@ -474,7 +474,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; * @return the bpTierType */ public BpTierType getBpTierType() { @@ -507,7 +507,7 @@ public final class BattlePassInfoNotifyOuterClass { } /** - * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 4; + * optional .BattlePassInfoNotify.BpTierType bp_tier_type = 11; * @param value the bpTierType to set * @return this */ @@ -522,16 +522,16 @@ public final class BattlePassInfoNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - takenFreeReward = other.takenFreeReward; - takenFreeExtendedReward = other.takenFreeExtendedReward; - takenPremiumReward2 = other.takenPremiumReward2; takenPremiumOptionalReward = other.takenPremiumOptionalReward; - takenPremiumReward1 = other.takenPremiumReward1; + takenPremiumReward2 = other.takenPremiumReward2; takenPremiumExtendedReward = other.takenPremiumExtendedReward; + takenFreeExtendedReward = other.takenFreeExtendedReward; + takenPremiumReward1 = other.takenPremiumReward1; + takenFreeReward = other.takenFreeReward; + curWeekAddExpSum = other.curWeekAddExpSum; curBpId = other.curBpId; exp = other.exp; level = other.level; - curWeekAddExpSum = other.curWeekAddExpSum; bpTierType = other.bpTierType; } return this; @@ -543,23 +543,26 @@ public final class BattlePassInfoNotifyOuterClass { return this; } cachedSize = -1; - if (other.hasTakenFreeReward()) { - setTakenFreeReward(other.takenFreeReward); - } - if (other.hasTakenFreeExtendedReward()) { - setTakenFreeExtendedReward(other.takenFreeExtendedReward); + if (other.hasTakenPremiumOptionalReward()) { + setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); } if (other.hasTakenPremiumReward2()) { setTakenPremiumReward2(other.takenPremiumReward2); } - if (other.hasTakenPremiumOptionalReward()) { - setTakenPremiumOptionalReward(other.takenPremiumOptionalReward); + if (other.hasTakenPremiumExtendedReward()) { + setTakenPremiumExtendedReward(other.takenPremiumExtendedReward); + } + if (other.hasTakenFreeExtendedReward()) { + setTakenFreeExtendedReward(other.takenFreeExtendedReward); } if (other.hasTakenPremiumReward1()) { setTakenPremiumReward1(other.takenPremiumReward1); } - if (other.hasTakenPremiumExtendedReward()) { - setTakenPremiumExtendedReward(other.takenPremiumExtendedReward); + if (other.hasTakenFreeReward()) { + setTakenFreeReward(other.takenFreeReward); + } + if (other.hasCurWeekAddExpSum()) { + setCurWeekAddExpSum(other.curWeekAddExpSum); } if (other.hasCurBpId()) { setCurBpId(other.curBpId); @@ -570,9 +573,6 @@ public final class BattlePassInfoNotifyOuterClass { if (other.hasLevel()) { setLevel(other.level); } - if (other.hasCurWeekAddExpSum()) { - setCurWeekAddExpSum(other.curWeekAddExpSum); - } if (other.hasBpTierType()) { setBpTierTypeValue(other.bpTierType); } @@ -586,16 +586,16 @@ public final class BattlePassInfoNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - takenFreeReward = 0L; - takenFreeExtendedReward = 0L; - takenPremiumReward2 = 0L; takenPremiumOptionalReward = 0L; - takenPremiumReward1 = 0L; + takenPremiumReward2 = 0L; takenPremiumExtendedReward = 0L; + takenFreeExtendedReward = 0L; + takenPremiumReward1 = 0L; + takenFreeReward = 0L; + curWeekAddExpSum = 0; curBpId = 0; exp = 0; level = 0; - curWeekAddExpSum = 0; bpTierType = 0; return this; } @@ -620,16 +620,16 @@ public final class BattlePassInfoNotifyOuterClass { } BattlePassInfoNotify other = (BattlePassInfoNotify) o; return bitField0_ == other.bitField0_ - && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) - && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward) - && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) && (!hasTakenPremiumOptionalReward() || takenPremiumOptionalReward == other.takenPremiumOptionalReward) - && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) + && (!hasTakenPremiumReward2() || takenPremiumReward2 == other.takenPremiumReward2) && (!hasTakenPremiumExtendedReward() || takenPremiumExtendedReward == other.takenPremiumExtendedReward) + && (!hasTakenFreeExtendedReward() || takenFreeExtendedReward == other.takenFreeExtendedReward) + && (!hasTakenPremiumReward1() || takenPremiumReward1 == other.takenPremiumReward1) + && (!hasTakenFreeReward() || takenFreeReward == other.takenFreeReward) + && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) && (!hasCurBpId() || curBpId == other.curBpId) && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) - && (!hasCurWeekAddExpSum() || curWeekAddExpSum == other.curWeekAddExpSum) && (!hasBpTierType() || bpTierType == other.bpTierType); } @@ -637,46 +637,46 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt64NoTag(takenFreeReward); + output.writeUInt64NoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); - output.writeUInt64NoTag(takenFreeExtendedReward); + output.writeUInt64NoTag(takenPremiumReward2); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt64NoTag(takenPremiumReward2); + output.writeRawByte((byte) 32); + output.writeUInt64NoTag(takenPremiumExtendedReward); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); - output.writeUInt64NoTag(takenPremiumOptionalReward); + output.writeUInt64NoTag(takenFreeExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt64NoTag(takenPremiumReward1); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt64NoTag(takenPremiumExtendedReward); + output.writeRawByte((byte) 80); + output.writeUInt64NoTag(takenFreeReward); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curBpId); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(exp); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(curWeekAddExpSum); } + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(curBpId); + } + if ((bitField0_ & 0x00000100) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(exp); + } + if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 88); output.writeEnumNoTag(bpTierType); } } @@ -685,34 +685,34 @@ public final class BattlePassInfoNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward2); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumOptionalReward); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumReward1); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(takenPremiumExtendedReward); + size += 1 + ProtoSink.computeUInt64SizeNoTag(takenFreeReward); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curBpId); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curWeekAddExpSum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000400) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(bpTierType); @@ -728,8 +728,8 @@ public final class BattlePassInfoNotifyOuterClass { while (true) { switch (tag) { case 16: { - // takenFreeReward - takenFreeReward = input.readUInt64(); + // takenPremiumOptionalReward + takenPremiumOptionalReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 24) { @@ -737,17 +737,17 @@ public final class BattlePassInfoNotifyOuterClass { } } case 24: { - // takenFreeExtendedReward - takenFreeExtendedReward = input.readUInt64(); + // takenPremiumReward2 + takenPremiumReward2 = input.readUInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { - // takenPremiumReward2 - takenPremiumReward2 = input.readUInt64(); + case 32: { + // takenPremiumExtendedReward + takenPremiumExtendedReward = input.readUInt64(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 64) { @@ -755,26 +755,26 @@ public final class BattlePassInfoNotifyOuterClass { } } case 64: { - // takenPremiumOptionalReward - takenPremiumOptionalReward = input.readUInt64(); + // takenFreeExtendedReward + takenFreeExtendedReward = input.readUInt64(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // takenPremiumReward1 + takenPremiumReward1 = input.readUInt64(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // takenPremiumReward1 - takenPremiumReward1 = input.readUInt64(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // takenPremiumExtendedReward - takenPremiumExtendedReward = input.readUInt64(); + // takenFreeReward + takenFreeReward = input.readUInt64(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 8) { @@ -782,42 +782,42 @@ public final class BattlePassInfoNotifyOuterClass { } } case 8: { - // curBpId - curBpId = input.readUInt32(); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // curWeekAddExpSum curWeekAddExpSum = input.readUInt32(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { + case 40: { + // curBpId + curBpId = input.readUInt32(); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // exp + exp = input.readUInt32(); + bitField0_ |= 0x00000100; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // bpTierType final int value = input.readInt32(); if (BpTierType.forNumber(value) != null) { @@ -847,34 +847,34 @@ public final class BattlePassInfoNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); + output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt64(FieldNames.takenPremiumReward2, takenPremiumReward2); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt64(FieldNames.takenPremiumOptionalReward, takenPremiumOptionalReward); + output.writeUInt64(FieldNames.takenFreeExtendedReward, takenFreeExtendedReward); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt64(FieldNames.takenPremiumReward1, takenPremiumReward1); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt64(FieldNames.takenPremiumExtendedReward, takenPremiumExtendedReward); + output.writeUInt64(FieldNames.takenFreeReward, takenFreeReward); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.curBpId, curBpId); + output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.exp, exp); + output.writeUInt32(FieldNames.curBpId, curBpId); } if ((bitField0_ & 0x00000100) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000200) != 0) { - output.writeUInt32(FieldNames.curWeekAddExpSum, curWeekAddExpSum); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000400) != 0) { output.writeEnum(FieldNames.bpTierType, bpTierType, BpTierType.converter()); @@ -889,11 +889,11 @@ public final class BattlePassInfoNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1065549026: - case 135671018: { - if (input.isAtField(FieldNames.takenFreeReward)) { + case 736311903: + case 548161422: { + if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { if (!input.trySkipNullValue()) { - takenFreeReward = input.readUInt64(); + takenPremiumOptionalReward = input.readUInt64(); bitField0_ |= 0x00000001; } } else { @@ -901,23 +901,23 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case -1116117893: - case 1257087386: { - if (input.isAtField(FieldNames.takenFreeExtendedReward)) { - if (!input.trySkipNullValue()) { - takenFreeExtendedReward = input.readUInt64(); - bitField0_ |= 0x00000002; - } - } 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 { @@ -925,11 +925,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 736311903: - case 548161422: { - if (input.isAtField(FieldNames.takenPremiumOptionalReward)) { + case -1116117893: + case 1257087386: { + if (input.isAtField(FieldNames.takenFreeExtendedReward)) { if (!input.trySkipNullValue()) { - takenPremiumOptionalReward = input.readUInt64(); + takenFreeExtendedReward = input.readUInt64(); bitField0_ |= 0x00000008; } } else { @@ -949,11 +949,11 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case -1290021512: - case -2138632299: { - if (input.isAtField(FieldNames.takenPremiumExtendedReward)) { + case 1065549026: + case 135671018: { + if (input.isAtField(FieldNames.takenFreeReward)) { if (!input.trySkipNullValue()) { - takenPremiumExtendedReward = input.readUInt64(); + takenFreeReward = input.readUInt64(); bitField0_ |= 0x00000020; } } else { @@ -961,45 +961,45 @@ public final class BattlePassInfoNotifyOuterClass { } break; } - case 1125519465: - case 110923757: { - if (input.isAtField(FieldNames.curBpId)) { - if (!input.trySkipNullValue()) { - curBpId = input.readUInt32(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } - case 100893: { - if (input.isAtField(FieldNames.exp)) { - if (!input.trySkipNullValue()) { - exp = input.readUInt32(); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } case 835771131: case 26830815: { if (input.isAtField(FieldNames.curWeekAddExpSum)) { if (!input.trySkipNullValue()) { curWeekAddExpSum = input.readUInt32(); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1125519465: + case 110923757: { + if (input.isAtField(FieldNames.curBpId)) { + if (!input.trySkipNullValue()) { + curBpId = input.readUInt32(); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 100893: { + if (input.isAtField(FieldNames.exp)) { + if (!input.trySkipNullValue()) { + exp = input.readUInt32(); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000200; } } else { @@ -1219,17 +1219,19 @@ public final class BattlePassInfoNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName takenFreeReward = FieldName.forField("takenFreeReward", "taken_free_reward"); - - static final FieldName takenFreeExtendedReward = FieldName.forField("takenFreeExtendedReward", "taken_free_extended_reward"); + static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); static final FieldName takenPremiumReward2 = FieldName.forField("takenPremiumReward2", "taken_premium_reward2"); - static final FieldName takenPremiumOptionalReward = FieldName.forField("takenPremiumOptionalReward", "taken_premium_optional_reward"); + 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 takenPremiumExtendedReward = FieldName.forField("takenPremiumExtendedReward", "taken_premium_extended_reward"); + 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 curBpId = FieldName.forField("curBpId", "cur_bp_id"); @@ -1237,8 +1239,6 @@ public final class BattlePassInfoNotifyOuterClass { 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/BoardDataSyncOuterClass.java b/src/generated/main/emu/lunarcore/proto/BoardDataSyncOuterClass.java index a08ceca..040f509 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 = 13; + * optional string signature = 12; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 13; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -41,7 +41,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @return whether the signature field is set */ public boolean hasSignature() { @@ -49,7 +49,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @return this */ public BoardDataSync clearSignature() { @@ -59,7 +59,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @return the signature */ public String getSignature() { @@ -67,7 +67,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -75,7 +75,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -84,7 +84,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @param value the signature to set * @return this */ @@ -95,7 +95,7 @@ public final class BoardDataSyncOuterClass { } /** - * optional string signature = 13; + * optional string signature = 12; * @param value the signature to set * @return this */ @@ -106,7 +106,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 13; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -114,7 +114,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 13; * @return this */ public BoardDataSync clearUnlockedHeadIconList() { @@ -124,7 +124,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_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. @@ -138,7 +138,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_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 @@ -152,7 +152,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 13; * @param value the unlockedHeadIconList to add * @return this */ @@ -163,7 +163,7 @@ public final class BoardDataSyncOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 7; + * repeated .HeadIcon unlocked_head_icon_list = 13; * @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) 106); + output.writeRawByte((byte) 98); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -270,16 +270,16 @@ public final class BoardDataSyncOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 98: { // signature input.readString(signature); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java index 9022990..71cf4fb 100644 --- a/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/BuyGoodsScRspOuterClass.java @@ -18,28 +18,28 @@ public final class BuyGoodsScRspOuterClass { public static final class BuyGoodsScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 goods_id = 1; - */ - private int goodsId; - /** * optional uint32 shop_id = 3; */ private int shopId; /** - * optional uint32 goods_buy_times = 8; - */ - private int goodsBuyTimes; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .ItemList return_item_list = 2; + * optional uint32 goods_id = 7; + */ + private int goodsId; + + /** + * optional uint32 goods_buy_times = 12; + */ + private int goodsBuyTimes; + + /** + * optional .ItemList return_item_list = 14; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -53,49 +53,12 @@ public final class BuyGoodsScRspOuterClass { return new BuyGoodsScRsp(); } - /** - * optional uint32 goods_id = 1; - * @return whether the goodsId field is set - */ - public boolean hasGoodsId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 goods_id = 1; - * @return this - */ - public BuyGoodsScRsp clearGoodsId() { - bitField0_ &= ~0x00000001; - goodsId = 0; - return this; - } - - /** - * optional uint32 goods_id = 1; - * @return the goodsId - */ - public int getGoodsId() { - return goodsId; - } - - /** - * optional uint32 goods_id = 1; - * @param value the goodsId to set - * @return this - */ - public BuyGoodsScRsp setGoodsId(final int value) { - bitField0_ |= 0x00000001; - goodsId = value; - return this; - } - /** * optional uint32 shop_id = 3; * @return whether the shopId field is set */ public boolean hasShopId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -103,7 +66,7 @@ public final class BuyGoodsScRspOuterClass { * @return this */ public BuyGoodsScRsp clearShopId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; shopId = 0; return this; } @@ -122,68 +85,31 @@ public final class BuyGoodsScRspOuterClass { * @return this */ public BuyGoodsScRsp setShopId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; shopId = value; return this; } /** - * optional uint32 goods_buy_times = 8; - * @return whether the goodsBuyTimes field is set - */ - public boolean hasGoodsBuyTimes() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 goods_buy_times = 8; - * @return this - */ - public BuyGoodsScRsp clearGoodsBuyTimes() { - bitField0_ &= ~0x00000004; - goodsBuyTimes = 0; - return this; - } - - /** - * optional uint32 goods_buy_times = 8; - * @return the goodsBuyTimes - */ - public int getGoodsBuyTimes() { - return goodsBuyTimes; - } - - /** - * optional uint32 goods_buy_times = 8; - * @param value the goodsBuyTimes to set - * @return this - */ - public BuyGoodsScRsp setGoodsBuyTimes(final int value) { - bitField0_ |= 0x00000004; - goodsBuyTimes = value; - return this; - } - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return this */ public BuyGoodsScRsp clearRetcode() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -191,18 +117,92 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ public BuyGoodsScRsp setRetcode(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional .ItemList return_item_list = 2; + * optional uint32 goods_id = 7; + * @return whether the goodsId field is set + */ + public boolean hasGoodsId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 goods_id = 7; + * @return this + */ + public BuyGoodsScRsp clearGoodsId() { + bitField0_ &= ~0x00000004; + goodsId = 0; + return this; + } + + /** + * optional uint32 goods_id = 7; + * @return the goodsId + */ + public int getGoodsId() { + return goodsId; + } + + /** + * optional uint32 goods_id = 7; + * @param value the goodsId to set + * @return this + */ + public BuyGoodsScRsp setGoodsId(final int value) { + bitField0_ |= 0x00000004; + goodsId = value; + return this; + } + + /** + * optional uint32 goods_buy_times = 12; + * @return whether the goodsBuyTimes field is set + */ + public boolean hasGoodsBuyTimes() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 goods_buy_times = 12; + * @return this + */ + public BuyGoodsScRsp clearGoodsBuyTimes() { + bitField0_ &= ~0x00000008; + goodsBuyTimes = 0; + return this; + } + + /** + * optional uint32 goods_buy_times = 12; + * @return the goodsBuyTimes + */ + public int getGoodsBuyTimes() { + return goodsBuyTimes; + } + + /** + * optional uint32 goods_buy_times = 12; + * @param value the goodsBuyTimes to set + * @return this + */ + public BuyGoodsScRsp setGoodsBuyTimes(final int value) { + bitField0_ |= 0x00000008; + goodsBuyTimes = value; + return this; + } + + /** + * optional .ItemList return_item_list = 14; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -210,7 +210,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * @return this */ public BuyGoodsScRsp clearReturnItemList() { @@ -220,7 +220,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * 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. @@ -234,7 +234,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * 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 @@ -248,7 +248,7 @@ public final class BuyGoodsScRspOuterClass { } /** - * optional .ItemList return_item_list = 2; + * optional .ItemList return_item_list = 14; * @param value the returnItemList to set * @return this */ @@ -263,10 +263,10 @@ public final class BuyGoodsScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - goodsId = other.goodsId; shopId = other.shopId; - goodsBuyTimes = other.goodsBuyTimes; retcode = other.retcode; + goodsId = other.goodsId; + goodsBuyTimes = other.goodsBuyTimes; returnItemList.copyFrom(other.returnItemList); } return this; @@ -278,18 +278,18 @@ public final class BuyGoodsScRspOuterClass { return this; } cachedSize = -1; - if (other.hasGoodsId()) { - setGoodsId(other.goodsId); - } if (other.hasShopId()) { setShopId(other.shopId); } - if (other.hasGoodsBuyTimes()) { - setGoodsBuyTimes(other.goodsBuyTimes); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasGoodsId()) { + setGoodsId(other.goodsId); + } + if (other.hasGoodsBuyTimes()) { + setGoodsBuyTimes(other.goodsBuyTimes); + } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -303,10 +303,10 @@ public final class BuyGoodsScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - goodsId = 0; shopId = 0; - goodsBuyTimes = 0; retcode = 0; + goodsId = 0; + goodsBuyTimes = 0; returnItemList.clear(); return this; } @@ -332,33 +332,33 @@ public final class BuyGoodsScRspOuterClass { } BuyGoodsScRsp other = (BuyGoodsScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGoodsId() || goodsId == other.goodsId) && (!hasShopId() || shopId == other.shopId) - && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) && (!hasRetcode() || retcode == other.retcode) + && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasGoodsBuyTimes() || goodsBuyTimes == other.goodsBuyTimes) && (!hasReturnItemList() || returnItemList.equals(other.returnItemList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(goodsId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(shopId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(goodsBuyTimes); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 114); output.writeMessageNoTag(returnItemList); } } @@ -367,16 +367,16 @@ public final class BuyGoodsScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsBuyTimes); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -391,27 +391,27 @@ public final class BuyGoodsScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // goodsId - goodsId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } case 24: { // shopId shopId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { - // goodsBuyTimes - goodsBuyTimes = input.readUInt32(); + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // goodsId + goodsId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 96) { @@ -419,15 +419,15 @@ public final class BuyGoodsScRspOuterClass { } } case 96: { - // retcode - retcode = input.readUInt32(); + // goodsBuyTimes + goodsBuyTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 114) { break; } } - case 18: { + case 114: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000010; @@ -454,16 +454,16 @@ public final class BuyGoodsScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.shopId, shopId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.goodsBuyTimes, goodsBuyTimes); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -478,11 +478,11 @@ public final class BuyGoodsScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + shopId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -490,11 +490,10 @@ public final class BuyGoodsScRspOuterClass { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -502,22 +501,23 @@ public final class BuyGoodsScRspOuterClass { } break; } + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { + if (!input.trySkipNullValue()) { + goodsId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case -1410858538: case -230536540: { if (input.isAtField(FieldNames.goodsBuyTimes)) { if (!input.trySkipNullValue()) { goodsBuyTimes = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -589,14 +589,14 @@ public final class BuyGoodsScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); - static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName goodsId = FieldName.forField("goodsId", "goods_id"); + + static final FieldName goodsBuyTimes = FieldName.forField("goodsBuyTimes", "goods_buy_times"); + 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 new file mode 100644 index 0000000..6a56a1f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossBuffInfoOuterClass.java @@ -0,0 +1,381 @@ +// 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 ChallengeBossBuffInfoOuterClass { + /** + * Protobuf type {@code ChallengeBossBuffInfo} + */ + public static final class ChallengeBossBuffInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 IHNFPAOKKBA = 10; + */ + private int iHNFPAOKKBA; + + /** + * repeated uint32 buff_list = 6; + */ + private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); + + private ChallengeBossBuffInfo() { + } + + /** + * @return a new empty instance of {@code ChallengeBossBuffInfo} + */ + public static ChallengeBossBuffInfo newInstance() { + return new ChallengeBossBuffInfo(); + } + + /** + * optional uint32 IHNFPAOKKBA = 10; + * @return whether the iHNFPAOKKBA field is set + */ + public boolean hasIHNFPAOKKBA() { + 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; + * @return this + */ + public ChallengeBossBuffInfo clearBuffList() { + bitField0_ &= ~0x00000002; + buffList.clear(); + return this; + } + + /** + * repeated uint32 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 RepeatedInt getBuffList() { + return buffList; + } + + /** + * repeated uint32 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 RepeatedInt getMutableBuffList() { + bitField0_ |= 0x00000002; + return buffList; + } + + /** + * repeated uint32 buff_list = 6; + * @param value the buffList to add + * @return this + */ + public ChallengeBossBuffInfo addBuffList(final int value) { + bitField0_ |= 0x00000002; + buffList.add(value); + return this; + } + + /** + * repeated uint32 buff_list = 6; + * @param values the buffList to add + * @return this + */ + public ChallengeBossBuffInfo addAllBuffList(final int... values) { + bitField0_ |= 0x00000002; + buffList.addAll(values); + return this; + } + + @Override + public ChallengeBossBuffInfo copyFrom(final ChallengeBossBuffInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + iHNFPAOKKBA = other.iHNFPAOKKBA; + buffList.copyFrom(other.buffList); + } + return this; + } + + @Override + public ChallengeBossBuffInfo mergeFrom(final ChallengeBossBuffInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasIHNFPAOKKBA()) { + setIHNFPAOKKBA(other.iHNFPAOKKBA); + } + if (other.hasBuffList()) { + getMutableBuffList().addAll(other.buffList); + } + return this; + } + + @Override + public ChallengeBossBuffInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + iHNFPAOKKBA = 0; + buffList.clear(); + return this; + } + + @Override + public ChallengeBossBuffInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + buffList.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChallengeBossBuffInfo)) { + return false; + } + 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.writeUInt32NoTag(buffList.array()[i]); + } + } + } + + @Override + 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; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeBossBuffInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + 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: { + // buffList [packed=true] + input.readPackedUInt32(buffList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 48: { + // buffList [packed=false] + tag = input.readRepeatedUInt32(buffList, tag); + bitField0_ |= 0x00000002; + break; + } + } + } + } + + @Override + 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(); + } + + @Override + public ChallengeBossBuffInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + 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; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeBossBuffInfo clone() { + return new ChallengeBossBuffInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeBossBuffInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeBossBuffInfo(), data).checkInitialized(); + } + + public static ChallengeBossBuffInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeBossBuffInfo(), input).checkInitialized(); + } + + public static ChallengeBossBuffInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeBossBuffInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeBossBuffInfo messages + */ + public static MessageFactory getFactory() { + return ChallengeBossBuffInfoFactory.INSTANCE; + } + + private enum ChallengeBossBuffInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeBossBuffInfo create() { + return ChallengeBossBuffInfo.newInstance(); + } + } + + /** + * 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 new file mode 100644 index 0000000..ac5b258 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossInfoOuterClass.java @@ -0,0 +1,759 @@ +// 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 ChallengeBossInfoOuterClass { + /** + * Protobuf type {@code ChallengeBossInfo} + */ + 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;
+     *
+ * + * optional .ChallengeBossSingleNodeInfo second_node = 12; + */ + private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo secondNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); + + /** + * optional .ChallengeBossSingleNodeInfo first_node = 15; + */ + private final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo firstNode = ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo.newInstance(); + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 2; + */ + private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); + + /** + * repeated uint32 lineup1 = 13; + */ + private final RepeatedInt lineup1 = RepeatedInt.newEmptyInstance(); + + private ChallengeBossInfo() { + } + + /** + * @return a new empty instance of {@code ChallengeBossInfo} + */ + public static ChallengeBossInfo newInstance() { + return new ChallengeBossInfo(); + } + + /** + * optional bool PPNAGBNIOAO = 10; + * @return whether the pPNAGBNIOAO field is set + */ + public boolean hasPPNAGBNIOAO() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional bool PPNAGBNIOAO = 10; + * @return this + */ + public ChallengeBossInfo clearPPNAGBNIOAO() { + 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; + return this; + } + + /** + * 
+     *  map KCKMGDGIFIF = 8;
+     *
+ * + * optional .ChallengeBossSingleNodeInfo second_node = 12; + * @return whether the secondNode field is set + */ + public boolean hasSecondNode() { + 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; + * @return this + */ + public ChallengeBossInfo clearFirstNode() { + bitField0_ &= ~0x00000004; + firstNode.clear(); + return this; + } + + /** + * optional .ChallengeBossSingleNodeInfo first_node = 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 #getMutableFirstNode()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getFirstNode() { + return firstNode; + } + + /** + * optional .ChallengeBossSingleNodeInfo first_node = 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 ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo getMutableFirstNode() { + bitField0_ |= 0x00000004; + return firstNode; + } + + /** + * optional .ChallengeBossSingleNodeInfo first_node = 15; + * @param value the firstNode to set + * @return this + */ + public ChallengeBossInfo setFirstNode( + final ChallengeBossSingleNodeInfoOuterClass.ChallengeBossSingleNodeInfo value) { + bitField0_ |= 0x00000004; + firstNode.copyFrom(value); + return this; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 2; + * @return whether the lineup2 field is set + */ + public boolean hasLineup2() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 2; + * @return this + */ + public ChallengeBossInfo clearLineup2() { + bitField0_ &= ~0x00000008; + lineup2.clear(); + return this; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 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 #getMutableLineup2()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLineup2() { + return lineup2; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 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 RepeatedInt getMutableLineup2() { + bitField0_ |= 0x00000008; + return lineup2; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 2; + * @param value the lineup2 to add + * @return this + */ + public ChallengeBossInfo addLineup2(final int value) { + bitField0_ |= 0x00000008; + lineup2.add(value); + return this; + } + + /** + * 
+     *  map PADHAGKGGPB = 7;
+     *
+ * + * repeated uint32 lineup2 = 2; + * @param values the lineup2 to add + * @return this + */ + public ChallengeBossInfo addAllLineup2(final int... values) { + bitField0_ |= 0x00000008; + lineup2.addAll(values); + return this; + } + + /** + * repeated uint32 lineup1 = 13; + * @return whether the lineup1 field is set + */ + public boolean hasLineup1() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 lineup1 = 13; + * @return this + */ + public ChallengeBossInfo clearLineup1() { + bitField0_ &= ~0x00000010; + lineup1.clear(); + return this; + } + + /** + * repeated uint32 lineup1 = 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 #getMutableLineup1()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLineup1() { + return lineup1; + } + + /** + * repeated uint32 lineup1 = 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 getMutableLineup1() { + bitField0_ |= 0x00000010; + return lineup1; + } + + /** + * repeated uint32 lineup1 = 13; + * @param value the lineup1 to add + * @return this + */ + public ChallengeBossInfo addLineup1(final int value) { + bitField0_ |= 0x00000010; + lineup1.add(value); + return this; + } + + /** + * repeated uint32 lineup1 = 13; + * @param values the lineup1 to add + * @return this + */ + public ChallengeBossInfo addAllLineup1(final int... values) { + bitField0_ |= 0x00000010; + lineup1.addAll(values); + return this; + } + + @Override + public ChallengeBossInfo copyFrom(final ChallengeBossInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + pPNAGBNIOAO = other.pPNAGBNIOAO; + secondNode.copyFrom(other.secondNode); + firstNode.copyFrom(other.firstNode); + lineup2.copyFrom(other.lineup2); + lineup1.copyFrom(other.lineup1); + } + return this; + } + + @Override + public ChallengeBossInfo mergeFrom(final ChallengeBossInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasPPNAGBNIOAO()) { + setPPNAGBNIOAO(other.pPNAGBNIOAO); + } + if (other.hasSecondNode()) { + getMutableSecondNode().mergeFrom(other.secondNode); + } + if (other.hasFirstNode()) { + getMutableFirstNode().mergeFrom(other.firstNode); + } + if (other.hasLineup2()) { + getMutableLineup2().addAll(other.lineup2); + } + if (other.hasLineup1()) { + getMutableLineup1().addAll(other.lineup1); + } + return this; + } + + @Override + public ChallengeBossInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + pPNAGBNIOAO = false; + secondNode.clear(); + firstNode.clear(); + lineup2.clear(); + lineup1.clear(); + return this; + } + + @Override + public ChallengeBossInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + secondNode.clearQuick(); + firstNode.clearQuick(); + lineup2.clear(); + lineup1.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChallengeBossInfo)) { + return false; + } + ChallengeBossInfo other = (ChallengeBossInfo) o; + return bitField0_ == other.bitField0_ + && (!hasPPNAGBNIOAO() || pPNAGBNIOAO == other.pPNAGBNIOAO) + && (!hasSecondNode() || secondNode.equals(other.secondNode)) + && (!hasFirstNode() || firstNode.equals(other.firstNode)) + && (!hasLineup2() || lineup2.equals(other.lineup2)) + && (!hasLineup1() || lineup1.equals(other.lineup1)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeBoolNoTag(pPNAGBNIOAO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(secondNode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(firstNode); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < lineup2.length(); i++) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(lineup2.array()[i]); + } + } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < lineup1.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(lineup1.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(secondNode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(firstNode); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); + } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * lineup1.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup1); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeBossInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // pPNAGBNIOAO + pPNAGBNIOAO = input.readBool(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // secondNode + input.readMessage(secondNode); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // firstNode + input.readMessage(firstNode); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // lineup2 [packed=true] + input.readPackedUInt32(lineup2, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // lineup1 [packed=true] + input.readPackedUInt32(lineup1, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 16: { + // lineup2 [packed=false] + tag = input.readRepeatedUInt32(lineup2, tag); + bitField0_ |= 0x00000008; + break; + } + case 104: { + // lineup1 [packed=false] + tag = input.readRepeatedUInt32(lineup1, tag); + bitField0_ |= 0x00000010; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeBool(FieldNames.pPNAGBNIOAO, pPNAGBNIOAO); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.secondNode, secondNode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.firstNode, firstNode); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedUInt32(FieldNames.lineup1, lineup1); + } + output.endObject(); + } + + @Override + public ChallengeBossInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1940308460: { + if (input.isAtField(FieldNames.pPNAGBNIOAO)) { + if (!input.trySkipNullValue()) { + pPNAGBNIOAO = input.readBool(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + 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_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 176922755: { + if (input.isAtField(FieldNames.lineup2)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lineup2); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 176922754: { + if (input.isAtField(FieldNames.lineup1)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lineup1); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeBossInfo clone() { + return new ChallengeBossInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeBossInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeBossInfo(), data).checkInitialized(); + } + + public static ChallengeBossInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeBossInfo(), input).checkInitialized(); + } + + public static ChallengeBossInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeBossInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeBossInfo messages + */ + public static MessageFactory getFactory() { + return ChallengeBossInfoFactory.INSTANCE; + } + + private enum ChallengeBossInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeBossInfo create() { + return ChallengeBossInfo.newInstance(); + } + } + + /** + * 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 firstNode = FieldName.forField("firstNode", "first_node"); + + static final FieldName lineup2 = FieldName.forField("lineup2"); + + static final FieldName lineup1 = FieldName.forField("lineup1"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java new file mode 100644 index 0000000..48f9970 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeBossSingleNodeInfoOuterClass.java @@ -0,0 +1,500 @@ +// 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 ChallengeBossSingleNodeInfoOuterClass { + /** + * Protobuf type {@code ChallengeBossSingleNodeInfo} + */ + public static final class ChallengeBossSingleNodeInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 KLJPBAAGNFN = 11; + */ + private int kLJPBAAGNFN; + + /** + * optional uint32 DAIMOOEMHJF = 14; + */ + private int dAIMOOEMHJF; + + /** + * optional bool BMIKMFLHMJD = 5; + */ + private boolean bMIKMFLHMJD; + + /** + * optional bool NAGJMPMHMMC = 7; + */ + private boolean nAGJMPMHMMC; + + private ChallengeBossSingleNodeInfo() { + } + + /** + * @return a new empty instance of {@code ChallengeBossSingleNodeInfo} + */ + public static ChallengeBossSingleNodeInfo newInstance() { + return new ChallengeBossSingleNodeInfo(); + } + + /** + * optional uint32 KLJPBAAGNFN = 11; + * @return whether the kLJPBAAGNFN field is set + */ + public boolean hasKLJPBAAGNFN() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 KLJPBAAGNFN = 11; + * @return this + */ + public ChallengeBossSingleNodeInfo clearKLJPBAAGNFN() { + bitField0_ &= ~0x00000001; + kLJPBAAGNFN = 0; + return this; + } + + /** + * optional uint32 KLJPBAAGNFN = 11; + * @return the kLJPBAAGNFN + */ + public int getKLJPBAAGNFN() { + return kLJPBAAGNFN; + } + + /** + * optional uint32 KLJPBAAGNFN = 11; + * @param value the kLJPBAAGNFN to set + * @return this + */ + public ChallengeBossSingleNodeInfo setKLJPBAAGNFN(final int value) { + bitField0_ |= 0x00000001; + kLJPBAAGNFN = value; + return this; + } + + /** + * optional uint32 DAIMOOEMHJF = 14; + * @return whether the dAIMOOEMHJF field is set + */ + public boolean hasDAIMOOEMHJF() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 DAIMOOEMHJF = 14; + * @return this + */ + public ChallengeBossSingleNodeInfo clearDAIMOOEMHJF() { + bitField0_ &= ~0x00000002; + dAIMOOEMHJF = 0; + return this; + } + + /** + * optional uint32 DAIMOOEMHJF = 14; + * @return the dAIMOOEMHJF + */ + public int getDAIMOOEMHJF() { + return dAIMOOEMHJF; + } + + /** + * optional uint32 DAIMOOEMHJF = 14; + * @param value the dAIMOOEMHJF to set + * @return this + */ + public ChallengeBossSingleNodeInfo setDAIMOOEMHJF(final int value) { + bitField0_ |= 0x00000002; + dAIMOOEMHJF = value; + return this; + } + + /** + * optional bool BMIKMFLHMJD = 5; + * @return whether the bMIKMFLHMJD field is set + */ + public boolean hasBMIKMFLHMJD() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bool BMIKMFLHMJD = 5; + * @return this + */ + public ChallengeBossSingleNodeInfo clearBMIKMFLHMJD() { + bitField0_ &= ~0x00000004; + bMIKMFLHMJD = false; + return this; + } + + /** + * optional bool BMIKMFLHMJD = 5; + * @return the bMIKMFLHMJD + */ + public boolean getBMIKMFLHMJD() { + return bMIKMFLHMJD; + } + + /** + * optional bool BMIKMFLHMJD = 5; + * @param value the bMIKMFLHMJD to set + * @return this + */ + public ChallengeBossSingleNodeInfo setBMIKMFLHMJD(final boolean value) { + bitField0_ |= 0x00000004; + bMIKMFLHMJD = value; + return this; + } + + /** + * optional bool NAGJMPMHMMC = 7; + * @return whether the nAGJMPMHMMC field is set + */ + public boolean hasNAGJMPMHMMC() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional bool NAGJMPMHMMC = 7; + * @return this + */ + public ChallengeBossSingleNodeInfo clearNAGJMPMHMMC() { + bitField0_ &= ~0x00000008; + nAGJMPMHMMC = false; + return this; + } + + /** + * optional bool NAGJMPMHMMC = 7; + * @return the nAGJMPMHMMC + */ + public boolean getNAGJMPMHMMC() { + return nAGJMPMHMMC; + } + + /** + * optional bool NAGJMPMHMMC = 7; + * @param value the nAGJMPMHMMC to set + * @return this + */ + public ChallengeBossSingleNodeInfo setNAGJMPMHMMC(final boolean value) { + bitField0_ |= 0x00000008; + nAGJMPMHMMC = value; + return this; + } + + @Override + public ChallengeBossSingleNodeInfo copyFrom(final ChallengeBossSingleNodeInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + kLJPBAAGNFN = other.kLJPBAAGNFN; + dAIMOOEMHJF = other.dAIMOOEMHJF; + bMIKMFLHMJD = other.bMIKMFLHMJD; + nAGJMPMHMMC = other.nAGJMPMHMMC; + } + return this; + } + + @Override + public ChallengeBossSingleNodeInfo mergeFrom(final ChallengeBossSingleNodeInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasKLJPBAAGNFN()) { + setKLJPBAAGNFN(other.kLJPBAAGNFN); + } + if (other.hasDAIMOOEMHJF()) { + setDAIMOOEMHJF(other.dAIMOOEMHJF); + } + if (other.hasBMIKMFLHMJD()) { + setBMIKMFLHMJD(other.bMIKMFLHMJD); + } + if (other.hasNAGJMPMHMMC()) { + setNAGJMPMHMMC(other.nAGJMPMHMMC); + } + return this; + } + + @Override + public ChallengeBossSingleNodeInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + kLJPBAAGNFN = 0; + dAIMOOEMHJF = 0; + bMIKMFLHMJD = false; + nAGJMPMHMMC = false; + return this; + } + + @Override + public ChallengeBossSingleNodeInfo 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 ChallengeBossSingleNodeInfo)) { + return false; + } + ChallengeBossSingleNodeInfo other = (ChallengeBossSingleNodeInfo) o; + return bitField0_ == other.bitField0_ + && (!hasKLJPBAAGNFN() || kLJPBAAGNFN == other.kLJPBAAGNFN) + && (!hasDAIMOOEMHJF() || dAIMOOEMHJF == other.dAIMOOEMHJF) + && (!hasBMIKMFLHMJD() || bMIKMFLHMJD == other.bMIKMFLHMJD) + && (!hasNAGJMPMHMMC() || nAGJMPMHMMC == other.nAGJMPMHMMC); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(kLJPBAAGNFN); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(dAIMOOEMHJF); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeBoolNoTag(bMIKMFLHMJD); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 56); + output.writeBoolNoTag(nAGJMPMHMMC); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(kLJPBAAGNFN); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dAIMOOEMHJF); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000008) != 0) { + size += 2; + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeBossSingleNodeInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 88: { + // kLJPBAAGNFN + kLJPBAAGNFN = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // dAIMOOEMHJF + dAIMOOEMHJF = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // bMIKMFLHMJD + bMIKMFLHMJD = input.readBool(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // nAGJMPMHMMC + nAGJMPMHMMC = input.readBool(); + bitField0_ |= 0x00000008; + 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.kLJPBAAGNFN, kLJPBAAGNFN); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.dAIMOOEMHJF, dAIMOOEMHJF); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeBool(FieldNames.bMIKMFLHMJD, bMIKMFLHMJD); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeBool(FieldNames.nAGJMPMHMMC, nAGJMPMHMMC); + } + output.endObject(); + } + + @Override + public ChallengeBossSingleNodeInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1930444150: { + if (input.isAtField(FieldNames.kLJPBAAGNFN)) { + if (!input.trySkipNullValue()) { + kLJPBAAGNFN = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -143725957: { + if (input.isAtField(FieldNames.dAIMOOEMHJF)) { + if (!input.trySkipNullValue()) { + dAIMOOEMHJF = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -124987899: { + if (input.isAtField(FieldNames.bMIKMFLHMJD)) { + if (!input.trySkipNullValue()) { + bMIKMFLHMJD = input.readBool(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 8940751: { + if (input.isAtField(FieldNames.nAGJMPMHMMC)) { + if (!input.trySkipNullValue()) { + nAGJMPMHMMC = input.readBool(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeBossSingleNodeInfo clone() { + return new ChallengeBossSingleNodeInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeBossSingleNodeInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeBossSingleNodeInfo(), data).checkInitialized(); + } + + public static ChallengeBossSingleNodeInfo parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new ChallengeBossSingleNodeInfo(), input).checkInitialized(); + } + + public static ChallengeBossSingleNodeInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeBossSingleNodeInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeBossSingleNodeInfo messages + */ + public static MessageFactory getFactory() { + return ChallengeBossSingleNodeInfoFactory.INSTANCE; + } + + private enum ChallengeBossSingleNodeInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeBossSingleNodeInfo create() { + return ChallengeBossSingleNodeInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName kLJPBAAGNFN = FieldName.forField("KLJPBAAGNFN"); + + static final FieldName dAIMOOEMHJF = FieldName.forField("DAIMOOEMHJF"); + + static final FieldName bMIKMFLHMJD = FieldName.forField("BMIKMFLHMJD"); + + static final FieldName nAGJMPMHMMC = FieldName.forField("NAGJMPMHMMC"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.java new file mode 100644 index 0000000..5bb0c5f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeDevelopmentInfoOuterClass.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 ChallengeDevelopmentInfoOuterClass { + /** + * Protobuf type {@code ChallengeDevelopmentInfo} + */ + public static final class ChallengeDevelopmentInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 challenge_id = 1; + */ + private int challengeId; + + private ChallengeDevelopmentInfo() { + } + + /** + * @return a new empty instance of {@code ChallengeDevelopmentInfo} + */ + public static ChallengeDevelopmentInfo newInstance() { + return new ChallengeDevelopmentInfo(); + } + + /** + * optional uint32 challenge_id = 1; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 challenge_id = 1; + * @return this + */ + public ChallengeDevelopmentInfo clearChallengeId() { + bitField0_ &= ~0x00000001; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 1; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 1; + * @param value the challengeId to set + * @return this + */ + public ChallengeDevelopmentInfo setChallengeId(final int value) { + bitField0_ |= 0x00000001; + challengeId = value; + return this; + } + + @Override + public ChallengeDevelopmentInfo copyFrom(final ChallengeDevelopmentInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + challengeId = other.challengeId; + } + return this; + } + + @Override + public ChallengeDevelopmentInfo mergeFrom(final ChallengeDevelopmentInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } + return this; + } + + @Override + public ChallengeDevelopmentInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + challengeId = 0; + return this; + } + + @Override + public ChallengeDevelopmentInfo 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 ChallengeDevelopmentInfo)) { + return false; + } + ChallengeDevelopmentInfo other = (ChallengeDevelopmentInfo) o; + return bitField0_ == other.bitField0_ + && (!hasChallengeId() || challengeId == other.challengeId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(challengeId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeDevelopmentInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // challengeId + challengeId = 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.challengeId, challengeId); + } + output.endObject(); + } + + @Override + public ChallengeDevelopmentInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { + if (!input.trySkipNullValue()) { + challengeId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeDevelopmentInfo clone() { + return new ChallengeDevelopmentInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeDevelopmentInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeDevelopmentInfo(), data).checkInitialized(); + } + + public static ChallengeDevelopmentInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeDevelopmentInfo(), input).checkInitialized(); + } + + public static ChallengeDevelopmentInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeDevelopmentInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeDevelopmentInfo messages + */ + public static MessageFactory getFactory() { + return ChallengeDevelopmentInfoFactory.INSTANCE; + } + + private enum ChallengeDevelopmentInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeDevelopmentInfo create() { + return ChallengeDevelopmentInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java new file mode 100644 index 0000000..38f7a91 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ChallengeExtInfoOuterClass.java @@ -0,0 +1,281 @@ +// 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 ChallengeExtInfoOuterClass { + /** + * Protobuf type {@code ChallengeExtInfo} + */ + public static final class ChallengeExtInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .ChallengeBossInfo boss_info = 7; + */ + private final ChallengeBossInfoOuterClass.ChallengeBossInfo bossInfo = ChallengeBossInfoOuterClass.ChallengeBossInfo.newInstance(); + + private ChallengeExtInfo() { + } + + /** + * @return a new empty instance of {@code ChallengeExtInfo} + */ + public static ChallengeExtInfo newInstance() { + return new ChallengeExtInfo(); + } + + /** + * optional .ChallengeBossInfo boss_info = 7; + * @return whether the bossInfo field is set + */ + public boolean hasBossInfo() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .ChallengeBossInfo boss_info = 7; + * @return this + */ + public ChallengeExtInfo clearBossInfo() { + bitField0_ &= ~0x00000001; + bossInfo.clear(); + return this; + } + + /** + * optional .ChallengeBossInfo boss_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 #getMutableBossInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeBossInfoOuterClass.ChallengeBossInfo getBossInfo() { + return bossInfo; + } + + /** + * optional .ChallengeBossInfo boss_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 ChallengeBossInfoOuterClass.ChallengeBossInfo getMutableBossInfo() { + bitField0_ |= 0x00000001; + return bossInfo; + } + + /** + * optional .ChallengeBossInfo boss_info = 7; + * @param value the bossInfo to set + * @return this + */ + public ChallengeExtInfo setBossInfo(final ChallengeBossInfoOuterClass.ChallengeBossInfo value) { + bitField0_ |= 0x00000001; + bossInfo.copyFrom(value); + return this; + } + + @Override + public ChallengeExtInfo copyFrom(final ChallengeExtInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + bossInfo.copyFrom(other.bossInfo); + } + return this; + } + + @Override + public ChallengeExtInfo mergeFrom(final ChallengeExtInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasBossInfo()) { + getMutableBossInfo().mergeFrom(other.bossInfo); + } + return this; + } + + @Override + public ChallengeExtInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + bossInfo.clear(); + return this; + } + + @Override + public ChallengeExtInfo clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + bossInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ChallengeExtInfo)) { + return false; + } + ChallengeExtInfo other = (ChallengeExtInfo) o; + return bitField0_ == other.bitField0_ + && (!hasBossInfo() || bossInfo.equals(other.bossInfo)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(bossInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(bossInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ChallengeExtInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 58: { + // bossInfo + input.readMessage(bossInfo); + 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.writeMessage(FieldNames.bossInfo, bossInfo); + } + output.endObject(); + } + + @Override + public ChallengeExtInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 2126222779: + case 1508572736: { + if (input.isAtField(FieldNames.bossInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(bossInfo); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ChallengeExtInfo clone() { + return new ChallengeExtInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ChallengeExtInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ChallengeExtInfo(), data).checkInitialized(); + } + + public static ChallengeExtInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeExtInfo(), input).checkInitialized(); + } + + public static ChallengeExtInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ChallengeExtInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ChallengeExtInfo messages + */ + public static MessageFactory getFactory() { + return ChallengeExtInfoFactory.INSTANCE; + } + + private enum ChallengeExtInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ChallengeExtInfo create() { + return ChallengeExtInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName bossInfo = FieldName.forField("bossInfo", "boss_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java index 9bd2377..47357cb 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeInfoOuterClass.java @@ -18,38 +18,38 @@ public final class ChallengeInfoOuterClass { public static final class ChallengeInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 round_count = 2; - */ - private int roundCount; - /** * optional uint32 score = 3; */ private int score; /** - * optional uint32 score_two = 4; + * optional uint32 round_count = 5; + */ + private int roundCount; + + /** + * optional uint32 score_two = 9; */ private int scoreTwo; /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 15; */ private int challengeId; /** - * optional .ChallengeStatus status = 6; + * optional .ChallengeStatus status = 13; */ private int status; /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 14; */ private int extraLineupType; /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_info = 4; */ private final ChallengeStoryInfoOuterClass.ChallengeStoryInfo storyInfo = ChallengeStoryInfoOuterClass.ChallengeStoryInfo.newInstance(); @@ -63,49 +63,12 @@ public final class ChallengeInfoOuterClass { return new ChallengeInfo(); } - /** - * optional uint32 round_count = 2; - * @return whether the roundCount field is set - */ - public boolean hasRoundCount() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 round_count = 2; - * @return this - */ - public ChallengeInfo clearRoundCount() { - bitField0_ &= ~0x00000001; - roundCount = 0; - return this; - } - - /** - * optional uint32 round_count = 2; - * @return the roundCount - */ - public int getRoundCount() { - return roundCount; - } - - /** - * optional uint32 round_count = 2; - * @param value the roundCount to set - * @return this - */ - public ChallengeInfo setRoundCount(final int value) { - bitField0_ |= 0x00000001; - roundCount = value; - return this; - } - /** * optional uint32 score = 3; * @return whether the score field is set */ public boolean hasScore() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -113,7 +76,7 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo clearScore() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; score = 0; return this; } @@ -132,13 +95,50 @@ public final class ChallengeInfoOuterClass { * @return this */ public ChallengeInfo setScore(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; score = value; return this; } /** - * optional uint32 score_two = 4; + * optional uint32 round_count = 5; + * @return whether the roundCount field is set + */ + public boolean hasRoundCount() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 round_count = 5; + * @return this + */ + public ChallengeInfo clearRoundCount() { + bitField0_ &= ~0x00000002; + roundCount = 0; + return this; + } + + /** + * optional uint32 round_count = 5; + * @return the roundCount + */ + public int getRoundCount() { + return roundCount; + } + + /** + * optional uint32 round_count = 5; + * @param value the roundCount to set + * @return this + */ + public ChallengeInfo setRoundCount(final int value) { + bitField0_ |= 0x00000002; + roundCount = value; + return this; + } + + /** + * optional uint32 score_two = 9; * @return whether the scoreTwo field is set */ public boolean hasScoreTwo() { @@ -146,7 +146,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 9; * @return this */ public ChallengeInfo clearScoreTwo() { @@ -156,7 +156,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 9; * @return the scoreTwo */ public int getScoreTwo() { @@ -164,7 +164,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 score_two = 4; + * optional uint32 score_two = 9; * @param value the scoreTwo to set * @return this */ @@ -175,7 +175,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 15; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -183,7 +183,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 15; * @return this */ public ChallengeInfo clearChallengeId() { @@ -193,7 +193,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 15; * @return the challengeId */ public int getChallengeId() { @@ -201,7 +201,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional uint32 challenge_id = 14; + * optional uint32 challenge_id = 15; * @param value the challengeId to set * @return this */ @@ -212,7 +212,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 6; + * optional .ChallengeStatus status = 13; * @return whether the status field is set */ public boolean hasStatus() { @@ -220,7 +220,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 6; + * optional .ChallengeStatus status = 13; * @return this */ public ChallengeInfo clearStatus() { @@ -230,7 +230,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 6; + * optional .ChallengeStatus status = 13; * @return the status */ public ChallengeStatusOuterClass.ChallengeStatus getStatus() { @@ -263,7 +263,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStatus status = 6; + * optional .ChallengeStatus status = 13; * @param value the status to set * @return this */ @@ -274,7 +274,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 14; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -282,7 +282,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 14; * @return this */ public ChallengeInfo clearExtraLineupType() { @@ -292,7 +292,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 14; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -325,7 +325,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 12; + * optional .ExtraLineupType extra_lineup_type = 14; * @param value the extraLineupType to set * @return this */ @@ -336,7 +336,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_info = 4; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -344,7 +344,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_info = 4; * @return this */ public ChallengeInfo clearStoryInfo() { @@ -354,7 +354,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_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. @@ -368,7 +368,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_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 @@ -382,7 +382,7 @@ public final class ChallengeInfoOuterClass { } /** - * optional .ChallengeStoryInfo story_info = 9; + * optional .ChallengeStoryInfo story_info = 4; * @param value the storyInfo to set * @return this */ @@ -397,8 +397,8 @@ public final class ChallengeInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - roundCount = other.roundCount; score = other.score; + roundCount = other.roundCount; scoreTwo = other.scoreTwo; challengeId = other.challengeId; status = other.status; @@ -414,12 +414,12 @@ public final class ChallengeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRoundCount()) { - setRoundCount(other.roundCount); - } if (other.hasScore()) { setScore(other.score); } + if (other.hasRoundCount()) { + setRoundCount(other.roundCount); + } if (other.hasScoreTwo()) { setScoreTwo(other.scoreTwo); } @@ -445,8 +445,8 @@ public final class ChallengeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - roundCount = 0; score = 0; + roundCount = 0; scoreTwo = 0; challengeId = 0; status = 0; @@ -476,8 +476,8 @@ public final class ChallengeInfoOuterClass { } ChallengeInfo other = (ChallengeInfo) o; return bitField0_ == other.bitField0_ - && (!hasRoundCount() || roundCount == other.roundCount) && (!hasScore() || score == other.score) + && (!hasRoundCount() || roundCount == other.roundCount) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) && (!hasChallengeId() || challengeId == other.challengeId) && (!hasStatus() || status == other.status) @@ -488,31 +488,31 @@ public final class ChallengeInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(roundCount); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); output.writeUInt32NoTag(score); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(roundCount); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeMessageNoTag(storyInfo); } } @@ -521,10 +521,10 @@ public final class ChallengeInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundCount); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); @@ -551,43 +551,43 @@ public final class ChallengeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // roundCount - roundCount = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } case 24: { // score score = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { + case 40: { + // roundCount + roundCount = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // scoreTwo scoreTwo = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { + case 120: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 48) { + if (tag != 104) { break; } } - case 48: { + case 104: { // status final int value = input.readInt32(); if (ChallengeStatusOuterClass.ChallengeStatus.forNumber(value) != null) { @@ -595,11 +595,11 @@ public final class ChallengeInfoOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // extraLineupType final int value = input.readInt32(); if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { @@ -607,11 +607,11 @@ public final class ChallengeInfoOuterClass { bitField0_ |= 0x00000020; } tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000040; @@ -638,10 +638,10 @@ public final class ChallengeInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.roundCount, roundCount); + output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.score, score); + output.writeUInt32(FieldNames.roundCount, roundCount); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.scoreTwo, scoreTwo); @@ -668,11 +668,10 @@ public final class ChallengeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -171935711: - case -244677858: { - if (input.isAtField(FieldNames.roundCount)) { + case 109264530: { + if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { - roundCount = input.readUInt32(); + score = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -680,10 +679,11 @@ public final class ChallengeInfoOuterClass { } break; } - case 109264530: { - if (input.isAtField(FieldNames.score)) { + case -171935711: + case -244677858: { + if (input.isAtField(FieldNames.roundCount)) { if (!input.trySkipNullValue()) { - score = input.readUInt32(); + roundCount = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -812,10 +812,10 @@ public final class ChallengeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); - static final FieldName score = FieldName.forField("score"); + static final FieldName roundCount = FieldName.forField("roundCount", "round_count"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeLineupNotifyOuterClass.java index d3c0134..d9c1d21 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 = 3; + * optional .ExtraLineupType extra_lineup_type = 12; */ private int extraLineupType; @@ -34,7 +34,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 12; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -42,7 +42,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 12; * @return this */ public ChallengeLineupNotify clearExtraLineupType() { @@ -52,7 +52,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 12; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -85,7 +85,7 @@ public final class ChallengeLineupNotifyOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 3; + * optional .ExtraLineupType extra_lineup_type = 12; * @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) 24); + output.writeRawByte((byte) 96); output.writeEnumNoTag(extraLineupType); } } @@ -176,7 +176,7 @@ public final class ChallengeLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // 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 71be77c..6dfb88a 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeOuterClass.java @@ -19,30 +19,30 @@ public final class ChallengeOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 1; - */ - private int challengeId; - - /** - * optional uint32 GEHGEGOFDDM = 5; - */ - private int gEHGEGOFDDM; - - /** - * optional uint32 score = 7; - */ - private int score; - - /** - * optional uint32 stars = 8; + * optional uint32 stars = 3; */ private int stars; /** - * optional uint32 taken_reward = 13; + * optional uint32 score = 4; + */ + private int score; + + /** + * optional uint32 taken_reward = 10; */ private int takenReward; + /** + * optional uint32 challenge_id = 13; + */ + private int challengeId; + + /** + * optional .ChallengeExtInfo ext_info = 7; + */ + private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); + private Challenge() { } @@ -54,136 +54,25 @@ public final class ChallengeOuterClass { } /** - * optional uint32 challenge_id = 1; - * @return whether the challengeId field is set + * optional uint32 stars = 3; + * @return whether the stars field is set */ - public boolean hasChallengeId() { + public boolean hasStars() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 challenge_id = 1; - * @return this - */ - public Challenge clearChallengeId() { - bitField0_ &= ~0x00000001; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 1; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 1; - * @param value the challengeId to set - * @return this - */ - public Challenge setChallengeId(final int value) { - bitField0_ |= 0x00000001; - challengeId = value; - return this; - } - - /** - * optional uint32 GEHGEGOFDDM = 5; - * @return whether the gEHGEGOFDDM field is set - */ - public boolean hasGEHGEGOFDDM() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 GEHGEGOFDDM = 5; - * @return this - */ - public Challenge clearGEHGEGOFDDM() { - bitField0_ &= ~0x00000002; - gEHGEGOFDDM = 0; - return this; - } - - /** - * optional uint32 GEHGEGOFDDM = 5; - * @return the gEHGEGOFDDM - */ - public int getGEHGEGOFDDM() { - return gEHGEGOFDDM; - } - - /** - * optional uint32 GEHGEGOFDDM = 5; - * @param value the gEHGEGOFDDM to set - * @return this - */ - public Challenge setGEHGEGOFDDM(final int value) { - bitField0_ |= 0x00000002; - gEHGEGOFDDM = value; - return this; - } - - /** - * optional uint32 score = 7; - * @return whether the score field is set - */ - public boolean hasScore() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 score = 7; - * @return this - */ - public Challenge clearScore() { - bitField0_ &= ~0x00000004; - score = 0; - return this; - } - - /** - * optional uint32 score = 7; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 7; - * @param value the score to set - * @return this - */ - public Challenge setScore(final int value) { - bitField0_ |= 0x00000004; - score = value; - return this; - } - - /** - * optional uint32 stars = 8; - * @return whether the stars field is set - */ - public boolean hasStars() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 stars = 8; + * optional uint32 stars = 3; * @return this */ public Challenge clearStars() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; stars = 0; return this; } /** - * optional uint32 stars = 8; + * optional uint32 stars = 3; * @return the stars */ public int getStars() { @@ -191,36 +80,73 @@ public final class ChallengeOuterClass { } /** - * optional uint32 stars = 8; + * optional uint32 stars = 3; * @param value the stars to set * @return this */ public Challenge setStars(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; stars = value; return this; } /** - * optional uint32 taken_reward = 13; - * @return whether the takenReward field is set + * optional uint32 score = 4; + * @return whether the score field is set */ - public boolean hasTakenReward() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasScore() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 taken_reward = 13; + * optional uint32 score = 4; + * @return this + */ + public Challenge clearScore() { + bitField0_ &= ~0x00000002; + score = 0; + return this; + } + + /** + * optional uint32 score = 4; + * @return the score + */ + public int getScore() { + return score; + } + + /** + * optional uint32 score = 4; + * @param value the score to set + * @return this + */ + public Challenge setScore(final int value) { + bitField0_ |= 0x00000002; + score = value; + return this; + } + + /** + * optional uint32 taken_reward = 10; + * @return whether the takenReward field is set + */ + public boolean hasTakenReward() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 taken_reward = 10; * @return this */ public Challenge clearTakenReward() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; takenReward = 0; return this; } /** - * optional uint32 taken_reward = 13; + * optional uint32 taken_reward = 10; * @return the takenReward */ public int getTakenReward() { @@ -228,26 +154,120 @@ public final class ChallengeOuterClass { } /** - * optional uint32 taken_reward = 13; + * optional uint32 taken_reward = 10; * @param value the takenReward to set * @return this */ public Challenge setTakenReward(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; takenReward = value; return this; } + /** + * optional uint32 challenge_id = 13; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 challenge_id = 13; + * @return this + */ + public Challenge clearChallengeId() { + bitField0_ &= ~0x00000008; + challengeId = 0; + return this; + } + + /** + * optional uint32 challenge_id = 13; + * @return the challengeId + */ + public int getChallengeId() { + return challengeId; + } + + /** + * optional uint32 challenge_id = 13; + * @param value the challengeId to set + * @return this + */ + public Challenge setChallengeId(final int value) { + bitField0_ |= 0x00000008; + challengeId = value; + return this; + } + + /** + * optional .ChallengeExtInfo ext_info = 7; + * @return whether the extInfo field is set + */ + public boolean hasExtInfo() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional .ChallengeExtInfo ext_info = 7; + * @return this + */ + public Challenge clearExtInfo() { + bitField0_ &= ~0x00000010; + extInfo.clear(); + return this; + } + + /** + * optional .ChallengeExtInfo ext_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 #getMutableExtInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_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 ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { + bitField0_ |= 0x00000010; + return extInfo; + } + + /** + * optional .ChallengeExtInfo ext_info = 7; + * @param value the extInfo to set + * @return this + */ + public Challenge setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { + bitField0_ |= 0x00000010; + extInfo.copyFrom(value); + return this; + } + @Override public Challenge copyFrom(final Challenge other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - challengeId = other.challengeId; - gEHGEGOFDDM = other.gEHGEGOFDDM; - score = other.score; stars = other.stars; + score = other.score; takenReward = other.takenReward; + challengeId = other.challengeId; + extInfo.copyFrom(other.extInfo); } return this; } @@ -258,21 +278,21 @@ public final class ChallengeOuterClass { return this; } cachedSize = -1; - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); - } - if (other.hasGEHGEGOFDDM()) { - setGEHGEGOFDDM(other.gEHGEGOFDDM); + if (other.hasStars()) { + setStars(other.stars); } if (other.hasScore()) { setScore(other.score); } - if (other.hasStars()) { - setStars(other.stars); - } if (other.hasTakenReward()) { setTakenReward(other.takenReward); } + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); + } return this; } @@ -283,11 +303,11 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeId = 0; - gEHGEGOFDDM = 0; - score = 0; stars = 0; + score = 0; takenReward = 0; + challengeId = 0; + extInfo.clear(); return this; } @@ -298,6 +318,7 @@ public final class ChallengeOuterClass { } cachedSize = -1; bitField0_ = 0; + extInfo.clearQuick(); return this; } @@ -311,55 +332,55 @@ public final class ChallengeOuterClass { } Challenge other = (Challenge) o; return bitField0_ == other.bitField0_ - && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasGEHGEGOFDDM() || gEHGEGOFDDM == other.gEHGEGOFDDM) - && (!hasScore() || score == other.score) && (!hasStars() || stars == other.stars) - && (!hasTakenReward() || takenReward == other.takenReward); + && (!hasScore() || score == other.score) + && (!hasTakenReward() || takenReward == other.takenReward) + && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasExtInfo() || extInfo.equals(other.extInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(challengeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(gEHGEGOFDDM); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(score); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(stars); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(score); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(takenReward); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(challengeId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(extInfo); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gEHGEGOFDDM); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(takenReward); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); + } return size; } @@ -370,45 +391,45 @@ public final class ChallengeOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // challengeId - challengeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // gEHGEGOFDDM - gEHGEGOFDDM = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 24: { // stars stars = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // score + score = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // takenReward + takenReward = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // takenReward - takenReward = input.readUInt32(); + // challengeId + challengeId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // extInfo + input.readMessage(extInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -433,20 +454,20 @@ public final class ChallengeOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.gEHGEGOFDDM, gEHGEGOFDDM); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.score, score); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.stars, stars); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.score, score); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.takenReward, takenReward); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.challengeId, challengeId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeMessage(FieldNames.extInfo, extInfo); + } output.endObject(); } @@ -457,11 +478,10 @@ public final class ChallengeOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -469,33 +489,11 @@ public final class ChallengeOuterClass { } break; } - case 1704714807: { - if (input.isAtField(FieldNames.gEHGEGOFDDM)) { - if (!input.trySkipNullValue()) { - gEHGEGOFDDM = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 109264530: { if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { score = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 109757537: { - if (input.isAtField(FieldNames.stars)) { - if (!input.trySkipNullValue()) { - stars = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -507,6 +505,30 @@ public final class ChallengeOuterClass { if (input.isAtField(FieldNames.takenReward)) { if (!input.trySkipNullValue()) { takenReward = 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 { + input.skipUnknownField(); + } + break; + } + case -1306498449: + case -1826570228: { + if (input.isAtField(FieldNames.extInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(extInfo); bitField0_ |= 0x00000010; } } else { @@ -566,15 +588,15 @@ public final class ChallengeOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); - - static final FieldName gEHGEGOFDDM = FieldName.forField("GEHGEGOFDDM"); + static final FieldName stars = FieldName.forField("stars"); static final FieldName score = FieldName.forField("score"); - static final FieldName stars = FieldName.forField("stars"); - static final FieldName takenReward = FieldName.forField("takenReward", "taken_reward"); + + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + + 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 9d12121..42c0965 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 = 11; + * optional uint64 taken_challenge_reward = 8; */ private long takenChallengeReward; /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 13; */ private int groupId; @@ -39,7 +39,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 11; + * optional uint64 taken_challenge_reward = 8; * @return whether the takenChallengeReward field is set */ public boolean hasTakenChallengeReward() { @@ -47,7 +47,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 11; + * optional uint64 taken_challenge_reward = 8; * @return this */ public ChallengeReward clearTakenChallengeReward() { @@ -57,7 +57,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 11; + * optional uint64 taken_challenge_reward = 8; * @return the takenChallengeReward */ public long getTakenChallengeReward() { @@ -65,7 +65,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint64 taken_challenge_reward = 11; + * optional uint64 taken_challenge_reward = 8; * @param value the takenChallengeReward to set * @return this */ @@ -76,7 +76,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 13; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 13; * @return this */ public ChallengeReward clearGroupId() { @@ -94,7 +94,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 13; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class ChallengeRewardOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 13; * @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) 88); + output.writeRawByte((byte) 64); output.writeUInt64NoTag(takenChallengeReward); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class ChallengeRewardOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 64: { // takenChallengeReward takenChallengeReward = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 104) { break; } } - case 32: { + case 104: { // 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 2449b56..3f44729 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeSettleNotifyOuterClass.java @@ -19,14 +19,14 @@ public final class ChallengeSettleNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stars = 1; + * optional uint32 score_two = 4; */ - private int stars; + private int scoreTwo; /** - * optional uint32 challenge_id = 3; + * optional uint32 stars = 9; */ - private int challengeId; + private int stars; /** * optional uint32 challenge_score = 10; @@ -34,17 +34,17 @@ public final class ChallengeSettleNotifyOuterClass { private int challengeScore; /** - * optional uint32 score_two = 12; + * optional uint32 challenge_id = 12; */ - private int scoreTwo; + private int challengeId; /** - * optional bool is_win = 5; + * optional bool is_win = 1; */ private boolean isWin; /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 5; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -59,25 +59,62 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 1; - * @return whether the stars field is set + * optional uint32 score_two = 4; + * @return whether the scoreTwo field is set */ - public boolean hasStars() { + public boolean hasScoreTwo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stars = 1; + * optional uint32 score_two = 4; + * @return this + */ + public ChallengeSettleNotify clearScoreTwo() { + bitField0_ &= ~0x00000001; + scoreTwo = 0; + return this; + } + + /** + * optional uint32 score_two = 4; + * @return the scoreTwo + */ + public int getScoreTwo() { + return scoreTwo; + } + + /** + * optional uint32 score_two = 4; + * @param value the scoreTwo to set + * @return this + */ + public ChallengeSettleNotify setScoreTwo(final int value) { + bitField0_ |= 0x00000001; + scoreTwo = value; + return this; + } + + /** + * optional uint32 stars = 9; + * @return whether the stars field is set + */ + public boolean hasStars() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 stars = 9; * @return this */ public ChallengeSettleNotify clearStars() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; stars = 0; return this; } /** - * optional uint32 stars = 1; + * optional uint32 stars = 9; * @return the stars */ public int getStars() { @@ -85,50 +122,13 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 stars = 1; + * optional uint32 stars = 9; * @param value the stars to set * @return this */ public ChallengeSettleNotify setStars(final int value) { - bitField0_ |= 0x00000001; - stars = value; - return this; - } - - /** - * optional uint32 challenge_id = 3; - * @return whether the challengeId field is set - */ - public boolean hasChallengeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 challenge_id = 3; - * @return this - */ - public ChallengeSettleNotify clearChallengeId() { - bitField0_ &= ~0x00000002; - challengeId = 0; - return this; - } - - /** - * optional uint32 challenge_id = 3; - * @return the challengeId - */ - public int getChallengeId() { - return challengeId; - } - - /** - * optional uint32 challenge_id = 3; - * @param value the challengeId to set - * @return this - */ - public ChallengeSettleNotify setChallengeId(final int value) { bitField0_ |= 0x00000002; - challengeId = value; + stars = value; return this; } @@ -170,44 +170,44 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional uint32 score_two = 12; - * @return whether the scoreTwo field is set + * optional uint32 challenge_id = 12; + * @return whether the challengeId field is set */ - public boolean hasScoreTwo() { + public boolean hasChallengeId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 score_two = 12; + * optional uint32 challenge_id = 12; * @return this */ - public ChallengeSettleNotify clearScoreTwo() { + public ChallengeSettleNotify clearChallengeId() { bitField0_ &= ~0x00000008; - scoreTwo = 0; + challengeId = 0; return this; } /** - * optional uint32 score_two = 12; - * @return the scoreTwo + * optional uint32 challenge_id = 12; + * @return the challengeId */ - public int getScoreTwo() { - return scoreTwo; + public int getChallengeId() { + return challengeId; } /** - * optional uint32 score_two = 12; - * @param value the scoreTwo to set + * optional uint32 challenge_id = 12; + * @param value the challengeId to set * @return this */ - public ChallengeSettleNotify setScoreTwo(final int value) { + public ChallengeSettleNotify setChallengeId(final int value) { bitField0_ |= 0x00000008; - scoreTwo = value; + challengeId = value; return this; } /** - * optional bool is_win = 5; + * optional bool is_win = 1; * @return whether the isWin field is set */ public boolean hasIsWin() { @@ -215,7 +215,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 5; + * optional bool is_win = 1; * @return this */ public ChallengeSettleNotify clearIsWin() { @@ -225,7 +225,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 5; + * optional bool is_win = 1; * @return the isWin */ public boolean getIsWin() { @@ -233,7 +233,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional bool is_win = 5; + * optional bool is_win = 1; * @param value the isWin to set * @return this */ @@ -244,7 +244,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 5; * @return whether the reward field is set */ public boolean hasReward() { @@ -252,7 +252,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 5; * @return this */ public ChallengeSettleNotify clearReward() { @@ -262,7 +262,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 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. @@ -276,7 +276,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 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 @@ -290,7 +290,7 @@ public final class ChallengeSettleNotifyOuterClass { } /** - * optional .ItemList reward = 14; + * optional .ItemList reward = 5; * @param value the reward to set * @return this */ @@ -305,10 +305,10 @@ public final class ChallengeSettleNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stars = other.stars; - challengeId = other.challengeId; - challengeScore = other.challengeScore; scoreTwo = other.scoreTwo; + stars = other.stars; + challengeScore = other.challengeScore; + challengeId = other.challengeId; isWin = other.isWin; reward.copyFrom(other.reward); } @@ -321,17 +321,17 @@ public final class ChallengeSettleNotifyOuterClass { return this; } cachedSize = -1; + if (other.hasScoreTwo()) { + setScoreTwo(other.scoreTwo); + } if (other.hasStars()) { setStars(other.stars); } - if (other.hasChallengeId()) { - setChallengeId(other.challengeId); - } if (other.hasChallengeScore()) { setChallengeScore(other.challengeScore); } - if (other.hasScoreTwo()) { - setScoreTwo(other.scoreTwo); + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); } if (other.hasIsWin()) { setIsWin(other.isWin); @@ -349,10 +349,10 @@ public final class ChallengeSettleNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - stars = 0; - challengeId = 0; - challengeScore = 0; scoreTwo = 0; + stars = 0; + challengeScore = 0; + challengeId = 0; isWin = false; reward.clear(); return this; @@ -379,10 +379,10 @@ public final class ChallengeSettleNotifyOuterClass { } ChallengeSettleNotify other = (ChallengeSettleNotify) o; return bitField0_ == other.bitField0_ - && (!hasStars() || stars == other.stars) - && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasChallengeScore() || challengeScore == other.challengeScore) && (!hasScoreTwo() || scoreTwo == other.scoreTwo) + && (!hasStars() || stars == other.stars) + && (!hasChallengeScore() || challengeScore == other.challengeScore) + && (!hasChallengeId() || challengeId == other.challengeId) && (!hasIsWin() || isWin == other.isWin) && (!hasReward() || reward.equals(other.reward)); } @@ -390,12 +390,12 @@ public final class ChallengeSettleNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(stars); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(challengeId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(stars); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); @@ -403,14 +403,14 @@ public final class ChallengeSettleNotifyOuterClass { } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(scoreTwo); + output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isWin); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 42); output.writeMessageNoTag(reward); } } @@ -419,16 +419,16 @@ public final class ChallengeSettleNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); + size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stars); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeScore); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(scoreTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -446,18 +446,18 @@ public final class ChallengeSettleNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // stars - stars = input.readUInt32(); + case 32: { + // scoreTwo + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 72) { break; } } - case 24: { - // challengeId - challengeId = input.readUInt32(); + case 72: { + // stars + stars = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 80) { @@ -474,24 +474,24 @@ public final class ChallengeSettleNotifyOuterClass { } } case 96: { - // scoreTwo - scoreTwo = input.readUInt32(); + // challengeId + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 40) { + if (tag != 8) { break; } } - case 40: { + case 8: { // isWin isWin = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 114) { + if (tag != 42) { break; } } - case 114: { + case 42: { // reward input.readMessage(reward); bitField0_ |= 0x00000020; @@ -518,16 +518,16 @@ public final class ChallengeSettleNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stars, stars); + output.writeUInt32(FieldNames.scoreTwo, scoreTwo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.challengeId, challengeId); + output.writeUInt32(FieldNames.stars, stars); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.challengeScore, challengeScore); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.scoreTwo, scoreTwo); + output.writeUInt32(FieldNames.challengeId, challengeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isWin, isWin); @@ -545,10 +545,11 @@ public final class ChallengeSettleNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 109757537: { - if (input.isAtField(FieldNames.stars)) { + case -485512614: + case 2129303327: { + if (input.isAtField(FieldNames.scoreTwo)) { if (!input.trySkipNullValue()) { - stars = input.readUInt32(); + scoreTwo = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -556,11 +557,10 @@ public final class ChallengeSettleNotifyOuterClass { } 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_ |= 0x00000002; } } else { @@ -580,11 +580,11 @@ public final class ChallengeSettleNotifyOuterClass { } break; } - case -485512614: - case 2129303327: { - if (input.isAtField(FieldNames.scoreTwo)) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { if (!input.trySkipNullValue()) { - scoreTwo = input.readUInt32(); + challengeId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -668,13 +668,13 @@ public final class ChallengeSettleNotifyOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stars = FieldName.forField("stars"); + static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); - static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); + static final FieldName stars = FieldName.forField("stars"); static final FieldName challengeScore = FieldName.forField("challengeScore", "challenge_score"); - static final FieldName scoreTwo = FieldName.forField("scoreTwo", "score_two"); + static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName isWin = FieldName.forField("isWin", "is_win"); diff --git a/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChallengeStoryBuffInfoOuterClass.java index 50a25e8..9fa0c38 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 = 1; + * repeated uint32 buff_list = 15; */ private final RepeatedInt buffList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 buff_list = 15; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -43,7 +43,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 buff_list = 15; * @return this */ public ChallengeStoryBuffInfo clearBuffList() { @@ -53,7 +53,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 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. @@ -67,7 +67,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 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 @@ -81,7 +81,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 buff_list = 15; * @param value the buffList to add * @return this */ @@ -92,7 +92,7 @@ public final class ChallengeStoryBuffInfoOuterClass { } /** - * repeated uint32 buff_list = 1; + * repeated uint32 buff_list = 15; * @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) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(buffList.array()[i]); } } @@ -185,7 +185,7 @@ public final class ChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 122: { // buffList [packed=true] input.readPackedUInt32(buffList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class ChallengeStoryBuffInfoOuterClass { tag = input.readTag(); break; } - case 8: { + case 120: { // 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 cd8883d..a80d4f5 100644 --- a/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChallengeStoryInfoOuterClass.java @@ -19,7 +19,12 @@ public final class ChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; + * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; + */ + private final ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo curBossBuffs = ChallengeBossBuffInfoOuterClass.ChallengeBossBuffInfo.newInstance(); + + /** + * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; */ private final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo curStoryBuffs = ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo.newInstance(); @@ -33,37 +38,84 @@ public final class ChallengeStoryInfoOuterClass { return new ChallengeStoryInfo(); } - public boolean hasStoryBuffs() { - return (((bitField0_ & 0x00000001)) != 0); - } - - public ChallengeStoryInfo clearStoryBuffs() { - if (hasStoryBuffs()) { - clearCurStoryBuffs(); - } - return this; - } - /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; - * @return whether the curStoryBuffs field is set + * optional .ChallengeBossBuffInfo cur_boss_buffs = 2; + * @return whether the curBossBuffs field is set */ - public boolean hasCurStoryBuffs() { + public boolean hasCurBossBuffs() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; + * 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; * @return this */ public ChallengeStoryInfo clearCurStoryBuffs() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; curStoryBuffs.clear(); return this; } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 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. @@ -77,7 +129,7 @@ public final class ChallengeStoryInfoOuterClass { } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 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 @@ -86,18 +138,18 @@ public final class ChallengeStoryInfoOuterClass { * @return internal storage object for modifications */ public ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo getMutableCurStoryBuffs() { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return curStoryBuffs; } /** - * optional .ChallengeStoryBuffInfo cur_story_buffs = 5; + * optional .ChallengeStoryBuffInfo cur_story_buffs = 10; * @param value the curStoryBuffs to set * @return this */ public ChallengeStoryInfo setCurStoryBuffs( final ChallengeStoryBuffInfoOuterClass.ChallengeStoryBuffInfo value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; curStoryBuffs.copyFrom(value); return this; } @@ -107,6 +159,7 @@ public final class ChallengeStoryInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + curBossBuffs.copyFrom(other.curBossBuffs); curStoryBuffs.copyFrom(other.curStoryBuffs); } return this; @@ -118,6 +171,9 @@ public final class ChallengeStoryInfoOuterClass { return this; } cachedSize = -1; + if (other.hasCurBossBuffs()) { + getMutableCurBossBuffs().mergeFrom(other.curBossBuffs); + } if (other.hasCurStoryBuffs()) { getMutableCurStoryBuffs().mergeFrom(other.curStoryBuffs); } @@ -131,6 +187,7 @@ public final class ChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + curBossBuffs.clear(); curStoryBuffs.clear(); return this; } @@ -142,6 +199,7 @@ public final class ChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + curBossBuffs.clearQuick(); curStoryBuffs.clearQuick(); return this; } @@ -156,13 +214,18 @@ public final class ChallengeStoryInfoOuterClass { } ChallengeStoryInfo other = (ChallengeStoryInfo) o; return bitField0_ == other.bitField0_ + && (!hasCurBossBuffs() || curBossBuffs.equals(other.curBossBuffs)) && (!hasCurStoryBuffs() || curStoryBuffs.equals(other.curStoryBuffs)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); + output.writeMessageNoTag(curBossBuffs); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 82); output.writeMessageNoTag(curStoryBuffs); } } @@ -171,6 +234,9 @@ public final class ChallengeStoryInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(curBossBuffs); + } + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(curStoryBuffs); } return size; @@ -183,10 +249,19 @@ public final class ChallengeStoryInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 18: { + // curBossBuffs + input.readMessage(curBossBuffs); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // curStoryBuffs input.readMessage(curStoryBuffs); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -210,6 +285,9 @@ public final class ChallengeStoryInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { + output.writeMessage(FieldNames.curBossBuffs, curBossBuffs); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.curStoryBuffs, curStoryBuffs); } output.endObject(); @@ -222,12 +300,24 @@ public final class ChallengeStoryInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1632186189: + case -340377971: { + if (input.isAtField(FieldNames.curBossBuffs)) { + if (!input.trySkipNullValue()) { + input.readMessage(curBossBuffs); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -587091733: case -738440393: { if (input.isAtField(FieldNames.curStoryBuffs)) { if (!input.trySkipNullValue()) { input.readMessage(curStoryBuffs); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -287,6 +377,8 @@ 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"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChangeLineupLeaderCsReqOuterClass.java index f2f3c62..ab5f2d3 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 = 14; + * optional uint32 slot = 6; */ private int slot; @@ -34,7 +34,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 14; + * optional uint32 slot = 6; * @return whether the slot field is set */ public boolean hasSlot() { @@ -42,7 +42,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 14; + * optional uint32 slot = 6; * @return this */ public ChangeLineupLeaderCsReq clearSlot() { @@ -52,7 +52,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 14; + * optional uint32 slot = 6; * @return the slot */ public int getSlot() { @@ -60,7 +60,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { } /** - * optional uint32 slot = 14; + * optional uint32 slot = 6; * @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) 112); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(slot); } } @@ -150,7 +150,7 @@ public final class ChangeLineupLeaderCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 48: { // 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 331c43c..ac43b2c 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 slot = 12; - */ - private int slot; - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; */ private int retcode; + /** + * optional uint32 slot = 15; + */ + private int slot; + private ChangeLineupLeaderScRsp() { } @@ -39,62 +39,25 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 slot = 12; - * @return whether the slot field is set + * optional uint32 retcode = 11; + * @return whether the retcode field is set */ - public boolean hasSlot() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 12; - * @return this - */ - public ChangeLineupLeaderScRsp clearSlot() { - bitField0_ &= ~0x00000001; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 12; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 12; - * @param value the slot to set - * @return this - */ - public ChangeLineupLeaderScRsp setSlot(final int value) { - bitField0_ |= 0x00000001; - slot = value; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @return this */ public ChangeLineupLeaderScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class ChangeLineupLeaderScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ public ChangeLineupLeaderScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public ChangeLineupLeaderScRsp clearSlot() { + bitField0_ &= ~0x00000002; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 15; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 15; + * @param value the slot to set + * @return this + */ + public ChangeLineupLeaderScRsp setSlot(final int value) { + bitField0_ |= 0x00000002; + slot = value; + return this; + } + @Override public ChangeLineupLeaderScRsp copyFrom(final ChangeLineupLeaderScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; retcode = other.retcode; + slot = other.slot; } return this; } @@ -129,12 +129,12 @@ public final class ChangeLineupLeaderScRspOuterClass { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasSlot()) { + setSlot(other.slot); + } return this; } @@ -145,8 +145,8 @@ public final class ChangeLineupLeaderScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - slot = 0; retcode = 0; + slot = 0; return this; } @@ -170,19 +170,19 @@ public final class ChangeLineupLeaderScRspOuterClass { } ChangeLineupLeaderScRsp other = (ChangeLineupLeaderScRsp) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasSlot() || slot == other.slot); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(slot); } } @@ -190,10 +190,10 @@ public final class ChangeLineupLeaderScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } return size; } @@ -205,18 +205,18 @@ public final class ChangeLineupLeaderScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // slot - slot = input.readUInt32(); + case 88: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 120: { + // slot + slot = 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.slot, slot); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.slot, slot); } output.endObject(); } @@ -256,10 +256,10 @@ public final class ChangeLineupLeaderScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class ChangeLineupLeaderScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + slot = 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 slot = FieldName.forField("slot"); - static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName slot = FieldName.forField("slot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java index ba9cb38..bdf1e4c 100644 --- a/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChargerInfoOuterClass.java @@ -19,15 +19,15 @@ public final class ChargerInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 12; - */ - private int groupId; - - /** - * optional uint32 unk_int = 14; + * optional uint32 unk_int = 7; */ private int unkInt; + /** + * optional uint32 group_id = 15; + */ + private int groupId; + private ChargerInfo() { } @@ -39,62 +39,25 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 group_id = 12; - * @return whether the groupId field is set + * optional uint32 unk_int = 7; + * @return whether the unkInt field is set */ - public boolean hasGroupId() { + public boolean hasUnkInt() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 group_id = 12; - * @return this - */ - public ChargerInfo clearGroupId() { - bitField0_ &= ~0x00000001; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 12; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 12; - * @param value the groupId to set - * @return this - */ - public ChargerInfo setGroupId(final int value) { - bitField0_ |= 0x00000001; - groupId = value; - return this; - } - - /** - * optional uint32 unk_int = 14; - * @return whether the unkInt field is set - */ - public boolean hasUnkInt() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unk_int = 14; + * optional uint32 unk_int = 7; * @return this */ public ChargerInfo clearUnkInt() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unkInt = 0; return this; } /** - * optional uint32 unk_int = 14; + * optional uint32 unk_int = 7; * @return the unkInt */ public int getUnkInt() { @@ -102,23 +65,60 @@ public final class ChargerInfoOuterClass { } /** - * optional uint32 unk_int = 14; + * optional uint32 unk_int = 7; * @param value the unkInt to set * @return this */ public ChargerInfo setUnkInt(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; unkInt = value; return this; } + /** + * optional uint32 group_id = 15; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 15; + * @return this + */ + public ChargerInfo clearGroupId() { + bitField0_ &= ~0x00000002; + groupId = 0; + return this; + } + + /** + * optional uint32 group_id = 15; + * @return the groupId + */ + public int getGroupId() { + return groupId; + } + + /** + * optional uint32 group_id = 15; + * @param value the groupId to set + * @return this + */ + public ChargerInfo setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + @Override public ChargerInfo copyFrom(final ChargerInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupId = other.groupId; unkInt = other.unkInt; + groupId = other.groupId; } return this; } @@ -129,12 +129,12 @@ public final class ChargerInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGroupId()) { - setGroupId(other.groupId); - } if (other.hasUnkInt()) { setUnkInt(other.unkInt); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } return this; } @@ -145,8 +145,8 @@ public final class ChargerInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupId = 0; unkInt = 0; + groupId = 0; return this; } @@ -170,19 +170,19 @@ public final class ChargerInfoOuterClass { } ChargerInfo other = (ChargerInfo) o; return bitField0_ == other.bitField0_ - && (!hasGroupId() || groupId == other.groupId) - && (!hasUnkInt() || unkInt == other.unkInt); + && (!hasUnkInt() || unkInt == other.unkInt) + && (!hasGroupId() || groupId == other.groupId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(unkInt); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(unkInt); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(groupId); } } @@ -190,10 +190,10 @@ public final class ChargerInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unkInt); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } return size; } @@ -205,18 +205,18 @@ public final class ChargerInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { - // groupId - groupId = input.readUInt32(); + case 56: { + // unkInt + unkInt = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { - // unkInt - unkInt = input.readUInt32(); + case 120: { + // groupId + groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class ChargerInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.unkInt, unkInt); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.unkInt, unkInt); + output.writeUInt32(FieldNames.groupId, groupId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class ChargerInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -840508003: + case -285293790: { + if (input.isAtField(FieldNames.unkInt)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + unkInt = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class ChargerInfoOuterClass { } break; } - case -840508003: - case -285293790: { - if (input.isAtField(FieldNames.unkInt)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - unkInt = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class ChargerInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupId = FieldName.forField("groupId", "group_id"); - static final FieldName unkInt = FieldName.forField("unkInt", "unk_int"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChatOuterClass.java index 804a0ac..3602ac2 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 = 1; + * optional uint64 sent_time = 2; */ private long sentTime; /** - * optional uint32 sender_uid = 9; - */ - private int senderUid; - - /** - * optional uint32 emote = 11; + * optional uint32 emote = 1; */ private int emote; /** - * optional .MsgType msg_type = 7; + * optional uint32 sender_uid = 7; + */ + private int senderUid; + + /** + * optional .MsgType msg_type = 10; */ private int msgType; /** - * optional string text = 15; + * optional string text = 5; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 1; + * optional uint64 sent_time = 2; * @return whether the sentTime field is set */ public boolean hasSentTime() { @@ -63,7 +63,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 1; + * optional uint64 sent_time = 2; * @return this */ public Chat clearSentTime() { @@ -73,7 +73,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 1; + * optional uint64 sent_time = 2; * @return the sentTime */ public long getSentTime() { @@ -81,7 +81,7 @@ public final class ChatOuterClass { } /** - * optional uint64 sent_time = 1; + * optional uint64 sent_time = 2; * @param value the sentTime to set * @return this */ @@ -92,62 +92,25 @@ public final class ChatOuterClass { } /** - * optional uint32 sender_uid = 9; - * @return whether the senderUid field is set + * optional uint32 emote = 1; + * @return whether the emote field is set */ - public boolean hasSenderUid() { + public boolean hasEmote() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 sender_uid = 9; - * @return this - */ - public Chat clearSenderUid() { - bitField0_ &= ~0x00000002; - senderUid = 0; - return this; - } - - /** - * optional uint32 sender_uid = 9; - * @return the senderUid - */ - public int getSenderUid() { - return senderUid; - } - - /** - * optional uint32 sender_uid = 9; - * @param value the senderUid to set - * @return this - */ - public Chat setSenderUid(final int value) { - bitField0_ |= 0x00000002; - senderUid = value; - return this; - } - - /** - * optional uint32 emote = 11; - * @return whether the emote field is set - */ - public boolean hasEmote() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 emote = 11; + * optional uint32 emote = 1; * @return this */ public Chat clearEmote() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; emote = 0; return this; } /** - * optional uint32 emote = 11; + * optional uint32 emote = 1; * @return the emote */ public int getEmote() { @@ -155,18 +118,55 @@ public final class ChatOuterClass { } /** - * optional uint32 emote = 11; + * optional uint32 emote = 1; * @param value the emote to set * @return this */ public Chat setEmote(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; emote = value; return this; } /** - * optional .MsgType msg_type = 7; + * optional uint32 sender_uid = 7; + * @return whether the senderUid field is set + */ + public boolean hasSenderUid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 sender_uid = 7; + * @return this + */ + public Chat clearSenderUid() { + bitField0_ &= ~0x00000004; + 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 Chat setSenderUid(final int value) { + bitField0_ |= 0x00000004; + senderUid = value; + return this; + } + + /** + * optional .MsgType msg_type = 10; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -174,7 +174,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 7; + * optional .MsgType msg_type = 10; * @return this */ public Chat clearMsgType() { @@ -184,7 +184,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 7; + * optional .MsgType msg_type = 10; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -217,7 +217,7 @@ public final class ChatOuterClass { } /** - * optional .MsgType msg_type = 7; + * optional .MsgType msg_type = 10; * @param value the msgType to set * @return this */ @@ -228,7 +228,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @return whether the text field is set */ public boolean hasText() { @@ -236,7 +236,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @return this */ public Chat clearText() { @@ -246,7 +246,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @return the text */ public String getText() { @@ -254,7 +254,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -262,7 +262,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -271,7 +271,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @param value the text to set * @return this */ @@ -282,7 +282,7 @@ public final class ChatOuterClass { } /** - * optional string text = 15; + * optional string text = 5; * @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; - senderUid = other.senderUid; emote = other.emote; + senderUid = other.senderUid; msgType = other.msgType; text.copyFrom(other.text); } @@ -315,12 +315,12 @@ public final class ChatOuterClass { if (other.hasSentTime()) { setSentTime(other.sentTime); } - if (other.hasSenderUid()) { - setSenderUid(other.senderUid); - } if (other.hasEmote()) { setEmote(other.emote); } + if (other.hasSenderUid()) { + setSenderUid(other.senderUid); + } if (other.hasMsgType()) { setMsgTypeValue(other.msgType); } @@ -338,8 +338,8 @@ public final class ChatOuterClass { cachedSize = -1; bitField0_ = 0; sentTime = 0L; - senderUid = 0; emote = 0; + senderUid = 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) - && (!hasSenderUid() || senderUid == other.senderUid) && (!hasEmote() || emote == other.emote) + && (!hasSenderUid() || senderUid == other.senderUid) && (!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) 8); + output.writeRawByte((byte) 16); output.writeUInt64NoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(senderUid); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(emote); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 56); + output.writeUInt32NoTag(senderUid); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 42); output.writeStringNoTag(text); } } @@ -404,10 +404,10 @@ public final class ChatOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(sentTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(emote); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } 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 8: { + case 16: { // sentTime sentTime = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 8) { break; } } - case 72: { - // senderUid - senderUid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 8: { // emote emote = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 56) { break; } } case 56: { + // senderUid + senderUid = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // 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 != 122) { + if (tag != 42) { break; } } - case 122: { + case 42: { // 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.senderUid, senderUid); + output.writeUInt32(FieldNames.emote, emote); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.emote, emote); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); @@ -527,11 +527,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_ |= 0x00000002; } } else { @@ -539,10 +538,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_ |= 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 senderUid = FieldName.forField("senderUid", "sender_uid"); - static final FieldName emote = FieldName.forField("emote"); + static final FieldName senderUid = FieldName.forField("senderUid", "sender_uid"); + 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/ChessRogueSelectCellCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellCsReqOuterClass.java index d42caae..d4d32d8 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cell_id = 11; + * optional uint32 cell_id = 2; */ private int cellId; @@ -34,7 +34,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 11; + * optional uint32 cell_id = 2; * @return whether the cellId field is set */ public boolean hasCellId() { @@ -42,7 +42,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 11; + * optional uint32 cell_id = 2; * @return this */ public ChessRogueSelectCellCsReq clearCellId() { @@ -52,7 +52,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 11; + * optional uint32 cell_id = 2; * @return the cellId */ public int getCellId() { @@ -60,7 +60,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { } /** - * optional uint32 cell_id = 11; + * optional uint32 cell_id = 2; * @param value the cellId to set * @return this */ @@ -129,7 +129,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(cellId); } } @@ -150,7 +150,7 @@ public final class ChessRogueSelectCellCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // cellId cellId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java index 718846c..fab7955 100644 --- a/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ChessRogueSelectCellScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ChessRogueSelectCellScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 cell_id = 12; + * optional uint32 cell_id = 14; */ private int cellId; @@ -39,7 +39,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 4; * @return this */ public ChessRogueSelectCellScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 12; + * optional uint32 cell_id = 14; * @return whether the cellId field is set */ public boolean hasCellId() { @@ -84,7 +84,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 12; + * optional uint32 cell_id = 14; * @return this */ public ChessRogueSelectCellScRsp clearCellId() { @@ -94,7 +94,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 12; + * optional uint32 cell_id = 14; * @return the cellId */ public int getCellId() { @@ -102,7 +102,7 @@ public final class ChessRogueSelectCellScRspOuterClass { } /** - * optional uint32 cell_id = 12; + * optional uint32 cell_id = 14; * @param value the cellId to set * @return this */ @@ -177,11 +177,11 @@ public final class ChessRogueSelectCellScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(cellId); } } @@ -205,16 +205,16 @@ public final class ChessRogueSelectCellScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // cellId cellId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java index 1e5a015..689d962 100644 --- a/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ClientMailOuterClass.java @@ -21,37 +21,42 @@ public final class ClientMailOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 expire_time = 7; + * optional int64 expire_time = 8; */ private long expireTime; /** - * optional int64 time = 9; + * optional int64 time = 14; */ private long time; /** - * optional uint32 id = 4; - */ - private int id; - - /** - * optional uint32 template_id = 15; + * optional uint32 template_id = 5; */ private int templateId; /** - * optional bool is_read = 6; + * optional uint32 id = 7; + */ + private int id; + + /** + * optional bool is_read = 1; */ private boolean isRead; /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 12; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * optional string sender = 5; + * optional string title = 2; + */ + private final Utf8String title = Utf8String.newEmptyInstance(); + + /** + * optional string sender = 6; */ private final Utf8String sender = Utf8String.newEmptyInstance(); @@ -61,12 +66,7 @@ public final class ClientMailOuterClass { private final Utf8String content = Utf8String.newEmptyInstance(); /** - * optional string title = 14; - */ - private final Utf8String title = Utf8String.newEmptyInstance(); - - /** - * repeated string para_list = 1; + * repeated string para_list = 9; */ private final RepeatedString paraList = RepeatedString.newEmptyInstance(); @@ -81,7 +81,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 7; + * optional int64 expire_time = 8; * @return whether the expireTime field is set */ public boolean hasExpireTime() { @@ -89,7 +89,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 7; + * optional int64 expire_time = 8; * @return this */ public ClientMail clearExpireTime() { @@ -99,7 +99,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 7; + * optional int64 expire_time = 8; * @return the expireTime */ public long getExpireTime() { @@ -107,7 +107,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 expire_time = 7; + * optional int64 expire_time = 8; * @param value the expireTime to set * @return this */ @@ -118,7 +118,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 9; + * optional int64 time = 14; * @return whether the time field is set */ public boolean hasTime() { @@ -126,7 +126,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 9; + * optional int64 time = 14; * @return this */ public ClientMail clearTime() { @@ -136,7 +136,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 9; + * optional int64 time = 14; * @return the time */ public long getTime() { @@ -144,7 +144,7 @@ public final class ClientMailOuterClass { } /** - * optional int64 time = 9; + * optional int64 time = 14; * @param value the time to set * @return this */ @@ -155,62 +155,25 @@ public final class ClientMailOuterClass { } /** - * optional uint32 id = 4; - * @return whether the id field is set + * optional uint32 template_id = 5; + * @return whether the templateId field is set */ - public boolean hasId() { + public boolean hasTemplateId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 id = 4; - * @return this - */ - public ClientMail clearId() { - bitField0_ &= ~0x00000004; - id = 0; - return this; - } - - /** - * optional uint32 id = 4; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 4; - * @param value the id to set - * @return this - */ - public ClientMail setId(final int value) { - bitField0_ |= 0x00000004; - id = value; - return this; - } - - /** - * optional uint32 template_id = 15; - * @return whether the templateId field is set - */ - public boolean hasTemplateId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 template_id = 15; + * optional uint32 template_id = 5; * @return this */ public ClientMail clearTemplateId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; templateId = 0; return this; } /** - * optional uint32 template_id = 15; + * optional uint32 template_id = 5; * @return the templateId */ public int getTemplateId() { @@ -218,18 +181,55 @@ public final class ClientMailOuterClass { } /** - * optional uint32 template_id = 15; + * optional uint32 template_id = 5; * @param value the templateId to set * @return this */ public ClientMail setTemplateId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; templateId = value; return this; } /** - * optional bool is_read = 6; + * optional uint32 id = 7; + * @return whether the id field is set + */ + public boolean hasId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 id = 7; + * @return this + */ + public ClientMail clearId() { + bitField0_ &= ~0x00000008; + id = 0; + return this; + } + + /** + * optional uint32 id = 7; + * @return the id + */ + public int getId() { + return id; + } + + /** + * optional uint32 id = 7; + * @param value the id to set + * @return this + */ + public ClientMail setId(final int value) { + bitField0_ |= 0x00000008; + id = value; + return this; + } + + /** + * optional bool is_read = 1; * @return whether the isRead field is set */ public boolean hasIsRead() { @@ -237,7 +237,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 6; + * optional bool is_read = 1; * @return this */ public ClientMail clearIsRead() { @@ -247,7 +247,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 6; + * optional bool is_read = 1; * @return the isRead */ public boolean getIsRead() { @@ -255,7 +255,7 @@ public final class ClientMailOuterClass { } /** - * optional bool is_read = 6; + * optional bool is_read = 1; * @param value the isRead to set * @return this */ @@ -266,7 +266,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 12; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -274,7 +274,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 12; * @return this */ public ClientMail clearAttachment() { @@ -284,7 +284,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 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. @@ -298,7 +298,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 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 @@ -312,7 +312,7 @@ public final class ClientMailOuterClass { } /** - * optional .ItemList attachment = 2; + * optional .ItemList attachment = 12; * @param value the attachment to set * @return this */ @@ -323,25 +323,90 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 5; - * @return whether the sender field is set + * optional string title = 2; + * @return whether the title field is set */ - public boolean hasSender() { + public boolean hasTitle() { return (bitField0_ & 0x00000040) != 0; } /** - * optional string sender = 5; + * optional string title = 2; + * @return this + */ + public ClientMail clearTitle() { + bitField0_ &= ~0x00000040; + title.clear(); + return this; + } + + /** + * optional string title = 2; + * @return the title + */ + public String getTitle() { + return title.getString(); + } + + /** + * optional string title = 2; + * @return internal {@code Utf8String} representation of title for reading + */ + public Utf8String getTitleBytes() { + return this.title; + } + + /** + * optional string title = 2; + * @return internal {@code Utf8String} representation of title for modifications + */ + public Utf8String getMutableTitleBytes() { + bitField0_ |= 0x00000040; + return this.title; + } + + /** + * optional string title = 2; + * @param value the title to set + * @return this + */ + public ClientMail setTitle(final CharSequence value) { + bitField0_ |= 0x00000040; + title.copyFrom(value); + return this; + } + + /** + * optional string title = 2; + * @param value the title to set + * @return this + */ + public ClientMail setTitle(final Utf8String value) { + bitField0_ |= 0x00000040; + title.copyFrom(value); + return this; + } + + /** + * optional string sender = 6; + * @return whether the sender field is set + */ + public boolean hasSender() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional string sender = 6; * @return this */ public ClientMail clearSender() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000080; sender.clear(); return this; } /** - * optional string sender = 5; + * optional string sender = 6; * @return the sender */ public String getSender() { @@ -349,7 +414,7 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 5; + * optional string sender = 6; * @return internal {@code Utf8String} representation of sender for reading */ public Utf8String getSenderBytes() { @@ -357,32 +422,32 @@ public final class ClientMailOuterClass { } /** - * optional string sender = 5; + * optional string sender = 6; * @return internal {@code Utf8String} representation of sender for modifications */ public Utf8String getMutableSenderBytes() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; return this.sender; } /** - * optional string sender = 5; + * optional string sender = 6; * @param value the sender to set * @return this */ public ClientMail setSender(final CharSequence value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; sender.copyFrom(value); return this; } /** - * optional string sender = 5; + * optional string sender = 6; * @param value the sender to set * @return this */ public ClientMail setSender(final Utf8String value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; sender.copyFrom(value); return this; } @@ -392,7 +457,7 @@ public final class ClientMailOuterClass { * @return whether the content field is set */ public boolean hasContent() { - return (bitField0_ & 0x00000080) != 0; + return (bitField0_ & 0x00000100) != 0; } /** @@ -400,7 +465,7 @@ public final class ClientMailOuterClass { * @return this */ public ClientMail clearContent() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000100; content.clear(); return this; } @@ -426,7 +491,7 @@ public final class ClientMailOuterClass { * @return internal {@code Utf8String} representation of content for modifications */ public Utf8String getMutableContentBytes() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this.content; } @@ -436,7 +501,7 @@ public final class ClientMailOuterClass { * @return this */ public ClientMail setContent(final CharSequence value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; content.copyFrom(value); return this; } @@ -447,78 +512,13 @@ public final class ClientMailOuterClass { * @return this */ public ClientMail setContent(final Utf8String value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; content.copyFrom(value); return this; } /** - * optional string title = 14; - * @return whether the title field is set - */ - public boolean hasTitle() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional string title = 14; - * @return this - */ - public ClientMail clearTitle() { - bitField0_ &= ~0x00000100; - title.clear(); - return this; - } - - /** - * optional string title = 14; - * @return the title - */ - public String getTitle() { - return title.getString(); - } - - /** - * optional string title = 14; - * @return internal {@code Utf8String} representation of title for reading - */ - public Utf8String getTitleBytes() { - return this.title; - } - - /** - * optional string title = 14; - * @return internal {@code Utf8String} representation of title for modifications - */ - public Utf8String getMutableTitleBytes() { - bitField0_ |= 0x00000100; - return this.title; - } - - /** - * optional string title = 14; - * @param value the title to set - * @return this - */ - public ClientMail setTitle(final CharSequence value) { - bitField0_ |= 0x00000100; - title.copyFrom(value); - return this; - } - - /** - * optional string title = 14; - * @param value the title to set - * @return this - */ - public ClientMail setTitle(final Utf8String value) { - bitField0_ |= 0x00000100; - title.copyFrom(value); - return this; - } - - /** - * repeated string para_list = 1; + * repeated string para_list = 9; * @return whether the paraList field is set */ public boolean hasParaList() { @@ -526,7 +526,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 1; + * repeated string para_list = 9; * @return this */ public ClientMail clearParaList() { @@ -536,7 +536,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 1; + * repeated string para_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. @@ -550,7 +550,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 1; + * repeated string para_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 @@ -564,7 +564,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 1; + * repeated string para_list = 9; * @param value the paraList to add * @return this */ @@ -575,7 +575,7 @@ public final class ClientMailOuterClass { } /** - * repeated string para_list = 1; + * repeated string para_list = 9; * @param values the paraList to add * @return this */ @@ -592,13 +592,13 @@ public final class ClientMailOuterClass { bitField0_ = other.bitField0_; expireTime = other.expireTime; time = other.time; - id = other.id; templateId = other.templateId; + id = other.id; isRead = other.isRead; attachment.copyFrom(other.attachment); + title.copyFrom(other.title); sender.copyFrom(other.sender); content.copyFrom(other.content); - title.copyFrom(other.title); paraList.copyFrom(other.paraList); } return this; @@ -616,27 +616,27 @@ public final class ClientMailOuterClass { if (other.hasTime()) { setTime(other.time); } - if (other.hasId()) { - setId(other.id); - } if (other.hasTemplateId()) { setTemplateId(other.templateId); } + if (other.hasId()) { + setId(other.id); + } if (other.hasIsRead()) { setIsRead(other.isRead); } if (other.hasAttachment()) { getMutableAttachment().mergeFrom(other.attachment); } + if (other.hasTitle()) { + getMutableTitleBytes().copyFrom(other.title); + } if (other.hasSender()) { getMutableSenderBytes().copyFrom(other.sender); } if (other.hasContent()) { getMutableContentBytes().copyFrom(other.content); } - if (other.hasTitle()) { - getMutableTitleBytes().copyFrom(other.title); - } if (other.hasParaList()) { getMutableParaList().addAll(other.paraList); } @@ -652,13 +652,13 @@ public final class ClientMailOuterClass { bitField0_ = 0; expireTime = 0L; time = 0L; - id = 0; templateId = 0; + id = 0; isRead = false; attachment.clear(); + title.clear(); sender.clear(); content.clear(); - title.clear(); paraList.clear(); return this; } @@ -671,9 +671,9 @@ public final class ClientMailOuterClass { cachedSize = -1; bitField0_ = 0; attachment.clearQuick(); + title.clear(); sender.clear(); content.clear(); - title.clear(); paraList.clear(); return this; } @@ -690,57 +690,57 @@ public final class ClientMailOuterClass { return bitField0_ == other.bitField0_ && (!hasExpireTime() || expireTime == other.expireTime) && (!hasTime() || time == other.time) - && (!hasId() || id == other.id) && (!hasTemplateId() || templateId == other.templateId) + && (!hasId() || id == other.id) && (!hasIsRead() || isRead == other.isRead) && (!hasAttachment() || attachment.equals(other.attachment)) + && (!hasTitle() || title.equals(other.title)) && (!hasSender() || sender.equals(other.sender)) && (!hasContent() || content.equals(other.content)) - && (!hasTitle() || title.equals(other.title)) && (!hasParaList() || paraList.equals(other.paraList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 64); output.writeInt64NoTag(expireTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeInt64NoTag(time); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(templateId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isRead); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 98); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 42); - output.writeStringNoTag(sender); + output.writeRawByte((byte) 18); + output.writeStringNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 50); + output.writeStringNoTag(sender); + } + if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 90); output.writeStringNoTag(content); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(title); - } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < paraList.length(); i++) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 74); output.writeStringNoTag(paraList.get(i)); } } @@ -756,10 +756,10 @@ public final class ClientMailOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(time); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(templateId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(templateId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -768,13 +768,13 @@ public final class ClientMailOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(attachment); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(sender); + size += 1 + ProtoSink.computeStringSizeNoTag(title); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(content); + size += 1 + ProtoSink.computeStringSizeNoTag(sender); } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(title); + size += 1 + ProtoSink.computeStringSizeNoTag(content); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * paraList.length()) + ProtoSink.computeRepeatedStringSizeNoTag(paraList); @@ -789,64 +789,73 @@ public final class ClientMailOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 64: { // expireTime expireTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { + case 112: { // time time = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 40: { // templateId templateId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 56) { break; } } - case 48: { + case 56: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { // isRead isRead = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // attachment + input.readMessage(attachment); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 18) { break; } } case 18: { - // attachment - input.readMessage(attachment); - bitField0_ |= 0x00000020; + // title + input.readString(title); + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { + case 50: { // sender input.readString(sender); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 90) { break; @@ -855,22 +864,13 @@ public final class ClientMailOuterClass { case 90: { // content input.readString(content); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // title - input.readString(title); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 10) { + if (tag != 74) { break; } } - case 10: { + case 74: { // paraList tag = input.readRepeatedString(paraList, tag); bitField0_ |= 0x00000200; @@ -902,10 +902,10 @@ public final class ClientMailOuterClass { output.writeInt64(FieldNames.time, time); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.templateId, templateId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.templateId, templateId); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000010) != 0) { output.writeBool(FieldNames.isRead, isRead); @@ -914,13 +914,13 @@ public final class ClientMailOuterClass { output.writeMessage(FieldNames.attachment, attachment); } if ((bitField0_ & 0x00000040) != 0) { - output.writeString(FieldNames.sender, sender); + output.writeString(FieldNames.title, title); } if ((bitField0_ & 0x00000080) != 0) { - output.writeString(FieldNames.content, content); + output.writeString(FieldNames.sender, sender); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.title, title); + output.writeString(FieldNames.content, content); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedString(FieldNames.paraList, paraList); @@ -958,10 +958,11 @@ public final class ClientMailOuterClass { } break; } - case 3355: { - if (input.isAtField(FieldNames.id)) { + case 1304010549: + case 1769642752: { + if (input.isAtField(FieldNames.templateId)) { if (!input.trySkipNullValue()) { - id = input.readUInt32(); + templateId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -969,11 +970,10 @@ public final class ClientMailOuterClass { } break; } - case 1304010549: - case 1769642752: { - if (input.isAtField(FieldNames.templateId)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - templateId = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1004,11 +1004,22 @@ public final class ClientMailOuterClass { } break; } + case 110371416: { + if (input.isAtField(FieldNames.title)) { + if (!input.trySkipNullValue()) { + input.readString(title); + bitField0_ |= 0x00000040; + } + } else { + input.skipUnknownField(); + } + break; + } case -905962955: { if (input.isAtField(FieldNames.sender)) { if (!input.trySkipNullValue()) { input.readString(sender); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1019,17 +1030,6 @@ public final class ClientMailOuterClass { if (input.isAtField(FieldNames.content)) { if (!input.trySkipNullValue()) { input.readString(content); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case 110371416: { - if (input.isAtField(FieldNames.title)) { - if (!input.trySkipNullValue()) { - input.readString(title); bitField0_ |= 0x00000100; } } else { @@ -1105,20 +1105,20 @@ public final class ClientMailOuterClass { static final FieldName time = FieldName.forField("time"); - static final FieldName id = FieldName.forField("id"); - static final FieldName templateId = FieldName.forField("templateId", "template_id"); + static final FieldName id = FieldName.forField("id"); + static final FieldName isRead = FieldName.forField("isRead", "is_read"); static final FieldName attachment = FieldName.forField("attachment"); + static final FieldName title = FieldName.forField("title"); + static final FieldName sender = FieldName.forField("sender"); static final FieldName content = FieldName.forField("content"); - static final FieldName title = FieldName.forField("title"); - static final FieldName paraList = FieldName.forField("paraList", "para_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java index bf7b10b..aaf709a 100644 --- a/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ComposeItemCsReqOuterClass.java @@ -19,17 +19,17 @@ public final class ComposeItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 compose_id = 1; + * optional uint32 compose_id = 7; */ private int composeId; /** - * optional uint32 count = 8; + * optional uint32 count = 10; */ private int count; /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 8; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,7 +44,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 1; + * optional uint32 compose_id = 7; * @return whether the composeId field is set */ public boolean hasComposeId() { @@ -52,7 +52,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 1; + * optional uint32 compose_id = 7; * @return this */ public ComposeItemCsReq clearComposeId() { @@ -62,7 +62,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 1; + * optional uint32 compose_id = 7; * @return the composeId */ public int getComposeId() { @@ -70,7 +70,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 compose_id = 1; + * optional uint32 compose_id = 7; * @param value the composeId to set * @return this */ @@ -81,7 +81,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 8; + * optional uint32 count = 10; * @return whether the count field is set */ public boolean hasCount() { @@ -89,7 +89,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 8; + * optional uint32 count = 10; * @return this */ public ComposeItemCsReq clearCount() { @@ -99,7 +99,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 8; + * optional uint32 count = 10; * @return the count */ public int getCount() { @@ -107,7 +107,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional uint32 count = 8; + * optional uint32 count = 10; * @param value the count to set * @return this */ @@ -118,7 +118,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 8; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -126,7 +126,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 8; * @return this */ public ComposeItemCsReq clearComposeItemList() { @@ -136,7 +136,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_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. @@ -150,7 +150,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_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 @@ -164,7 +164,7 @@ public final class ComposeItemCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 3; + * optional .ItemCostList compose_item_list = 8; * @param value the composeItemList to set * @return this */ @@ -246,15 +246,15 @@ public final class ComposeItemCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(count); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(composeItemList); } } @@ -281,25 +281,25 @@ public final class ComposeItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // composeId composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // count count = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 66) { break; } } - case 26: { + case 66: { // composeItemList input.readMessage(composeItemList); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ComposeItemScRspOuterClass.java index 935a57f..637c250 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 count = 3; - */ - private int count; - - /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional uint32 compose_id = 8; + * optional uint32 count = 6; + */ + private int count; + + /** + * optional uint32 compose_id = 15; */ private int composeId; /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 4; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -49,62 +49,25 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 count = 3; - * @return whether the count field is set + * optional uint32 retcode = 2; + * @return whether the retcode field is set */ - public boolean hasCount() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 count = 3; - * @return this - */ - public ComposeItemScRsp clearCount() { - bitField0_ &= ~0x00000001; - count = 0; - return this; - } - - /** - * optional uint32 count = 3; - * @return the count - */ - public int getCount() { - return count; - } - - /** - * optional uint32 count = 3; - * @param value the count to set - * @return this - */ - public ComposeItemScRsp setCount(final int value) { - bitField0_ |= 0x00000001; - count = value; - return this; - } - - /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return this */ public ComposeItemScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -112,18 +75,55 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ public ComposeItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 compose_id = 8; + * optional uint32 count = 6; + * @return whether the count field is set + */ + public boolean hasCount() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 count = 6; + * @return this + */ + public ComposeItemScRsp clearCount() { + bitField0_ &= ~0x00000002; + count = 0; + return this; + } + + /** + * optional uint32 count = 6; + * @return the count + */ + public int getCount() { + return count; + } + + /** + * optional uint32 count = 6; + * @param value the count to set + * @return this + */ + public ComposeItemScRsp setCount(final int value) { + bitField0_ |= 0x00000002; + count = value; + return this; + } + + /** + * optional uint32 compose_id = 15; * @return whether the composeId field is set */ public boolean hasComposeId() { @@ -131,7 +131,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 compose_id = 8; + * optional uint32 compose_id = 15; * @return this */ public ComposeItemScRsp clearComposeId() { @@ -141,7 +141,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 compose_id = 8; + * optional uint32 compose_id = 15; * @return the composeId */ public int getComposeId() { @@ -149,7 +149,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional uint32 compose_id = 8; + * optional uint32 compose_id = 15; * @param value the composeId to set * @return this */ @@ -160,7 +160,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 4; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -168,7 +168,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 4; * @return this */ public ComposeItemScRsp clearReturnItemList() { @@ -178,7 +178,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 15; + * 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. @@ -192,7 +192,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 15; + * 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 @@ -206,7 +206,7 @@ public final class ComposeItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 15; + * optional .ItemList return_item_list = 4; * @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_; - count = other.count; retcode = other.retcode; + count = other.count; composeId = other.composeId; returnItemList.copyFrom(other.returnItemList); } @@ -235,12 +235,12 @@ public final class ComposeItemScRspOuterClass { return this; } cachedSize = -1; - if (other.hasCount()) { - setCount(other.count); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCount()) { + setCount(other.count); + } if (other.hasComposeId()) { setComposeId(other.composeId); } @@ -257,8 +257,8 @@ public final class ComposeItemScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - count = 0; retcode = 0; + count = 0; composeId = 0; returnItemList.clear(); return this; @@ -285,8 +285,8 @@ public final class ComposeItemScRspOuterClass { } ComposeItemScRsp other = (ComposeItemScRsp) o; return bitField0_ == other.bitField0_ - && (!hasCount() || count == other.count) && (!hasRetcode() || retcode == other.retcode) + && (!hasCount() || count == other.count) && (!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) 24); - output.writeUInt32NoTag(count); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(count); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 34); 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(count); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); @@ -336,34 +336,34 @@ public final class ComposeItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // count - count = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { + case 16: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { + case 48: { + // count + count = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // composeId composeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 122) { + if (tag != 34) { break; } } - case 122: { + case 34: { // 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.count, count); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.count, count); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.composeId, composeId); @@ -411,10 +411,10 @@ public final class ComposeItemScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 94851343: { - if (input.isAtField(FieldNames.count)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - count = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -422,10 +422,10 @@ public final class ComposeItemScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94851343: { + if (input.isAtField(FieldNames.count)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + count = 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 count = FieldName.forField("count"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName count = FieldName.forField("count"); + 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 82d657e..35c722a 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 compose_id = 3; - */ - private int composeId; - - /** - * optional uint32 compose_relic_id = 4; - */ - private int composeRelicId; - - /** - * optional uint32 count = 10; - */ - private int count; - - /** - * optional uint32 main_affix_id = 11; + * optional uint32 main_affix_id = 4; */ private int mainAffixId; /** - * optional .ItemCostList compose_item_list = 13; + * optional uint32 count = 8; + */ + private int count; + + /** + * optional uint32 compose_relic_id = 11; + */ + private int composeRelicId; + + /** + * optional uint32 compose_id = 15; + */ + private int composeId; + + /** + * optional .ItemCostList compose_item_list = 1; */ private final ItemCostListOuterClass.ItemCostList composeItemList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -54,136 +54,25 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 compose_id = 3; - * @return whether the composeId field is set + * optional uint32 main_affix_id = 4; + * @return whether the mainAffixId field is set */ - public boolean hasComposeId() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 compose_id = 3; - * @return this - */ - public ComposeSelectedRelicCsReq clearComposeId() { - bitField0_ &= ~0x00000001; - composeId = 0; - return this; - } - - /** - * optional uint32 compose_id = 3; - * @return the composeId - */ - public int getComposeId() { - return composeId; - } - - /** - * optional uint32 compose_id = 3; - * @param value the composeId to set - * @return this - */ - public ComposeSelectedRelicCsReq setComposeId(final int value) { - bitField0_ |= 0x00000001; - composeId = value; - return this; - } - - /** - * optional uint32 compose_relic_id = 4; - * @return whether the composeRelicId field is set - */ - public boolean hasComposeRelicId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 compose_relic_id = 4; - * @return this - */ - public ComposeSelectedRelicCsReq clearComposeRelicId() { - bitField0_ &= ~0x00000002; - composeRelicId = 0; - return this; - } - - /** - * optional uint32 compose_relic_id = 4; - * @return the composeRelicId - */ - public int getComposeRelicId() { - return composeRelicId; - } - - /** - * optional uint32 compose_relic_id = 4; - * @param value the composeRelicId to set - * @return this - */ - public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { - bitField0_ |= 0x00000002; - composeRelicId = value; - return this; - } - - /** - * optional uint32 count = 10; - * @return whether the count field is set - */ - public boolean hasCount() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 count = 10; - * @return this - */ - public ComposeSelectedRelicCsReq clearCount() { - bitField0_ &= ~0x00000004; - count = 0; - return this; - } - - /** - * optional uint32 count = 10; - * @return the count - */ - public int getCount() { - return count; - } - - /** - * optional uint32 count = 10; - * @param value the count to set - * @return this - */ - public ComposeSelectedRelicCsReq setCount(final int value) { - bitField0_ |= 0x00000004; - count = value; - return this; - } - - /** - * optional uint32 main_affix_id = 11; - * @return whether the mainAffixId field is set - */ - public boolean hasMainAffixId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 main_affix_id = 11; + * optional uint32 main_affix_id = 4; * @return this */ public ComposeSelectedRelicCsReq clearMainAffixId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 11; + * optional uint32 main_affix_id = 4; * @return the mainAffixId */ public int getMainAffixId() { @@ -191,18 +80,129 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional uint32 main_affix_id = 11; + * optional uint32 main_affix_id = 4; * @param value the mainAffixId to set * @return this */ public ComposeSelectedRelicCsReq setMainAffixId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; mainAffixId = value; return this; } /** - * optional .ItemCostList compose_item_list = 13; + * 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; + * @return whether the composeRelicId field is set + */ + public boolean hasComposeRelicId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 compose_relic_id = 11; + * @return this + */ + public ComposeSelectedRelicCsReq clearComposeRelicId() { + bitField0_ &= ~0x00000004; + composeRelicId = 0; + return this; + } + + /** + * optional uint32 compose_relic_id = 11; + * @return the composeRelicId + */ + public int getComposeRelicId() { + return composeRelicId; + } + + /** + * optional uint32 compose_relic_id = 11; + * @param value the composeRelicId to set + * @return this + */ + public ComposeSelectedRelicCsReq setComposeRelicId(final int value) { + bitField0_ |= 0x00000004; + composeRelicId = value; + return this; + } + + /** + * optional uint32 compose_id = 15; + * @return whether the composeId field is set + */ + public boolean hasComposeId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 compose_id = 15; + * @return this + */ + public ComposeSelectedRelicCsReq clearComposeId() { + bitField0_ &= ~0x00000008; + composeId = 0; + return this; + } + + /** + * optional uint32 compose_id = 15; + * @return the composeId + */ + public int getComposeId() { + return composeId; + } + + /** + * optional uint32 compose_id = 15; + * @param value the composeId to set + * @return this + */ + public ComposeSelectedRelicCsReq setComposeId(final int value) { + bitField0_ |= 0x00000008; + composeId = value; + return this; + } + + /** + * optional .ItemCostList compose_item_list = 1; * @return whether the composeItemList field is set */ public boolean hasComposeItemList() { @@ -210,7 +210,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 13; + * optional .ItemCostList compose_item_list = 1; * @return this */ public ComposeSelectedRelicCsReq clearComposeItemList() { @@ -220,7 +220,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 13; + * optional .ItemCostList compose_item_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. @@ -234,7 +234,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 13; + * optional .ItemCostList compose_item_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 @@ -248,7 +248,7 @@ public final class ComposeSelectedRelicCsReqOuterClass { } /** - * optional .ItemCostList compose_item_list = 13; + * optional .ItemCostList compose_item_list = 1; * @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_; - composeId = other.composeId; - composeRelicId = other.composeRelicId; - count = other.count; mainAffixId = other.mainAffixId; + count = other.count; + composeRelicId = other.composeRelicId; + composeId = other.composeId; 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.hasComposeRelicId()) { - setComposeRelicId(other.composeRelicId); + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasCount()) { setCount(other.count); } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); + if (other.hasComposeRelicId()) { + setComposeRelicId(other.composeRelicId); + } + if (other.hasComposeId()) { + setComposeId(other.composeId); } if (other.hasComposeItemList()) { getMutableComposeItemList().mergeFrom(other.composeItemList); @@ -304,10 +304,10 @@ public final class ComposeSelectedRelicCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - composeId = 0; - composeRelicId = 0; - count = 0; mainAffixId = 0; + count = 0; + composeRelicId = 0; + composeId = 0; composeItemList.clear(); return this; } @@ -333,33 +333,33 @@ public final class ComposeSelectedRelicCsReqOuterClass { } ComposeSelectedRelicCsReq other = (ComposeSelectedRelicCsReq) o; return bitField0_ == other.bitField0_ - && (!hasComposeId() || composeId == other.composeId) - && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) - && (!hasCount() || count == other.count) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasCount() || count == other.count) + && (!hasComposeRelicId() || composeRelicId == other.composeRelicId) + && (!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) 24); - output.writeUInt32NoTag(composeId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(composeRelicId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(count); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); output.writeUInt32NoTag(mainAffixId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(count); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(composeRelicId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(composeId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 10); 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(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(count); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeRelicId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } 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 24: { - // composeId - composeId = input.readUInt32(); + case 32: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 64) { break; } } - case 32: { - // composeRelicId - composeRelicId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 64: { // count count = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // mainAffixId - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000008; + // composeRelicId + composeRelicId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 106) { + if (tag != 120) { break; } } - case 106: { + case 120: { + // composeId + composeId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // 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.composeId, composeId); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeRelicId, composeRelicId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.count, count); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.composeRelicId, composeRelicId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.composeItemList, composeItemList); @@ -479,11 +479,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -491,22 +491,22 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } + case 94851343: { + if (input.isAtField(FieldNames.count)) { + if (!input.trySkipNullValue()) { + count = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case 1424923132: case 885799284: { if (input.isAtField(FieldNames.composeRelicId)) { if (!input.trySkipNullValue()) { composeRelicId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 94851343: { - if (input.isAtField(FieldNames.count)) { - if (!input.trySkipNullValue()) { - count = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -514,11 +514,11 @@ public final class ComposeSelectedRelicCsReqOuterClass { } break; } - 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_ |= 0x00000008; } } else { @@ -591,13 +591,13 @@ public final class ComposeSelectedRelicCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); - - static final FieldName composeRelicId = FieldName.forField("composeRelicId", "compose_relic_id"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_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 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 f946934..159c2bf 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 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 compose_id = 13; + * optional uint32 compose_id = 10; */ private int composeId; /** - * optional .ItemList return_item_list = 1; + * optional uint32 retcode = 13; + */ + private int retcode; + + /** + * optional .ItemList return_item_list = 7; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -44,62 +44,25 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 compose_id = 10; + * @return whether the composeId field is set */ - public boolean hasRetcode() { + public boolean hasComposeId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public ComposeSelectedRelicScRsp 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 ComposeSelectedRelicScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 compose_id = 13; - * @return whether the composeId field is set - */ - public boolean hasComposeId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 compose_id = 13; + * optional uint32 compose_id = 10; * @return this */ public ComposeSelectedRelicScRsp clearComposeId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; composeId = 0; return this; } /** - * optional uint32 compose_id = 13; + * optional uint32 compose_id = 10; * @return the composeId */ public int getComposeId() { @@ -107,18 +70,55 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional uint32 compose_id = 13; + * optional uint32 compose_id = 10; * @param value the composeId to set * @return this */ public ComposeSelectedRelicScRsp setComposeId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; composeId = value; return this; } /** - * optional .ItemList return_item_list = 1; + * 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 ComposeSelectedRelicScRsp 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 ComposeSelectedRelicScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional .ItemList return_item_list = 7; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -126,7 +126,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 1; + * optional .ItemList return_item_list = 7; * @return this */ public ComposeSelectedRelicScRsp clearReturnItemList() { @@ -136,7 +136,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 1; + * 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. @@ -150,7 +150,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 1; + * 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 @@ -164,7 +164,7 @@ public final class ComposeSelectedRelicScRspOuterClass { } /** - * optional .ItemList return_item_list = 1; + * optional .ItemList return_item_list = 7; * @param value the returnItemList to set * @return this */ @@ -179,8 +179,8 @@ public final class ComposeSelectedRelicScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; composeId = other.composeId; + retcode = other.retcode; returnItemList.copyFrom(other.returnItemList); } return this; @@ -192,12 +192,12 @@ public final class ComposeSelectedRelicScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasComposeId()) { setComposeId(other.composeId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasReturnItemList()) { getMutableReturnItemList().mergeFrom(other.returnItemList); } @@ -211,8 +211,8 @@ public final class ComposeSelectedRelicScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; composeId = 0; + retcode = 0; returnItemList.clear(); return this; } @@ -238,23 +238,23 @@ public final class ComposeSelectedRelicScRspOuterClass { } ComposeSelectedRelicScRsp other = (ComposeSelectedRelicScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasComposeId() || composeId == other.composeId) + && (!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.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(composeId); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 58); output.writeMessageNoTag(returnItemList); } } @@ -263,10 +263,10 @@ public final class ComposeSelectedRelicScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(composeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnItemList); @@ -281,9 +281,9 @@ public final class ComposeSelectedRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); + case 80: { + // composeId + composeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 104) { @@ -291,15 +291,15 @@ public final class ComposeSelectedRelicScRspOuterClass { } } case 104: { - // composeId - composeId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 58) { break; } } - case 10: { + case 58: { // returnItemList input.readMessage(returnItemList); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class ComposeSelectedRelicScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.composeId, composeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.composeId, composeId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.returnItemList, returnItemList); @@ -344,10 +344,11 @@ public final class ComposeSelectedRelicScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1399759283: + case -442843416: { + if (input.isAtField(FieldNames.composeId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + composeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -355,11 +356,10 @@ public final class ComposeSelectedRelicScRspOuterClass { } break; } - case -1399759283: - case -442843416: { - if (input.isAtField(FieldNames.composeId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - composeId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -432,10 +432,10 @@ public final class ComposeSelectedRelicScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName composeId = FieldName.forField("composeId", "compose_id"); + 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/ContentPackageDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java new file mode 100644 index 0000000..d1a395a --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageDataOuterClass.java @@ -0,0 +1,379 @@ +// 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 ContentPackageDataOuterClass { + /** + * Protobuf type {@code ContentPackageData} + */ + public static final class ContentPackageData extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 cur_content_id = 10; + */ + private int curContentId; + + /** + * repeated .ContentPackageInfo content_package_list = 9; + */ + private final RepeatedMessage contentPackageList = RepeatedMessage.newEmptyInstance(ContentPackageInfoOuterClass.ContentPackageInfo.getFactory()); + + private ContentPackageData() { + } + + /** + * @return a new empty instance of {@code ContentPackageData} + */ + public static ContentPackageData newInstance() { + return new ContentPackageData(); + } + + /** + * optional uint32 cur_content_id = 10; + * @return whether the curContentId field is set + */ + public boolean hasCurContentId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 cur_content_id = 10; + * @return this + */ + public ContentPackageData clearCurContentId() { + bitField0_ &= ~0x00000001; + curContentId = 0; + return this; + } + + /** + * optional uint32 cur_content_id = 10; + * @return the curContentId + */ + public int getCurContentId() { + return curContentId; + } + + /** + * optional uint32 cur_content_id = 10; + * @param value the curContentId to set + * @return this + */ + public ContentPackageData setCurContentId(final int value) { + bitField0_ |= 0x00000001; + curContentId = value; + return this; + } + + /** + * repeated .ContentPackageInfo content_package_list = 9; + * @return whether the contentPackageList field is set + */ + public boolean hasContentPackageList() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated .ContentPackageInfo content_package_list = 9; + * @return this + */ + public ContentPackageData clearContentPackageList() { + bitField0_ &= ~0x00000002; + contentPackageList.clear(); + return this; + } + + /** + * repeated .ContentPackageInfo content_package_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 #getMutableContentPackageList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getContentPackageList( + ) { + return contentPackageList; + } + + /** + * repeated .ContentPackageInfo content_package_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 getMutableContentPackageList( + ) { + bitField0_ |= 0x00000002; + return contentPackageList; + } + + /** + * repeated .ContentPackageInfo content_package_list = 9; + * @param value the contentPackageList to add + * @return this + */ + public ContentPackageData addContentPackageList( + final ContentPackageInfoOuterClass.ContentPackageInfo value) { + bitField0_ |= 0x00000002; + contentPackageList.add(value); + return this; + } + + /** + * repeated .ContentPackageInfo content_package_list = 9; + * @param values the contentPackageList to add + * @return this + */ + public ContentPackageData addAllContentPackageList( + final ContentPackageInfoOuterClass.ContentPackageInfo... values) { + bitField0_ |= 0x00000002; + contentPackageList.addAll(values); + return this; + } + + @Override + public ContentPackageData copyFrom(final ContentPackageData other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + curContentId = other.curContentId; + contentPackageList.copyFrom(other.contentPackageList); + } + return this; + } + + @Override + public ContentPackageData mergeFrom(final ContentPackageData other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasCurContentId()) { + setCurContentId(other.curContentId); + } + if (other.hasContentPackageList()) { + getMutableContentPackageList().addAll(other.contentPackageList); + } + return this; + } + + @Override + public ContentPackageData clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + curContentId = 0; + contentPackageList.clear(); + return this; + } + + @Override + public ContentPackageData clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + contentPackageList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ContentPackageData)) { + return false; + } + ContentPackageData other = (ContentPackageData) o; + return bitField0_ == other.bitField0_ + && (!hasCurContentId() || curContentId == other.curContentId) + && (!hasContentPackageList() || contentPackageList.equals(other.contentPackageList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(curContentId); + } + if ((bitField0_ & 0x00000002) != 0) { + for (int i = 0; i < contentPackageList.length(); i++) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(contentPackageList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(curContentId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += (1 * contentPackageList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(contentPackageList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ContentPackageData mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // curContentId + curContentId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // contentPackageList + tag = input.readRepeatedMessage(contentPackageList, tag); + bitField0_ |= 0x00000002; + 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.curContentId, curContentId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRepeatedMessage(FieldNames.contentPackageList, contentPackageList); + } + output.endObject(); + } + + @Override + public ContentPackageData mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 773531924: + case 409315840: { + if (input.isAtField(FieldNames.curContentId)) { + if (!input.trySkipNullValue()) { + curContentId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1359668171: + case -903023875: { + if (input.isAtField(FieldNames.contentPackageList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(contentPackageList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ContentPackageData clone() { + return new ContentPackageData().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ContentPackageData parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ContentPackageData(), data).checkInitialized(); + } + + public static ContentPackageData parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageData(), input).checkInitialized(); + } + + public static ContentPackageData parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageData(), input).checkInitialized(); + } + + /** + * @return factory for creating ContentPackageData messages + */ + public static MessageFactory getFactory() { + return ContentPackageDataFactory.INSTANCE; + } + + private enum ContentPackageDataFactory implements MessageFactory { + INSTANCE; + + @Override + public ContentPackageData create() { + return ContentPackageData.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName curContentId = FieldName.forField("curContentId", "cur_content_id"); + + static final FieldName contentPackageList = FieldName.forField("contentPackageList", "content_package_list"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java new file mode 100644 index 0000000..209903f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageGetDataScRspOuterClass.java @@ -0,0 +1,361 @@ +// 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 ContentPackageGetDataScRspOuterClass { + /** + * Protobuf type {@code ContentPackageGetDataScRsp} + */ + public static final class ContentPackageGetDataScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional .ContentPackageData data = 3; + */ + private final ContentPackageDataOuterClass.ContentPackageData data = ContentPackageDataOuterClass.ContentPackageData.newInstance(); + + private ContentPackageGetDataScRsp() { + } + + /** + * @return a new empty instance of {@code ContentPackageGetDataScRsp} + */ + public static ContentPackageGetDataScRsp newInstance() { + return new ContentPackageGetDataScRsp(); + } + + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public ContentPackageGetDataScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + 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 ContentPackageGetDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .ContentPackageData data = 3; + * @return whether the data field is set + */ + public boolean hasData() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ContentPackageData data = 3; + * @return this + */ + public ContentPackageGetDataScRsp clearData() { + bitField0_ &= ~0x00000002; + data.clear(); + return this; + } + + /** + * optional .ContentPackageData data = 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 #getMutableData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ContentPackageDataOuterClass.ContentPackageData getData() { + return data; + } + + /** + * optional .ContentPackageData data = 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 ContentPackageDataOuterClass.ContentPackageData getMutableData() { + bitField0_ |= 0x00000002; + return data; + } + + /** + * optional .ContentPackageData data = 3; + * @param value the data to set + * @return this + */ + public ContentPackageGetDataScRsp setData( + final ContentPackageDataOuterClass.ContentPackageData value) { + bitField0_ |= 0x00000002; + data.copyFrom(value); + return this; + } + + @Override + public ContentPackageGetDataScRsp copyFrom(final ContentPackageGetDataScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + data.copyFrom(other.data); + } + return this; + } + + @Override + public ContentPackageGetDataScRsp mergeFrom(final ContentPackageGetDataScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasData()) { + getMutableData().mergeFrom(other.data); + } + return this; + } + + @Override + public ContentPackageGetDataScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + data.clear(); + return this; + } + + @Override + public ContentPackageGetDataScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + data.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ContentPackageGetDataScRsp)) { + return false; + } + ContentPackageGetDataScRsp other = (ContentPackageGetDataScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasData() || data.equals(other.data)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(data); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(data); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ContentPackageGetDataScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 26) { + break; + } + } + case 26: { + // data + input.readMessage(data); + 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.writeMessage(FieldNames.data, data); + } + output.endObject(); + } + + @Override + public ContentPackageGetDataScRsp 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 3076010: { + if (input.isAtField(FieldNames.data)) { + if (!input.trySkipNullValue()) { + input.readMessage(data); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ContentPackageGetDataScRsp clone() { + return new ContentPackageGetDataScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ContentPackageGetDataScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ContentPackageGetDataScRsp(), data).checkInitialized(); + } + + public static ContentPackageGetDataScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageGetDataScRsp(), input).checkInitialized(); + } + + public static ContentPackageGetDataScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageGetDataScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating ContentPackageGetDataScRsp messages + */ + public static MessageFactory getFactory() { + return ContentPackageGetDataScRspFactory.INSTANCE; + } + + private enum ContentPackageGetDataScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public ContentPackageGetDataScRsp create() { + return ContentPackageGetDataScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName data = FieldName.forField("data"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.java new file mode 100644 index 0000000..0cbd580 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageInfoOuterClass.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 ContentPackageInfoOuterClass { + /** + * Protobuf type {@code ContentPackageInfo} + */ + public static final class ContentPackageInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 content_id = 12; + */ + private int contentId; + + /** + * optional .ContentPackageStatus status = 3; + */ + private int status; + + private ContentPackageInfo() { + } + + /** + * @return a new empty instance of {@code ContentPackageInfo} + */ + public static ContentPackageInfo newInstance() { + return new ContentPackageInfo(); + } + + /** + * optional uint32 content_id = 12; + * @return whether the contentId field is set + */ + public boolean hasContentId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 content_id = 12; + * @return this + */ + public ContentPackageInfo clearContentId() { + bitField0_ &= ~0x00000001; + contentId = 0; + return this; + } + + /** + * optional uint32 content_id = 12; + * @return the contentId + */ + public int getContentId() { + return contentId; + } + + /** + * optional uint32 content_id = 12; + * @param value the contentId to set + * @return this + */ + public ContentPackageInfo setContentId(final int value) { + bitField0_ |= 0x00000001; + contentId = value; + return this; + } + + /** + * optional .ContentPackageStatus status = 3; + * @return whether the status field is set + */ + public boolean hasStatus() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .ContentPackageStatus status = 3; + * @return this + */ + public ContentPackageInfo clearStatus() { + bitField0_ &= ~0x00000002; + status = 0; + return this; + } + + /** + * optional .ContentPackageStatus status = 3; + * @return the status + */ + public ContentPackageStatusOuterClass.ContentPackageStatus getStatus() { + return ContentPackageStatusOuterClass.ContentPackageStatus.forNumber(status); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link ContentPackageInfo#getStatus()}.getNumber(). + * + * @return numeric wire representation + */ + public int getStatusValue() { + return status; + } + + /** + * 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 ContentPackageStatusOuterClass.ContentPackageStatus}. Setting an invalid value + * can cause {@link ContentPackageInfo#getStatus()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public ContentPackageInfo setStatusValue(final int value) { + bitField0_ |= 0x00000002; + status = value; + return this; + } + + /** + * optional .ContentPackageStatus status = 3; + * @param value the status to set + * @return this + */ + public ContentPackageInfo setStatus( + final ContentPackageStatusOuterClass.ContentPackageStatus value) { + bitField0_ |= 0x00000002; + status = value.getNumber(); + return this; + } + + @Override + public ContentPackageInfo copyFrom(final ContentPackageInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + contentId = other.contentId; + status = other.status; + } + return this; + } + + @Override + public ContentPackageInfo mergeFrom(final ContentPackageInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasContentId()) { + setContentId(other.contentId); + } + if (other.hasStatus()) { + setStatusValue(other.status); + } + return this; + } + + @Override + public ContentPackageInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + contentId = 0; + status = 0; + return this; + } + + @Override + public ContentPackageInfo 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 ContentPackageInfo)) { + return false; + } + ContentPackageInfo other = (ContentPackageInfo) o; + return bitField0_ == other.bitField0_ + && (!hasContentId() || contentId == other.contentId) + && (!hasStatus() || status == other.status); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(contentId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeEnumNoTag(status); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(contentId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(status); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ContentPackageInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 96: { + // contentId + contentId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // status + final int value = input.readInt32(); + if (ContentPackageStatusOuterClass.ContentPackageStatus.forNumber(value) != null) { + status = 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.contentId, contentId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeEnum(FieldNames.status, status, ContentPackageStatusOuterClass.ContentPackageStatus.converter()); + } + output.endObject(); + } + + @Override + public ContentPackageInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -407108748: + case 264552097: { + if (input.isAtField(FieldNames.contentId)) { + if (!input.trySkipNullValue()) { + contentId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -892481550: { + if (input.isAtField(FieldNames.status)) { + if (!input.trySkipNullValue()) { + final ContentPackageStatusOuterClass.ContentPackageStatus value = input.readEnum(ContentPackageStatusOuterClass.ContentPackageStatus.converter()); + if (value != null) { + status = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ContentPackageInfo clone() { + return new ContentPackageInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ContentPackageInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ContentPackageInfo(), data).checkInitialized(); + } + + public static ContentPackageInfo parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageInfo(), input).checkInitialized(); + } + + public static ContentPackageInfo parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new ContentPackageInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating ContentPackageInfo messages + */ + public static MessageFactory getFactory() { + return ContentPackageInfoFactory.INSTANCE; + } + + private enum ContentPackageInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public ContentPackageInfo create() { + return ContentPackageInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName contentId = FieldName.forField("contentId", "content_id"); + + static final FieldName status = FieldName.forField("status"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java b/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java new file mode 100644 index 0000000..ab84abc --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/ContentPackageStatusOuterClass.java @@ -0,0 +1,146 @@ +// 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 ContentPackageStatusOuterClass { + /** + * Protobuf enum {@code ContentPackageStatus} + */ + public enum ContentPackageStatus implements ProtoEnum { + /** + * ContentPackageStatus_None = 0; + */ + ContentPackageStatus_None("ContentPackageStatus_None", 0), + + /** + * ContentPackageStatus_Init = 1; + */ + ContentPackageStatus_Init("ContentPackageStatus_Init", 1), + + /** + * ContentPackageStatus_Doing = 2; + */ + ContentPackageStatus_Doing("ContentPackageStatus_Doing", 2), + + /** + * ContentPackageStatus_Finished = 3; + */ + ContentPackageStatus_Finished("ContentPackageStatus_Finished", 3); + + /** + * ContentPackageStatus_None = 0; + */ + public static final int ContentPackageStatus_None_VALUE = 0; + + /** + * ContentPackageStatus_Init = 1; + */ + public static final int ContentPackageStatus_Init_VALUE = 1; + + /** + * ContentPackageStatus_Doing = 2; + */ + public static final int ContentPackageStatus_Doing_VALUE = 2; + + /** + * ContentPackageStatus_Finished = 3; + */ + public static final int ContentPackageStatus_Finished_VALUE = 3; + + private final String name; + + private final int number; + + private ContentPackageStatus(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 ContentPackageStatusConverter.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 ContentPackageStatus forNumber(int value) { + return ContentPackageStatusConverter.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 ContentPackageStatus forNumberOr(int number, ContentPackageStatus other) { + ContentPackageStatus value = forNumber(number); + return value == null ? other : value; + } + + enum ContentPackageStatusConverter implements ProtoEnum.EnumConverter { + INSTANCE; + + private static final ContentPackageStatus[] lookup = new ContentPackageStatus[4]; + + static { + lookup[0] = ContentPackageStatus_None; + lookup[1] = ContentPackageStatus_Init; + lookup[2] = ContentPackageStatus_Doing; + lookup[3] = ContentPackageStatus_Finished; + } + + @Override + public final ContentPackageStatus forNumber(final int value) { + if (value >= 0 && value < lookup.length) { + return lookup[value]; + } + return null; + } + + @Override + public final ContentPackageStatus forName(final CharSequence value) { + if (value.length() == 25) { + if (ProtoUtil.isEqual("ContentPackageStatus_None", value)) { + return ContentPackageStatus_None; + } + if (ProtoUtil.isEqual("ContentPackageStatus_Init", value)) { + return ContentPackageStatus_Init; + } + } + if (value.length() == 26) { + if (ProtoUtil.isEqual("ContentPackageStatus_Doing", value)) { + return ContentPackageStatus_Doing; + } + } + if (value.length() == 29) { + if (ProtoUtil.isEqual("ContentPackageStatus_Finished", value)) { + return ContentPackageStatus_Finished; + } + } + return null; + } + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/DailyActiveInfoNotifyOuterClass.java index dcf8f07..cddf8d2 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 = 14; + * optional uint32 daily_active_point = 4; */ private int dailyActivePoint; /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 15; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_list = 8; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -46,7 +46,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 14; + * optional uint32 daily_active_point = 4; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -54,7 +54,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 14; + * optional uint32 daily_active_point = 4; * @return this */ public DailyActiveInfoNotify clearDailyActivePoint() { @@ -64,7 +64,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 14; + * optional uint32 daily_active_point = 4; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -72,7 +72,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * optional uint32 daily_active_point = 14; + * optional uint32 daily_active_point = 4; * @param value the dailyActivePoint to set * @return this */ @@ -83,7 +83,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 15; * @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 = 1; + * repeated uint32 daily_active_quest_id_list = 15; * @return this */ public DailyActiveInfoNotify clearDailyActiveQuestIdList() { @@ -101,7 +101,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_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. @@ -115,7 +115,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_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 @@ -129,7 +129,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 15; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -140,7 +140,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 1; + * repeated uint32 daily_active_quest_id_list = 15; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -151,7 +151,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -159,7 +159,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @return this */ public DailyActiveInfoNotify clearDailyActiveLevelList() { @@ -169,7 +169,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_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. @@ -184,7 +184,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_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 @@ -199,7 +199,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @param value the dailyActiveLevelList to add * @return this */ @@ -211,7 +211,7 @@ public final class DailyActiveInfoNotifyOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 3; + * repeated .DailyActivityInfo daily_active_level_list = 8; * @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) 112); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -334,25 +334,25 @@ public final class DailyActiveInfoNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 32: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 122) { break; } } - case 10: { + case 122: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 66) { break; } } - case 26: { + case 66: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000004; @@ -370,7 +370,7 @@ public final class DailyActiveInfoNotifyOuterClass { tag = input.readTag(); break; } - case 8: { + case 120: { // 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 98c0476..9bd3c4b 100644 --- a/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DailyActivityInfoOuterClass.java @@ -19,17 +19,17 @@ public final class DailyActivityInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 1; + * optional uint32 daily_active_point = 7; */ private int dailyActivePoint; /** - * optional uint32 level = 2; + * optional uint32 level = 8; */ private int level; /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 9; */ private int worldLevel; @@ -49,7 +49,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 1; + * optional uint32 daily_active_point = 7; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -57,7 +57,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 1; + * optional uint32 daily_active_point = 7; * @return this */ public DailyActivityInfo clearDailyActivePoint() { @@ -67,7 +67,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 1; + * optional uint32 daily_active_point = 7; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -75,7 +75,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 daily_active_point = 1; + * optional uint32 daily_active_point = 7; * @param value the dailyActivePoint to set * @return this */ @@ -86,7 +86,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -94,7 +94,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 8; * @return this */ public DailyActivityInfo clearLevel() { @@ -104,7 +104,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -112,7 +112,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 level = 2; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -123,7 +123,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 9; * @return whether the worldLevel field is set */ public boolean hasWorldLevel() { @@ -131,7 +131,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 9; * @return this */ public DailyActivityInfo clearWorldLevel() { @@ -141,7 +141,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 9; * @return the worldLevel */ public int getWorldLevel() { @@ -149,7 +149,7 @@ public final class DailyActivityInfoOuterClass { } /** - * optional uint32 world_level = 5; + * optional uint32 world_level = 9; * @param value the worldLevel to set * @return this */ @@ -273,15 +273,15 @@ public final class DailyActivityInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000008) != 0) { @@ -315,25 +315,25 @@ public final class DailyActivityInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 56: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 64) { break; } } - case 16: { + case 64: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 72) { break; } } - case 40: { + case 72: { // worldLevel worldLevel = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementCsReqOuterClass.java index c00cbe4..d532e93 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 = 10; + * optional uint32 entity_id = 12; */ private int entityId; @@ -34,7 +34,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -42,7 +42,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @return this */ public DeactivateFarmElementCsReq clearEntityId() { @@ -52,7 +52,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @return the entityId */ public int getEntityId() { @@ -60,7 +60,7 @@ public final class DeactivateFarmElementCsReqOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @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) 80); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(entityId); } } @@ -150,7 +150,7 @@ public final class DeactivateFarmElementCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 96: { // 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 16cb0ea..cc50543 100644 --- a/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeactivateFarmElementScRspOuterClass.java @@ -19,12 +19,12 @@ public final class DeactivateFarmElementScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; */ private int entityId; @@ -39,7 +39,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public DeactivateFarmElementScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -84,7 +84,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return this */ public DeactivateFarmElementScRsp clearEntityId() { @@ -94,7 +94,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @return the entityId */ public int getEntityId() { @@ -102,7 +102,7 @@ public final class DeactivateFarmElementScRspOuterClass { } /** - * optional uint32 entity_id = 8; + * optional uint32 entity_id = 11; * @param value the entityId to set * @return this */ @@ -177,11 +177,11 @@ public final class DeactivateFarmElementScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(entityId); } } @@ -205,16 +205,16 @@ public final class DeactivateFarmElementScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DelMailCsReqOuterClass.java index fedc816..a49eee1 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 = 9; + * repeated uint32 id_list = 6; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 id_list = 6; * @return whether the idList field is set */ public boolean hasIdList() { @@ -43,7 +43,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 id_list = 6; * @return this */ public DelMailCsReq clearIdList() { @@ -53,7 +53,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 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. @@ -67,7 +67,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 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 @@ -81,7 +81,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 id_list = 6; * @param value the idList to add * @return this */ @@ -92,7 +92,7 @@ public final class DelMailCsReqOuterClass { } /** - * repeated uint32 id_list = 9; + * repeated uint32 id_list = 6; * @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) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(idList.array()[i]); } } @@ -185,7 +185,7 @@ public final class DelMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 74: { + case 50: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class DelMailCsReqOuterClass { tag = input.readTag(); break; } - case 72: { + case 48: { // 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 cb74ded..c3ae4ed 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 = 12; + * optional uint32 retcode = 2; */ private int retcode; /** - * repeated uint32 id_list = 3; + * repeated uint32 id_list = 12; */ private final RepeatedInt idList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return this */ public DelMailScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class DelMailScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 id_list = 12; * @return whether the idList field is set */ public boolean hasIdList() { @@ -85,7 +85,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 id_list = 12; * @return this */ public DelMailScRsp clearIdList() { @@ -95,7 +95,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 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. @@ -109,7 +109,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 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 @@ -123,7 +123,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 id_list = 12; * @param value the idList to add * @return this */ @@ -134,7 +134,7 @@ public final class DelMailScRspOuterClass { } /** - * repeated uint32 id_list = 3; + * repeated uint32 id_list = 12; * @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) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < idList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(idList.array()[i]); } } @@ -240,16 +240,16 @@ public final class DelMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 98) { break; } } - case 26: { + case 98: { // idList [packed=true] input.readPackedUInt32(idList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class DelMailScRspOuterClass { tag = input.readTag(); break; } - case 24: { + case 96: { // 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 cb981b9..6988ce6 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 = 3; + * optional uint32 uid = 10; */ private int uid; @@ -34,7 +34,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 10; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 10; * @return this */ public DeleteFriendCsReq clearUid() { @@ -52,7 +52,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 10; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class DeleteFriendCsReqOuterClass { } /** - * optional uint32 uid = 3; + * optional uint32 uid = 10; * @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) 24); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class DeleteFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 80: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheCsReqOuterClass.java new file mode 100644 index 0000000..48668ef --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheCsReqOuterClass.java @@ -0,0 +1,305 @@ +// 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 DeleteSocialEventServerCacheCsReqOuterClass { + /** + * Protobuf type {@code DeleteSocialEventServerCacheCsReq} + */ + public static final class DeleteSocialEventServerCacheCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * repeated uint32 delete_cache = 9; + */ + private final RepeatedInt deleteCache = RepeatedInt.newEmptyInstance(); + + private DeleteSocialEventServerCacheCsReq() { + } + + /** + * @return a new empty instance of {@code DeleteSocialEventServerCacheCsReq} + */ + public static DeleteSocialEventServerCacheCsReq newInstance() { + return new DeleteSocialEventServerCacheCsReq(); + } + + /** + * repeated uint32 delete_cache = 9; + * @return whether the deleteCache field is set + */ + public boolean hasDeleteCache() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * repeated uint32 delete_cache = 9; + * @return this + */ + public DeleteSocialEventServerCacheCsReq clearDeleteCache() { + bitField0_ &= ~0x00000001; + deleteCache.clear(); + return this; + } + + /** + * repeated uint32 delete_cache = 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 #getMutableDeleteCache()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getDeleteCache() { + return deleteCache; + } + + /** + * repeated uint32 delete_cache = 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 RepeatedInt getMutableDeleteCache() { + bitField0_ |= 0x00000001; + return deleteCache; + } + + /** + * repeated uint32 delete_cache = 9; + * @param value the deleteCache to add + * @return this + */ + public DeleteSocialEventServerCacheCsReq addDeleteCache(final int value) { + bitField0_ |= 0x00000001; + deleteCache.add(value); + return this; + } + + /** + * repeated uint32 delete_cache = 9; + * @param values the deleteCache to add + * @return this + */ + public DeleteSocialEventServerCacheCsReq addAllDeleteCache(final int... values) { + bitField0_ |= 0x00000001; + deleteCache.addAll(values); + return this; + } + + @Override + public DeleteSocialEventServerCacheCsReq copyFrom( + final DeleteSocialEventServerCacheCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + deleteCache.copyFrom(other.deleteCache); + } + return this; + } + + @Override + public DeleteSocialEventServerCacheCsReq mergeFrom( + final DeleteSocialEventServerCacheCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasDeleteCache()) { + getMutableDeleteCache().addAll(other.deleteCache); + } + return this; + } + + @Override + public DeleteSocialEventServerCacheCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + deleteCache.clear(); + return this; + } + + @Override + public DeleteSocialEventServerCacheCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + deleteCache.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DeleteSocialEventServerCacheCsReq)) { + return false; + } + DeleteSocialEventServerCacheCsReq other = (DeleteSocialEventServerCacheCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasDeleteCache() || deleteCache.equals(other.deleteCache)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + for (int i = 0; i < deleteCache.length(); i++) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(deleteCache.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += (1 * deleteCache.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(deleteCache); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DeleteSocialEventServerCacheCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 74: { + // deleteCache [packed=true] + input.readPackedUInt32(deleteCache, tag); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 72: { + // deleteCache [packed=false] + tag = input.readRepeatedUInt32(deleteCache, tag); + bitField0_ |= 0x00000001; + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeRepeatedUInt32(FieldNames.deleteCache, deleteCache); + } + output.endObject(); + } + + @Override + public DeleteSocialEventServerCacheCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1148253033: + case -432706578: { + if (input.isAtField(FieldNames.deleteCache)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(deleteCache); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DeleteSocialEventServerCacheCsReq clone() { + return new DeleteSocialEventServerCacheCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DeleteSocialEventServerCacheCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheCsReq(), data).checkInitialized(); + } + + public static DeleteSocialEventServerCacheCsReq parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheCsReq(), input).checkInitialized(); + } + + public static DeleteSocialEventServerCacheCsReq parseFrom(final JsonSource input) throws + IOException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating DeleteSocialEventServerCacheCsReq messages + */ + public static MessageFactory getFactory() { + return DeleteSocialEventServerCacheCsReqFactory.INSTANCE; + } + + private enum DeleteSocialEventServerCacheCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public DeleteSocialEventServerCacheCsReq create() { + return DeleteSocialEventServerCacheCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName deleteCache = FieldName.forField("deleteCache", "delete_cache"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java new file mode 100644 index 0000000..2c34aaa --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/DeleteSocialEventServerCacheScRspOuterClass.java @@ -0,0 +1,385 @@ +// 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 DeleteSocialEventServerCacheScRspOuterClass { + /** + * Protobuf type {@code DeleteSocialEventServerCacheScRsp} + */ + public static final class DeleteSocialEventServerCacheScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 7; + */ + private int retcode; + + /** + * repeated uint32 ret_delete_cache = 5; + */ + private final RepeatedInt retDeleteCache = RepeatedInt.newEmptyInstance(); + + private DeleteSocialEventServerCacheScRsp() { + } + + /** + * @return a new empty instance of {@code DeleteSocialEventServerCacheScRsp} + */ + public static DeleteSocialEventServerCacheScRsp newInstance() { + return new DeleteSocialEventServerCacheScRsp(); + } + + /** + * 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 DeleteSocialEventServerCacheScRsp 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 DeleteSocialEventServerCacheScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * repeated uint32 ret_delete_cache = 5; + * @return whether the retDeleteCache field is set + */ + public boolean hasRetDeleteCache() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * repeated uint32 ret_delete_cache = 5; + * @return this + */ + public DeleteSocialEventServerCacheScRsp clearRetDeleteCache() { + bitField0_ &= ~0x00000002; + retDeleteCache.clear(); + return this; + } + + /** + * repeated uint32 ret_delete_cache = 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 #getMutableRetDeleteCache()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getRetDeleteCache() { + return retDeleteCache; + } + + /** + * repeated uint32 ret_delete_cache = 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 getMutableRetDeleteCache() { + bitField0_ |= 0x00000002; + return retDeleteCache; + } + + /** + * repeated uint32 ret_delete_cache = 5; + * @param value the retDeleteCache to add + * @return this + */ + public DeleteSocialEventServerCacheScRsp addRetDeleteCache(final int value) { + bitField0_ |= 0x00000002; + retDeleteCache.add(value); + return this; + } + + /** + * repeated uint32 ret_delete_cache = 5; + * @param values the retDeleteCache to add + * @return this + */ + public DeleteSocialEventServerCacheScRsp addAllRetDeleteCache(final int... values) { + bitField0_ |= 0x00000002; + retDeleteCache.addAll(values); + return this; + } + + @Override + public DeleteSocialEventServerCacheScRsp copyFrom( + final DeleteSocialEventServerCacheScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + retDeleteCache.copyFrom(other.retDeleteCache); + } + return this; + } + + @Override + public DeleteSocialEventServerCacheScRsp mergeFrom( + final DeleteSocialEventServerCacheScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasRetDeleteCache()) { + getMutableRetDeleteCache().addAll(other.retDeleteCache); + } + return this; + } + + @Override + public DeleteSocialEventServerCacheScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + retDeleteCache.clear(); + return this; + } + + @Override + public DeleteSocialEventServerCacheScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retDeleteCache.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof DeleteSocialEventServerCacheScRsp)) { + return false; + } + DeleteSocialEventServerCacheScRsp other = (DeleteSocialEventServerCacheScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasRetDeleteCache() || retDeleteCache.equals(other.retDeleteCache)); + } + + @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 < retDeleteCache.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retDeleteCache.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += (1 * retDeleteCache.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(retDeleteCache); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public DeleteSocialEventServerCacheScRsp 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 != 42) { + break; + } + } + case 42: { + // retDeleteCache [packed=true] + input.readPackedUInt32(retDeleteCache, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + case 40: { + // retDeleteCache [packed=false] + tag = input.readRepeatedUInt32(retDeleteCache, 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.retDeleteCache, retDeleteCache); + } + output.endObject(); + } + + @Override + public DeleteSocialEventServerCacheScRsp 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 1240268086: + case -1478890804: { + if (input.isAtField(FieldNames.retDeleteCache)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(retDeleteCache); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public DeleteSocialEventServerCacheScRsp clone() { + return new DeleteSocialEventServerCacheScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static DeleteSocialEventServerCacheScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheScRsp(), data).checkInitialized(); + } + + public static DeleteSocialEventServerCacheScRsp parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheScRsp(), input).checkInitialized(); + } + + public static DeleteSocialEventServerCacheScRsp parseFrom(final JsonSource input) throws + IOException { + return ProtoMessage.mergeFrom(new DeleteSocialEventServerCacheScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating DeleteSocialEventServerCacheScRsp messages + */ + public static MessageFactory getFactory() { + return DeleteSocialEventServerCacheScRspFactory.INSTANCE; + } + + private enum DeleteSocialEventServerCacheScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public DeleteSocialEventServerCacheScRsp create() { + return DeleteSocialEventServerCacheScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName retDeleteCache = FieldName.forField("retDeleteCache", "ret_delete_cache"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java index 8e96361..1d28ed3 100644 --- a/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class DeployRotaterCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 2; */ private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); @@ -34,7 +34,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 2; * @return whether the rotaterData field is set */ public boolean hasRotaterData() { @@ -42,7 +42,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 2; * @return this */ public DeployRotaterCsReq clearRotaterData() { @@ -52,7 +52,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 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 +66,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 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 +80,7 @@ public final class DeployRotaterCsReqOuterClass { } /** - * optional .RotaterData rotater_data = 11; + * optional .RotaterData rotater_data = 2; * @param value the rotaterData to set * @return this */ @@ -150,7 +150,7 @@ public final class DeployRotaterCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rotaterData); } } @@ -171,7 +171,7 @@ public final class DeployRotaterCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 18: { // rotaterData input.readMessage(rotaterData); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java index c4b087a..248c404 100644 --- a/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DeployRotaterScRspOuterClass.java @@ -19,20 +19,20 @@ public final class DeployRotaterScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional .RotatorEnergyInfo energy_info = 6; - */ - private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); - - /** - * optional .RotaterData rotater_data = 7; + * optional .RotaterData rotater_data = 6; */ private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); + /** + * optional .RotatorEnergyInfo energy_info = 10; + */ + private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); + private DeployRotaterScRsp() { } @@ -44,7 +44,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return this */ public DeployRotaterScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -81,83 +81,25 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 6; - * @return whether the energyInfo field is set + * optional .RotaterData rotater_data = 6; + * @return whether the rotaterData field is set */ - public boolean hasEnergyInfo() { + public boolean hasRotaterData() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RotatorEnergyInfo energy_info = 6; - * @return this - */ - public DeployRotaterScRsp clearEnergyInfo() { - bitField0_ &= ~0x00000002; - energyInfo.clear(); - return this; - } - - /** - * optional .RotatorEnergyInfo energy_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 #getMutableEnergyInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() { - return energyInfo; - } - - /** - * optional .RotatorEnergyInfo energy_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 RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { - bitField0_ |= 0x00000002; - return energyInfo; - } - - /** - * optional .RotatorEnergyInfo energy_info = 6; - * @param value the energyInfo to set - * @return this - */ - public DeployRotaterScRsp setEnergyInfo( - final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { - bitField0_ |= 0x00000002; - energyInfo.copyFrom(value); - return this; - } - - /** - * optional .RotaterData rotater_data = 7; - * @return whether the rotaterData field is set - */ - public boolean hasRotaterData() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RotaterData rotater_data = 7; + * optional .RotaterData rotater_data = 6; * @return this */ public DeployRotaterScRsp clearRotaterData() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; rotaterData.clear(); return this; } /** - * optional .RotaterData rotater_data = 7; + * optional .RotaterData rotater_data = 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. @@ -171,7 +113,7 @@ public final class DeployRotaterScRspOuterClass { } /** - * optional .RotaterData rotater_data = 7; + * optional .RotaterData rotater_data = 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 @@ -180,29 +122,87 @@ public final class DeployRotaterScRspOuterClass { * @return internal storage object for modifications */ public RotaterDataOuterClass.RotaterData getMutableRotaterData() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return rotaterData; } /** - * optional .RotaterData rotater_data = 7; + * optional .RotaterData rotater_data = 6; * @param value the rotaterData to set * @return this */ public DeployRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; rotaterData.copyFrom(value); return this; } + /** + * optional .RotatorEnergyInfo energy_info = 10; + * @return whether the energyInfo field is set + */ + public boolean hasEnergyInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RotatorEnergyInfo energy_info = 10; + * @return this + */ + public DeployRotaterScRsp clearEnergyInfo() { + bitField0_ &= ~0x00000004; + energyInfo.clear(); + return this; + } + + /** + * optional .RotatorEnergyInfo energy_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 #getMutableEnergyInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() { + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_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 RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { + bitField0_ |= 0x00000004; + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_info = 10; + * @param value the energyInfo to set + * @return this + */ + public DeployRotaterScRsp setEnergyInfo( + final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { + bitField0_ |= 0x00000004; + energyInfo.copyFrom(value); + return this; + } + @Override public DeployRotaterScRsp copyFrom(final DeployRotaterScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - energyInfo.copyFrom(other.energyInfo); rotaterData.copyFrom(other.rotaterData); + energyInfo.copyFrom(other.energyInfo); } return this; } @@ -216,12 +216,12 @@ public final class DeployRotaterScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEnergyInfo()) { - getMutableEnergyInfo().mergeFrom(other.energyInfo); - } if (other.hasRotaterData()) { getMutableRotaterData().mergeFrom(other.rotaterData); } + if (other.hasEnergyInfo()) { + getMutableEnergyInfo().mergeFrom(other.energyInfo); + } return this; } @@ -233,8 +233,8 @@ public final class DeployRotaterScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - energyInfo.clear(); rotaterData.clear(); + energyInfo.clear(); return this; } @@ -245,8 +245,8 @@ public final class DeployRotaterScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - energyInfo.clearQuick(); rotaterData.clearQuick(); + energyInfo.clearQuick(); return this; } @@ -261,23 +261,23 @@ public final class DeployRotaterScRspOuterClass { DeployRotaterScRsp other = (DeployRotaterScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)) - && (!hasRotaterData() || rotaterData.equals(other.rotaterData)); + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)) + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)); } @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) 50); - output.writeMessageNoTag(energyInfo); + output.writeMessageNoTag(rotaterData); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(rotaterData); + output.writeRawByte((byte) 82); + output.writeMessageNoTag(energyInfo); } } @@ -288,10 +288,10 @@ public final class DeployRotaterScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); } return size; } @@ -303,7 +303,7 @@ public final class DeployRotaterScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -313,17 +313,17 @@ public final class DeployRotaterScRspOuterClass { } } case 50: { - // energyInfo - input.readMessage(energyInfo); + // rotaterData + input.readMessage(rotaterData); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 82) { break; } } - case 58: { - // rotaterData - input.readMessage(rotaterData); + case 82: { + // energyInfo + input.readMessage(energyInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -351,10 +351,10 @@ public final class DeployRotaterScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.energyInfo, energyInfo); + output.writeMessage(FieldNames.rotaterData, rotaterData); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rotaterData, rotaterData); + output.writeMessage(FieldNames.energyInfo, energyInfo); } output.endObject(); } @@ -377,11 +377,11 @@ public final class DeployRotaterScRspOuterClass { } break; } - case 1464698710: - case -1818804219: { - if (input.isAtField(FieldNames.energyInfo)) { + case 1880563393: + case -1807070094: { + if (input.isAtField(FieldNames.rotaterData)) { if (!input.trySkipNullValue()) { - input.readMessage(energyInfo); + input.readMessage(rotaterData); bitField0_ |= 0x00000002; } } else { @@ -389,11 +389,11 @@ public final class DeployRotaterScRspOuterClass { } break; } - case 1880563393: - case -1807070094: { - if (input.isAtField(FieldNames.rotaterData)) { + case 1464698710: + case -1818804219: { + if (input.isAtField(FieldNames.energyInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rotaterData); + input.readMessage(energyInfo); bitField0_ |= 0x00000004; } } else { @@ -456,9 +456,9 @@ public final class DeployRotaterScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); - static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); + + static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java index d726ce0..dbf79a8 100644 --- a/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DestroyItemCsReqOuterClass.java @@ -19,17 +19,17 @@ public final class DestroyItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_id = 1; - */ - private int itemId; - - /** - * optional uint32 item_count = 9; + * optional uint32 item_count = 2; */ private int itemCount; /** - * optional uint32 cur_item_count = 11; + * optional uint32 item_id = 11; + */ + private int itemId; + + /** + * optional uint32 cur_item_count = 12; */ private int curItemCount; @@ -44,62 +44,25 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_id = 1; - * @return whether the itemId field is set + * optional uint32 item_count = 2; + * @return whether the itemCount field is set */ - public boolean hasItemId() { + public boolean hasItemCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 item_id = 1; - * @return this - */ - public DestroyItemCsReq clearItemId() { - bitField0_ &= ~0x00000001; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 1; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 1; - * @param value the itemId to set - * @return this - */ - public DestroyItemCsReq setItemId(final int value) { - bitField0_ |= 0x00000001; - itemId = value; - return this; - } - - /** - * optional uint32 item_count = 9; - * @return whether the itemCount field is set - */ - public boolean hasItemCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 item_count = 9; + * optional uint32 item_count = 2; * @return this */ public DestroyItemCsReq clearItemCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; itemCount = 0; return this; } /** - * optional uint32 item_count = 9; + * optional uint32 item_count = 2; * @return the itemCount */ public int getItemCount() { @@ -107,18 +70,55 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 item_count = 9; + * optional uint32 item_count = 2; * @param value the itemCount to set * @return this */ public DestroyItemCsReq setItemCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; itemCount = value; return this; } /** - * optional uint32 cur_item_count = 11; + * optional uint32 item_id = 11; + * @return whether the itemId field is set + */ + public boolean hasItemId() { + 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() { @@ -126,7 +126,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 cur_item_count = 11; + * optional uint32 cur_item_count = 12; * @return this */ public DestroyItemCsReq clearCurItemCount() { @@ -136,7 +136,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 cur_item_count = 11; + * optional uint32 cur_item_count = 12; * @return the curItemCount */ public int getCurItemCount() { @@ -144,7 +144,7 @@ public final class DestroyItemCsReqOuterClass { } /** - * optional uint32 cur_item_count = 11; + * optional uint32 cur_item_count = 12; * @param value the curItemCount to set * @return this */ @@ -159,8 +159,8 @@ public final class DestroyItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - itemId = other.itemId; itemCount = other.itemCount; + itemId = other.itemId; curItemCount = other.curItemCount; } return this; @@ -172,12 +172,12 @@ public final class DestroyItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasItemId()) { - setItemId(other.itemId); - } if (other.hasItemCount()) { setItemCount(other.itemCount); } + if (other.hasItemId()) { + setItemId(other.itemId); + } if (other.hasCurItemCount()) { setCurItemCount(other.curItemCount); } @@ -191,8 +191,8 @@ public final class DestroyItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - itemId = 0; itemCount = 0; + itemId = 0; curItemCount = 0; return this; } @@ -217,23 +217,23 @@ public final class DestroyItemCsReqOuterClass { } DestroyItemCsReq other = (DestroyItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasItemId() || itemId == other.itemId) && (!hasItemCount() || itemCount == other.itemCount) + && (!hasItemId() || itemId == other.itemId) && (!hasCurItemCount() || curItemCount == other.curItemCount); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(itemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(itemCount); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); + output.writeUInt32NoTag(itemId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); output.writeUInt32NoTag(curItemCount); } } @@ -242,10 +242,10 @@ public final class DestroyItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemCount); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curItemCount); @@ -260,25 +260,25 @@ public final class DestroyItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // itemId - itemId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 16: { // itemCount itemCount = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 88) { break; } } case 88: { + // itemId + itemId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // curItemCount curItemCount = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class DestroyItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.itemCount, itemCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.itemCount, itemCount); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curItemCount, curItemCount); @@ -323,11 +323,11 @@ public final class DestroyItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 2127813052: + case -1966910237: { + if (input.isAtField(FieldNames.itemCount)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + itemCount = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class DestroyItemCsReqOuterClass { } break; } - case 2127813052: - case -1966910237: { - if (input.isAtField(FieldNames.itemCount)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - itemCount = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -412,10 +412,10 @@ public final class DestroyItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - 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"); } } diff --git a/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java b/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java index 855e7c2..2d82c1f 100644 --- a/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DevelopmentTypeOuterClass.java @@ -57,7 +57,22 @@ public final class DevelopmentTypeOuterClass { /** * DEVELOPMENT_ACTIVITY_END = 9; */ - DEVELOPMENT_ACTIVITY_END("DEVELOPMENT_ACTIVITY_END", 9); + DEVELOPMENT_ACTIVITY_END("DEVELOPMENT_ACTIVITY_END", 9), + + /** + * DEVELOPMENT_BOSS_CHALLENGE = 10; + */ + DEVELOPMENT_BOSS_CHALLENGE("DEVELOPMENT_BOSS_CHALLENGE", 10), + + /** + * DEVELOPMENT_ROGUE_TOURN = 11; + */ + DEVELOPMENT_ROGUE_TOURN("DEVELOPMENT_ROGUE_TOURN", 11), + + /** + * DEVELOPMENT_ROGUE_TOURN_WEEK = 12; + */ + DEVELOPMENT_ROGUE_TOURN_WEEK("DEVELOPMENT_ROGUE_TOURN_WEEK", 12); /** * DEVELOPMENT_NONE = 0; @@ -109,6 +124,21 @@ public final class DevelopmentTypeOuterClass { */ public static final int DEVELOPMENT_ACTIVITY_END_VALUE = 9; + /** + * DEVELOPMENT_BOSS_CHALLENGE = 10; + */ + public static final int DEVELOPMENT_BOSS_CHALLENGE_VALUE = 10; + + /** + * DEVELOPMENT_ROGUE_TOURN = 11; + */ + public static final int DEVELOPMENT_ROGUE_TOURN_VALUE = 11; + + /** + * DEVELOPMENT_ROGUE_TOURN_WEEK = 12; + */ + public static final int DEVELOPMENT_ROGUE_TOURN_WEEK_VALUE = 12; + private final String name; private final int number; @@ -162,7 +192,7 @@ public final class DevelopmentTypeOuterClass { enum DevelopmentTypeConverter implements ProtoEnum.EnumConverter { INSTANCE; - private static final DevelopmentType[] lookup = new DevelopmentType[10]; + private static final DevelopmentType[] lookup = new DevelopmentType[13]; static { lookup[0] = DEVELOPMENT_NONE; @@ -175,6 +205,9 @@ public final class DevelopmentTypeOuterClass { lookup[7] = DEVELOPMENT_UNLOCK_EQUIPMENT; lookup[8] = DEVELOPMENT_ACTIVITY_START; lookup[9] = DEVELOPMENT_ACTIVITY_END; + lookup[10] = DEVELOPMENT_BOSS_CHALLENGE; + lookup[11] = DEVELOPMENT_ROGUE_TOURN; + lookup[12] = DEVELOPMENT_ROGUE_TOURN_WEEK; } @Override @@ -198,6 +231,9 @@ public final class DevelopmentTypeOuterClass { if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_CHESS", value)) { return DEVELOPMENT_ROGUE_CHESS; } + if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_TOURN", value)) { + return DEVELOPMENT_ROGUE_TOURN; + } break; } case 24: { @@ -219,6 +255,9 @@ public final class DevelopmentTypeOuterClass { if (ProtoUtil.isEqual("DEVELOPMENT_ACTIVITY_START", value)) { return DEVELOPMENT_ACTIVITY_START; } + if (ProtoUtil.isEqual("DEVELOPMENT_BOSS_CHALLENGE", value)) { + return DEVELOPMENT_BOSS_CHALLENGE; + } break; } case 27: { @@ -237,6 +276,9 @@ public final class DevelopmentTypeOuterClass { if (ProtoUtil.isEqual("DEVELOPMENT_UNLOCK_EQUIPMENT", value)) { return DEVELOPMENT_UNLOCK_EQUIPMENT; } + if (ProtoUtil.isEqual("DEVELOPMENT_ROGUE_TOURN_WEEK", value)) { + return DEVELOPMENT_ROGUE_TOURN_WEEK; + } break; } } diff --git a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java index 24b936c..b8fb227 100644 --- a/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DiscardRelicCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class DiscardRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 3; */ private int relicUniqueId; /** - * optional bool is_discard = 4; + * optional bool is_discard = 5; */ private boolean isDiscard; @@ -39,7 +39,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 3; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 3; * @return this */ public DiscardRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 3; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 14; + * optional uint32 relic_unique_id = 3; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 4; + * optional bool is_discard = 5; * @return whether the isDiscard field is set */ public boolean hasIsDiscard() { @@ -84,7 +84,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 4; + * optional bool is_discard = 5; * @return this */ public DiscardRelicCsReq clearIsDiscard() { @@ -94,7 +94,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 4; + * optional bool is_discard = 5; * @return the isDiscard */ public boolean getIsDiscard() { @@ -102,7 +102,7 @@ public final class DiscardRelicCsReqOuterClass { } /** - * optional bool is_discard = 4; + * optional bool is_discard = 5; * @param value the isDiscard to set * @return this */ @@ -177,11 +177,11 @@ public final class DiscardRelicCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isDiscard); } } @@ -205,16 +205,16 @@ public final class DiscardRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 24: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { + case 40: { // isDiscard isDiscard = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java index 0688a57..15072f5 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarDetailInfoOuterClass.java @@ -20,55 +20,55 @@ public final class DisplayAvatarDetailInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 4; - */ - private int promotion; - - /** - * optional uint32 rank = 5; - */ - private int rank; - - /** - * optional uint32 exp = 10; + * optional uint32 exp = 1; */ private int exp; /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 2; */ private int avatarId; /** - * optional uint32 level = 12; + * optional uint32 rank = 4; */ - private int level; + private int rank; /** - * optional uint32 pos = 14; - */ - private int pos; - - /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 dressed_skin_id = 6; */ private int dressedSkinId; /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional uint32 level = 8; + */ + private int level; + + /** + * optional uint32 pos = 12; + */ + private int pos; + + /** + * optional uint32 promotion = 15; + */ + private int promotion; + + /** + * optional .DisplayEquipmentInfo equipment = 3; */ private final DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo equipment = DisplayEquipmentInfoOuterClass.DisplayEquipmentInfo.newInstance(); /** - * repeated .AvatarSkillTree skilltree_list = 6; - */ - private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); - - /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_list = 10; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(DisplayRelicInfoOuterClass.DisplayRelicInfo.getFactory()); + /** + * repeated .AvatarSkillTree skilltree_list = 14; + */ + private final RepeatedMessage skilltreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); + private DisplayAvatarDetailInfo() { } @@ -80,99 +80,25 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 promotion = 4; - * @return whether the promotion field is set + * optional uint32 exp = 1; + * @return whether the exp field is set */ - public boolean hasPromotion() { + public boolean hasExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 promotion = 4; - * @return this - */ - public DisplayAvatarDetailInfo 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 DisplayAvatarDetailInfo setPromotion(final int value) { - bitField0_ |= 0x00000001; - promotion = value; - return this; - } - - /** - * optional uint32 rank = 5; - * @return whether the rank field is set - */ - public boolean hasRank() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 rank = 5; - * @return this - */ - public DisplayAvatarDetailInfo clearRank() { - bitField0_ &= ~0x00000002; - 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 DisplayAvatarDetailInfo setRank(final int value) { - bitField0_ |= 0x00000002; - rank = value; - return this; - } - - /** - * optional uint32 exp = 10; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 exp = 10; + * optional uint32 exp = 1; * @return this */ public DisplayAvatarDetailInfo clearExp() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; exp = 0; return this; } /** - * optional uint32 exp = 10; + * optional uint32 exp = 1; * @return the exp */ public int getExp() { @@ -180,36 +106,36 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 exp = 10; + * optional uint32 exp = 1; * @param value the exp to set * @return this */ public DisplayAvatarDetailInfo setExp(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; exp = value; return this; } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 2; * @return whether the avatarId field is set */ public boolean hasAvatarId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 2; * @return this */ public DisplayAvatarDetailInfo clearAvatarId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 2; * @return the avatarId */ public int getAvatarId() { @@ -217,18 +143,92 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 avatar_id = 11; + * optional uint32 avatar_id = 2; * @param value the avatarId to set * @return this */ public DisplayAvatarDetailInfo setAvatarId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; avatarId = value; return this; } /** - * optional uint32 level = 12; + * 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; + * @return this + */ + public DisplayAvatarDetailInfo clearDressedSkinId() { + bitField0_ &= ~0x00000008; + dressedSkinId = 0; + return this; + } + + /** + * optional uint32 dressed_skin_id = 6; + * @return the dressedSkinId + */ + public int getDressedSkinId() { + return dressedSkinId; + } + + /** + * optional uint32 dressed_skin_id = 6; + * @param value the dressedSkinId to set + * @return this + */ + public DisplayAvatarDetailInfo setDressedSkinId(final int value) { + bitField0_ |= 0x00000008; + dressedSkinId = value; + return this; + } + + /** + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -236,7 +236,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @return this */ public DisplayAvatarDetailInfo clearLevel() { @@ -246,7 +246,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -254,7 +254,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -265,7 +265,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 pos = 14; + * optional uint32 pos = 12; * @return whether the pos field is set */ public boolean hasPos() { @@ -273,7 +273,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 pos = 14; + * optional uint32 pos = 12; * @return this */ public DisplayAvatarDetailInfo clearPos() { @@ -283,7 +283,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 pos = 14; + * optional uint32 pos = 12; * @return the pos */ public int getPos() { @@ -291,7 +291,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 pos = 14; + * optional uint32 pos = 12; * @param value the pos to set * @return this */ @@ -302,44 +302,44 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional uint32 dressed_skin_id = 15; - * @return whether the dressedSkinId field is set + * optional uint32 promotion = 15; + * @return whether the promotion field is set */ - public boolean hasDressedSkinId() { + public boolean hasPromotion() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 dressed_skin_id = 15; + * optional uint32 promotion = 15; * @return this */ - public DisplayAvatarDetailInfo clearDressedSkinId() { + public DisplayAvatarDetailInfo clearPromotion() { bitField0_ &= ~0x00000040; - dressedSkinId = 0; + promotion = 0; return this; } /** - * optional uint32 dressed_skin_id = 15; - * @return the dressedSkinId + * optional uint32 promotion = 15; + * @return the promotion */ - public int getDressedSkinId() { - return dressedSkinId; + public int getPromotion() { + return promotion; } /** - * optional uint32 dressed_skin_id = 15; - * @param value the dressedSkinId to set + * optional uint32 promotion = 15; + * @param value the promotion to set * @return this */ - public DisplayAvatarDetailInfo setDressedSkinId(final int value) { + public DisplayAvatarDetailInfo setPromotion(final int value) { bitField0_ |= 0x00000040; - dressedSkinId = value; + promotion = value; return this; } /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional .DisplayEquipmentInfo equipment = 3; * @return whether the equipment field is set */ public boolean hasEquipment() { @@ -347,7 +347,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional .DisplayEquipmentInfo equipment = 3; * @return this */ public DisplayAvatarDetailInfo clearEquipment() { @@ -357,7 +357,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional .DisplayEquipmentInfo equipment = 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 +371,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional .DisplayEquipmentInfo equipment = 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 @@ -385,7 +385,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * optional .DisplayEquipmentInfo equipment = 2; + * optional .DisplayEquipmentInfo equipment = 3; * @param value the equipment to set * @return this */ @@ -397,95 +397,25 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .AvatarSkillTree skilltree_list = 6; - * @return whether the skilltreeList field is set + * repeated .DisplayRelicInfo relic_list = 10; + * @return whether the relicList field is set */ - public boolean hasSkilltreeList() { + public boolean hasRelicList() { return (bitField0_ & 0x00000100) != 0; } /** - * repeated .AvatarSkillTree skilltree_list = 6; - * @return this - */ - public DisplayAvatarDetailInfo clearSkilltreeList() { - bitField0_ &= ~0x00000100; - skilltreeList.clear(); - return this; - } - - /** - * repeated .AvatarSkillTree skilltree_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 #getMutableSkilltreeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getSkilltreeList() { - return skilltreeList; - } - - /** - * repeated .AvatarSkillTree skilltree_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 getMutableSkilltreeList() { - bitField0_ |= 0x00000100; - return skilltreeList; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 6; - * @param value the skilltreeList to add - * @return this - */ - public DisplayAvatarDetailInfo addSkilltreeList( - final AvatarSkillTreeOuterClass.AvatarSkillTree value) { - bitField0_ |= 0x00000100; - skilltreeList.add(value); - return this; - } - - /** - * repeated .AvatarSkillTree skilltree_list = 6; - * @param values the skilltreeList to add - * @return this - */ - public DisplayAvatarDetailInfo addAllSkilltreeList( - final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { - bitField0_ |= 0x00000100; - skilltreeList.addAll(values); - return this; - } - - /** - * repeated .DisplayRelicInfo relic_list = 8; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_list = 10; * @return this */ public DisplayAvatarDetailInfo clearRelicList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; relicList.clear(); return this; } /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_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. @@ -499,7 +429,7 @@ public final class DisplayAvatarDetailInfoOuterClass { } /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_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 @@ -508,49 +438,119 @@ public final class DisplayAvatarDetailInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return relicList; } /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_list = 10; * @param value the relicList to add * @return this */ public DisplayAvatarDetailInfo addRelicList( final DisplayRelicInfoOuterClass.DisplayRelicInfo value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; relicList.add(value); return this; } /** - * repeated .DisplayRelicInfo relic_list = 8; + * repeated .DisplayRelicInfo relic_list = 10; * @param values the relicList to add * @return this */ public DisplayAvatarDetailInfo addAllRelicList( final DisplayRelicInfoOuterClass.DisplayRelicInfo... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; relicList.addAll(values); return this; } + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @return whether the skilltreeList field is set + */ + public boolean hasSkilltreeList() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @return this + */ + public DisplayAvatarDetailInfo clearSkilltreeList() { + bitField0_ &= ~0x00000200; + skilltreeList.clear(); + return this; + } + + /** + * repeated .AvatarSkillTree 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 #getMutableSkilltreeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getSkilltreeList() { + return skilltreeList; + } + + /** + * repeated .AvatarSkillTree 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 getMutableSkilltreeList() { + bitField0_ |= 0x00000200; + return skilltreeList; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @param value the skilltreeList to add + * @return this + */ + public DisplayAvatarDetailInfo addSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree value) { + bitField0_ |= 0x00000200; + skilltreeList.add(value); + return this; + } + + /** + * repeated .AvatarSkillTree skilltree_list = 14; + * @param values the skilltreeList to add + * @return this + */ + public DisplayAvatarDetailInfo addAllSkilltreeList( + final AvatarSkillTreeOuterClass.AvatarSkillTree... values) { + bitField0_ |= 0x00000200; + skilltreeList.addAll(values); + return this; + } + @Override public DisplayAvatarDetailInfo copyFrom(final DisplayAvatarDetailInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - promotion = other.promotion; - rank = other.rank; exp = other.exp; avatarId = other.avatarId; + rank = other.rank; + dressedSkinId = other.dressedSkinId; level = other.level; pos = other.pos; - dressedSkinId = other.dressedSkinId; + promotion = other.promotion; equipment.copyFrom(other.equipment); - skilltreeList.copyFrom(other.skilltreeList); relicList.copyFrom(other.relicList); + skilltreeList.copyFrom(other.skilltreeList); } return this; } @@ -561,36 +561,36 @@ public final class DisplayAvatarDetailInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - 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); } if (other.hasPos()) { setPos(other.pos); } - if (other.hasDressedSkinId()) { - setDressedSkinId(other.dressedSkinId); + if (other.hasPromotion()) { + setPromotion(other.promotion); } if (other.hasEquipment()) { getMutableEquipment().mergeFrom(other.equipment); } - if (other.hasSkilltreeList()) { - getMutableSkilltreeList().addAll(other.skilltreeList); - } if (other.hasRelicList()) { getMutableRelicList().addAll(other.relicList); } + if (other.hasSkilltreeList()) { + getMutableSkilltreeList().addAll(other.skilltreeList); + } return this; } @@ -601,16 +601,16 @@ public final class DisplayAvatarDetailInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - promotion = 0; - rank = 0; exp = 0; avatarId = 0; + rank = 0; + dressedSkinId = 0; level = 0; pos = 0; - dressedSkinId = 0; + promotion = 0; equipment.clear(); - skilltreeList.clear(); relicList.clear(); + skilltreeList.clear(); return this; } @@ -622,8 +622,8 @@ public final class DisplayAvatarDetailInfoOuterClass { cachedSize = -1; bitField0_ = 0; equipment.clearQuick(); - skilltreeList.clearQuick(); relicList.clearQuick(); + skilltreeList.clearQuick(); return this; } @@ -637,62 +637,62 @@ public final class DisplayAvatarDetailInfoOuterClass { } DisplayAvatarDetailInfo other = (DisplayAvatarDetailInfo) o; return bitField0_ == other.bitField0_ - && (!hasPromotion() || promotion == other.promotion) - && (!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) - && (!hasDressedSkinId() || dressedSkinId == other.dressedSkinId) + && (!hasPromotion() || promotion == other.promotion) && (!hasEquipment() || equipment.equals(other.equipment)) - && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasSkilltreeList() || skilltreeList.equals(other.skilltreeList)); } @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) 40); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(exp); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 88); + 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) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(dressedSkinId); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 26); output.writeMessageNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < skilltreeList.length(); i++) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(skilltreeList.get(i)); + for (int i = 0; i < relicList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(relicList.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < skilltreeList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(skilltreeList.get(i)); } } } @@ -701,17 +701,17 @@ public final class DisplayAvatarDetailInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } @@ -719,16 +719,16 @@ public final class DisplayAvatarDetailInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(pos); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dressedSkinId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000080) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(equipment); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } if ((bitField0_ & 0x00000200) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * skilltreeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skilltreeList); } return size; } @@ -740,52 +740,52 @@ public final class DisplayAvatarDetailInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 8: { // exp exp = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 16) { break; } } - case 88: { + 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; tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // pos pos = input.readUInt32(); bitField0_ |= 0x00000020; @@ -795,34 +795,34 @@ public final class DisplayAvatarDetailInfoOuterClass { } } case 120: { - // dressedSkinId - dressedSkinId = input.readUInt32(); + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { + case 26: { // equipment input.readMessage(equipment); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 50) { + if (tag != 82) { break; } } - case 50: { - // skilltreeList - tag = input.readRepeatedMessage(skilltreeList, tag); - bitField0_ |= 0x00000100; - if (tag != 66) { - break; - } - } - case 66: { + case 82: { // relicList tag = input.readRepeatedMessage(relicList, tag); + bitField0_ |= 0x00000100; + if (tag != 114) { + break; + } + } + case 114: { + // skilltreeList + tag = input.readRepeatedMessage(skilltreeList, tag); bitField0_ |= 0x00000200; if (tag != 0) { break; @@ -846,17 +846,17 @@ public final class DisplayAvatarDetailInfoOuterClass { 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.rank, rank); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.exp, exp); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.avatarId, avatarId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.level, level); } @@ -864,16 +864,16 @@ public final class DisplayAvatarDetailInfoOuterClass { output.writeUInt32(FieldNames.pos, pos); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.dressedSkinId, dressedSkinId); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.equipment, equipment); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.skilltreeList, skilltreeList); } output.endObject(); } @@ -885,33 +885,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } 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 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_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -923,6 +901,29 @@ 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 { @@ -952,11 +953,10 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case -407000018: - case 2012697844: { - if (input.isAtField(FieldNames.dressedSkinId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - dressedSkinId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -975,11 +975,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case 1549763245: - case 815647086: { - if (input.isAtField(FieldNames.skilltreeList)) { + case 204814001: + case 2071893482: { + if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(skilltreeList); + input.readRepeatedMessage(relicList); bitField0_ |= 0x00000100; } } else { @@ -987,11 +987,11 @@ public final class DisplayAvatarDetailInfoOuterClass { } break; } - case 204814001: - case 2071893482: { - if (input.isAtField(FieldNames.relicList)) { + case 1549763245: + case 815647086: { + if (input.isAtField(FieldNames.skilltreeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(relicList); + input.readRepeatedMessage(skilltreeList); bitField0_ |= 0x00000200; } } else { @@ -1052,25 +1052,25 @@ public final class DisplayAvatarDetailInfoOuterClass { * 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 exp = FieldName.forField("exp"); static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + static final FieldName rank = FieldName.forField("rank"); + + static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName level = FieldName.forField("level"); static final FieldName pos = FieldName.forField("pos"); - static final FieldName dressedSkinId = FieldName.forField("dressedSkinId", "dressed_skin_id"); + static final FieldName promotion = FieldName.forField("promotion"); static final FieldName equipment = FieldName.forField("equipment"); - static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); - static final FieldName relicList = FieldName.forField("relicList", "relic_list"); + + static final FieldName skilltreeList = FieldName.forField("skilltreeList", "skilltree_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java index 3a0260a..71a72be 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayAvatarOuterClass.java @@ -24,7 +24,7 @@ public final class DisplayAvatarOuterClass { private int pos; /** - * optional uint32 avatar_id = 15; + * optional uint32 avatar_id = 14; */ private int avatarId; @@ -76,7 +76,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 15; + * optional uint32 avatar_id = 14; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -84,7 +84,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 15; + * optional uint32 avatar_id = 14; * @return this */ public DisplayAvatar clearAvatarId() { @@ -94,7 +94,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 15; + * optional uint32 avatar_id = 14; * @return the avatarId */ public int getAvatarId() { @@ -102,7 +102,7 @@ public final class DisplayAvatarOuterClass { } /** - * optional uint32 avatar_id = 15; + * optional uint32 avatar_id = 14; * @param value the avatarId to set * @return this */ @@ -181,7 +181,7 @@ public final class DisplayAvatarOuterClass { output.writeUInt32NoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(avatarId); } } @@ -210,11 +210,11 @@ public final class DisplayAvatarOuterClass { pos = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // 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 7210bb4..9278cbf 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 = 5; + * optional bool is_display = 12; */ private boolean isDisplay; /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 11; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 5; + * optional bool is_display = 12; * @return whether the isDisplay field is set */ public boolean hasIsDisplay() { @@ -48,7 +48,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 5; + * optional bool is_display = 12; * @return this */ public DisplayAvatarVec clearIsDisplay() { @@ -58,7 +58,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 5; + * optional bool is_display = 12; * @return the isDisplay */ public boolean getIsDisplay() { @@ -66,7 +66,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * optional bool is_display = 5; + * optional bool is_display = 12; * @param value the isDisplay to set * @return this */ @@ -77,7 +77,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 11; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 11; * @return this */ public DisplayAvatarVec clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_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. @@ -109,7 +109,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_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 @@ -123,7 +123,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 11; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class DisplayAvatarVecOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 14; + * repeated .DisplayAvatar display_avatar_list = 11; * @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) 40); + output.writeRawByte((byte) 96); output.writeBoolNoTag(isDisplay); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class DisplayAvatarVecOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 96: { // isDisplay isDisplay = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // 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 b9911ed..88f2ba0 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayEquipmentInfoOuterClass.java @@ -19,30 +19,30 @@ public final class DisplayEquipmentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 4; */ private int promotion; /** - * optional uint32 rank = 2; - */ - private int rank; - - /** - * optional uint32 tid = 8; - */ - private int tid; - - /** - * optional uint32 level = 12; + * optional uint32 level = 8; */ private int level; /** - * optional uint32 exp = 13; + * optional uint32 rank = 9; + */ + private int rank; + + /** + * optional uint32 exp = 10; */ private int exp; + /** + * optional uint32 tid = 11; + */ + private int tid; + private DisplayEquipmentInfo() { } @@ -54,7 +54,7 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 4; * @return whether the promotion field is set */ public boolean hasPromotion() { @@ -62,7 +62,7 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 4; * @return this */ public DisplayEquipmentInfo clearPromotion() { @@ -72,7 +72,7 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 4; * @return the promotion */ public int getPromotion() { @@ -80,7 +80,7 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 promotion = 1; + * optional uint32 promotion = 4; * @param value the promotion to set * @return this */ @@ -91,99 +91,25 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 rank = 2; - * @return whether the rank field is set + * optional uint32 level = 8; + * @return whether the level field is set */ - public boolean hasRank() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 rank = 2; - * @return this - */ - public DisplayEquipmentInfo clearRank() { - bitField0_ &= ~0x00000002; - rank = 0; - return this; - } - - /** - * optional uint32 rank = 2; - * @return the rank - */ - public int getRank() { - return rank; - } - - /** - * optional uint32 rank = 2; - * @param value the rank to set - * @return this - */ - public DisplayEquipmentInfo setRank(final int value) { - bitField0_ |= 0x00000002; - rank = value; - return this; - } - - /** - * optional uint32 tid = 8; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 tid = 8; - * @return this - */ - public DisplayEquipmentInfo clearTid() { - bitField0_ &= ~0x00000004; - tid = 0; - return this; - } - - /** - * optional uint32 tid = 8; - * @return the tid - */ - public int getTid() { - return tid; - } - - /** - * optional uint32 tid = 8; - * @param value the tid to set - * @return this - */ - public DisplayEquipmentInfo setTid(final int value) { - bitField0_ |= 0x00000004; - tid = value; - return this; - } - - /** - * optional uint32 level = 12; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @return this */ public DisplayEquipmentInfo clearLevel() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; level = 0; return this; } /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -191,36 +117,73 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 level = 12; + * optional uint32 level = 8; * @param value the level to set * @return this */ public DisplayEquipmentInfo setLevel(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; level = value; return this; } /** - * optional uint32 exp = 13; - * @return whether the exp field is set + * optional uint32 rank = 9; + * @return whether the rank field is set */ - public boolean hasExp() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasRank() { + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 exp = 13; + * optional uint32 rank = 9; + * @return this + */ + public DisplayEquipmentInfo clearRank() { + bitField0_ &= ~0x00000004; + rank = 0; + return this; + } + + /** + * optional uint32 rank = 9; + * @return the rank + */ + public int getRank() { + return rank; + } + + /** + * optional uint32 rank = 9; + * @param value the rank to set + * @return this + */ + public DisplayEquipmentInfo setRank(final int value) { + bitField0_ |= 0x00000004; + rank = value; + return this; + } + + /** + * optional uint32 exp = 10; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 exp = 10; * @return this */ public DisplayEquipmentInfo clearExp() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; exp = 0; return this; } /** - * optional uint32 exp = 13; + * optional uint32 exp = 10; * @return the exp */ public int getExp() { @@ -228,26 +191,63 @@ public final class DisplayEquipmentInfoOuterClass { } /** - * optional uint32 exp = 13; + * optional uint32 exp = 10; * @param value the exp to set * @return this */ public DisplayEquipmentInfo setExp(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; exp = value; return this; } + /** + * optional uint32 tid = 11; + * @return whether the tid field is set + */ + public boolean hasTid() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 tid = 11; + * @return this + */ + public DisplayEquipmentInfo clearTid() { + bitField0_ &= ~0x00000010; + tid = 0; + return this; + } + + /** + * optional uint32 tid = 11; + * @return the tid + */ + public int getTid() { + return tid; + } + + /** + * optional uint32 tid = 11; + * @param value the tid to set + * @return this + */ + public DisplayEquipmentInfo setTid(final int value) { + bitField0_ |= 0x00000010; + tid = value; + return this; + } + @Override public DisplayEquipmentInfo copyFrom(final DisplayEquipmentInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; promotion = other.promotion; - rank = other.rank; - tid = other.tid; level = other.level; + rank = other.rank; exp = other.exp; + tid = other.tid; } return this; } @@ -261,18 +261,18 @@ public final class DisplayEquipmentInfoOuterClass { if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasRank()) { - setRank(other.rank); - } - if (other.hasTid()) { - setTid(other.tid); - } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasRank()) { + setRank(other.rank); + } if (other.hasExp()) { setExp(other.exp); } + if (other.hasTid()) { + setTid(other.tid); + } return this; } @@ -284,10 +284,10 @@ public final class DisplayEquipmentInfoOuterClass { cachedSize = -1; bitField0_ = 0; promotion = 0; - rank = 0; - tid = 0; level = 0; + rank = 0; exp = 0; + tid = 0; return this; } @@ -312,34 +312,34 @@ public final class DisplayEquipmentInfoOuterClass { DisplayEquipmentInfo other = (DisplayEquipmentInfo) o; return bitField0_ == other.bitField0_ && (!hasPromotion() || promotion == other.promotion) - && (!hasRank() || rank == other.rank) - && (!hasTid() || tid == other.tid) && (!hasLevel() || level == other.level) - && (!hasExp() || exp == other.exp); + && (!hasRank() || rank == other.rank) + && (!hasExp() || exp == other.exp) + && (!hasTid() || tid == other.tid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(tid); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); output.writeUInt32NoTag(level); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(rank); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(exp); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(tid); + } } @Override @@ -349,17 +349,17 @@ public final class DisplayEquipmentInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); + } + if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + } return size; } @@ -370,45 +370,45 @@ public final class DisplayEquipmentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // promotion promotion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 64) { break; } } case 64: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // level level = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // exp exp = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -436,17 +436,17 @@ public final class DisplayEquipmentInfoOuterClass { output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.rank, rank); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.level, level); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rank, rank); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.exp, exp); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } output.endObject(); } @@ -468,10 +468,10 @@ public final class DisplayEquipmentInfoOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -479,10 +479,10 @@ public final class DisplayEquipmentInfoOuterClass { } break; } - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -490,21 +490,21 @@ public final class DisplayEquipmentInfoOuterClass { } 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_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 114831: { + if (input.isAtField(FieldNames.tid)) { + if (!input.trySkipNullValue()) { + tid = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -567,13 +567,13 @@ public final class DisplayEquipmentInfoOuterClass { static class FieldNames { static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName rank = FieldName.forField("rank"); - - static final FieldName tid = FieldName.forField("tid"); - static final FieldName level = FieldName.forField("level"); + static final FieldName rank = FieldName.forField("rank"); + static final FieldName exp = FieldName.forField("exp"); + + 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 f14ab04..5e277b2 100644 --- a/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DisplayRelicInfoOuterClass.java @@ -20,19 +20,14 @@ public final class DisplayRelicInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 exp = 1; + * optional uint32 exp = 4; */ private int exp; /** - * optional uint32 slot = 2; + * optional uint32 level = 7; */ - private int slot; - - /** - * optional uint32 main_affix_id = 6; - */ - private int mainAffixId; + private int level; /** * optional uint32 tid = 8; @@ -40,12 +35,17 @@ public final class DisplayRelicInfoOuterClass { private int tid; /** - * optional uint32 level = 15; + * optional uint32 slot = 11; */ - private int level; + private int slot; /** - * repeated .RelicAffix sub_affix_list = 14; + * optional uint32 main_affix_id = 12; + */ + private int mainAffixId; + + /** + * repeated .RelicAffix sub_affix_list = 9; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -60,7 +60,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 1; + * optional uint32 exp = 4; * @return whether the exp field is set */ public boolean hasExp() { @@ -68,7 +68,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 1; + * optional uint32 exp = 4; * @return this */ public DisplayRelicInfo clearExp() { @@ -78,7 +78,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 1; + * optional uint32 exp = 4; * @return the exp */ public int getExp() { @@ -86,7 +86,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 exp = 1; + * optional uint32 exp = 4; * @param value the exp to set * @return this */ @@ -97,76 +97,39 @@ public final class DisplayRelicInfoOuterClass { } /** - * optional uint32 slot = 2; - * @return whether the slot field is set + * optional uint32 level = 7; + * @return whether the level field is set */ - public boolean hasSlot() { + public boolean hasLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 slot = 2; + * optional uint32 level = 7; * @return this */ - public DisplayRelicInfo clearSlot() { + public DisplayRelicInfo clearLevel() { bitField0_ &= ~0x00000002; - slot = 0; + level = 0; return this; } /** - * optional uint32 slot = 2; - * @return the slot + * optional uint32 level = 7; + * @return the level */ - public int getSlot() { - return slot; + public int getLevel() { + return level; } /** - * optional uint32 slot = 2; - * @param value the slot to set + * optional uint32 level = 7; + * @param value the level to set * @return this */ - public DisplayRelicInfo setSlot(final int value) { + public DisplayRelicInfo setLevel(final int value) { bitField0_ |= 0x00000002; - slot = value; - return this; - } - - /** - * optional uint32 main_affix_id = 6; - * @return whether the mainAffixId field is set - */ - public boolean hasMainAffixId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 main_affix_id = 6; - * @return this - */ - public DisplayRelicInfo clearMainAffixId() { - bitField0_ &= ~0x00000004; - mainAffixId = 0; - return this; - } - - /** - * optional uint32 main_affix_id = 6; - * @return the mainAffixId - */ - public int getMainAffixId() { - return mainAffixId; - } - - /** - * optional uint32 main_affix_id = 6; - * @param value the mainAffixId to set - * @return this - */ - public DisplayRelicInfo setMainAffixId(final int value) { - bitField0_ |= 0x00000004; - mainAffixId = value; + level = value; return this; } @@ -175,7 +138,7 @@ public final class DisplayRelicInfoOuterClass { * @return whether the tid field is set */ public boolean hasTid() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -183,7 +146,7 @@ public final class DisplayRelicInfoOuterClass { * @return this */ public DisplayRelicInfo clearTid() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; tid = 0; return this; } @@ -202,50 +165,87 @@ public final class DisplayRelicInfoOuterClass { * @return this */ public DisplayRelicInfo setTid(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tid = value; return this; } /** - * optional uint32 level = 15; - * @return whether the level field is set + * optional uint32 slot = 11; + * @return whether the slot field is set */ - public boolean hasLevel() { + public boolean hasSlot() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 slot = 11; + * @return this + */ + public DisplayRelicInfo clearSlot() { + bitField0_ &= ~0x00000008; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 11; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 11; + * @param value the slot to set + * @return this + */ + public DisplayRelicInfo setSlot(final int value) { + bitField0_ |= 0x00000008; + slot = value; + return this; + } + + /** + * optional uint32 main_affix_id = 12; + * @return whether the mainAffixId field is set + */ + public boolean hasMainAffixId() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 level = 15; + * optional uint32 main_affix_id = 12; * @return this */ - public DisplayRelicInfo clearLevel() { + public DisplayRelicInfo clearMainAffixId() { bitField0_ &= ~0x00000010; - level = 0; + mainAffixId = 0; return this; } /** - * optional uint32 level = 15; - * @return the level + * optional uint32 main_affix_id = 12; + * @return the mainAffixId */ - public int getLevel() { - return level; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 level = 15; - * @param value the level to set + * optional uint32 main_affix_id = 12; + * @param value the mainAffixId to set * @return this */ - public DisplayRelicInfo setLevel(final int value) { + public DisplayRelicInfo setMainAffixId(final int value) { bitField0_ |= 0x00000010; - level = value; + mainAffixId = value; return this; } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 9; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { @@ -253,7 +253,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 9; * @return this */ public DisplayRelicInfo clearSubAffixList() { @@ -263,7 +263,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_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. @@ -277,7 +277,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_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 @@ -291,7 +291,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 9; * @param value the subAffixList to add * @return this */ @@ -302,7 +302,7 @@ public final class DisplayRelicInfoOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 14; + * repeated .RelicAffix sub_affix_list = 9; * @param values the subAffixList to add * @return this */ @@ -318,10 +318,10 @@ public final class DisplayRelicInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; exp = other.exp; + level = other.level; + tid = other.tid; slot = other.slot; mainAffixId = other.mainAffixId; - tid = other.tid; - level = other.level; subAffixList.copyFrom(other.subAffixList); } return this; @@ -336,18 +336,18 @@ public final class DisplayRelicInfoOuterClass { if (other.hasExp()) { setExp(other.exp); } + if (other.hasLevel()) { + setLevel(other.level); + } + if (other.hasTid()) { + setTid(other.tid); + } if (other.hasSlot()) { setSlot(other.slot); } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } - if (other.hasTid()) { - setTid(other.tid); - } - if (other.hasLevel()) { - setLevel(other.level); - } if (other.hasSubAffixList()) { getMutableSubAffixList().addAll(other.subAffixList); } @@ -362,10 +362,10 @@ public final class DisplayRelicInfoOuterClass { cachedSize = -1; bitField0_ = 0; exp = 0; + level = 0; + tid = 0; slot = 0; mainAffixId = 0; - tid = 0; - level = 0; subAffixList.clear(); return this; } @@ -392,38 +392,38 @@ 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) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasTid() || tid == other.tid) - && (!hasLevel() || level == other.level) && (!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) 32); output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(mainAffixId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(tid); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(slot); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 74); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -436,16 +436,16 @@ public final class DisplayRelicInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { size += (1 * subAffixList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subAffixList); @@ -460,29 +460,20 @@ public final class DisplayRelicInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // exp exp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 56) { break; } } - case 16: { - // slot - slot = input.readUInt32(); + case 56: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // mainAffixId - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 64) { break; } @@ -490,22 +481,31 @@ 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; tag = input.readTag(); - if (tag != 120) { + if (tag != 96) { break; } } - case 120: { - // level - level = input.readUInt32(); + case 96: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 114) { + if (tag != 74) { break; } } - case 114: { + case 74: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); bitField0_ |= 0x00000020; @@ -534,16 +534,16 @@ public final class DisplayRelicInfoOuterClass { output.writeUInt32(FieldNames.exp, exp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.tid, tid); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.slot, slot); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); @@ -569,11 +569,33 @@ 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_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 3533310: { if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { slot = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -585,28 +607,6 @@ public final class DisplayRelicInfoOuterClass { if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 114831: { - if (input.isAtField(FieldNames.tid)) { - if (!input.trySkipNullValue()) { - tid = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -681,13 +681,13 @@ public final class DisplayRelicInfoOuterClass { static class FieldNames { static final FieldName exp = FieldName.forField("exp"); - static final FieldName slot = FieldName.forField("slot"); - - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName level = FieldName.forField("level"); static final FieldName tid = FieldName.forField("tid"); - static final FieldName level = FieldName.forField("level"); + static final FieldName slot = FieldName.forField("slot"); + + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName subAffixList = FieldName.forField("subAffixList", "sub_affix_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaCsReqOuterClass.java index e31c657..377bc7a 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_random = 4; - */ - private int gachaRandom; - - /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 7; */ private int gachaId; /** - * optional uint32 simulate_magic = 9; + * optional uint32 gacha_random = 9; */ - private int simulateMagic; + private int gachaRandom; /** * optional uint32 gacha_num = 10; */ private int gachaNum; + /** + * optional uint32 simulate_magic = 13; + */ + private int simulateMagic; + private DoGachaCsReq() { } @@ -49,62 +49,25 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_random = 4; - * @return whether the gachaRandom field is set + * optional uint32 gacha_id = 7; + * @return whether the gachaId field is set */ - public boolean hasGachaRandom() { + public boolean hasGachaId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_random = 4; - * @return this - */ - public DoGachaCsReq clearGachaRandom() { - bitField0_ &= ~0x00000001; - gachaRandom = 0; - return this; - } - - /** - * optional uint32 gacha_random = 4; - * @return the gachaRandom - */ - public int getGachaRandom() { - return gachaRandom; - } - - /** - * optional uint32 gacha_random = 4; - * @param value the gachaRandom to set - * @return this - */ - public DoGachaCsReq setGachaRandom(final int value) { - bitField0_ |= 0x00000001; - gachaRandom = value; - return this; - } - - /** - * optional uint32 gacha_id = 5; - * @return whether the gachaId field is set - */ - public boolean hasGachaId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 7; * @return this */ public DoGachaCsReq clearGachaId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; gachaId = 0; return this; } /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 7; * @return the gachaId */ public int getGachaId() { @@ -112,50 +75,50 @@ public final class DoGachaCsReqOuterClass { } /** - * optional uint32 gacha_id = 5; + * optional uint32 gacha_id = 7; * @param value the gachaId to set * @return this */ public DoGachaCsReq setGachaId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; gachaId = value; return this; } /** - * optional uint32 simulate_magic = 9; - * @return whether the simulateMagic field is set + * optional uint32 gacha_random = 9; + * @return whether the gachaRandom field is set */ - public boolean hasSimulateMagic() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasGachaRandom() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 simulate_magic = 9; + * optional uint32 gacha_random = 9; * @return this */ - public DoGachaCsReq clearSimulateMagic() { - bitField0_ &= ~0x00000004; - simulateMagic = 0; + public DoGachaCsReq clearGachaRandom() { + bitField0_ &= ~0x00000002; + gachaRandom = 0; return this; } /** - * optional uint32 simulate_magic = 9; - * @return the simulateMagic + * optional uint32 gacha_random = 9; + * @return the gachaRandom */ - public int getSimulateMagic() { - return simulateMagic; + public int getGachaRandom() { + return gachaRandom; } /** - * optional uint32 simulate_magic = 9; - * @param value the simulateMagic to set + * optional uint32 gacha_random = 9; + * @param value the gachaRandom to set * @return this */ - public DoGachaCsReq setSimulateMagic(final int value) { - bitField0_ |= 0x00000004; - simulateMagic = value; + public DoGachaCsReq setGachaRandom(final int value) { + bitField0_ |= 0x00000002; + gachaRandom = value; return this; } @@ -164,7 +127,7 @@ public final class DoGachaCsReqOuterClass { * @return whether the gachaNum field is set */ public boolean hasGachaNum() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -172,7 +135,7 @@ public final class DoGachaCsReqOuterClass { * @return this */ public DoGachaCsReq clearGachaNum() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; gachaNum = 0; return this; } @@ -191,20 +154,57 @@ public final class DoGachaCsReqOuterClass { * @return this */ public DoGachaCsReq setGachaNum(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; gachaNum = value; return this; } + /** + * optional uint32 simulate_magic = 13; + * @return whether the simulateMagic field is set + */ + public boolean hasSimulateMagic() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 simulate_magic = 13; + * @return this + */ + public DoGachaCsReq clearSimulateMagic() { + bitField0_ &= ~0x00000008; + simulateMagic = 0; + return this; + } + + /** + * optional uint32 simulate_magic = 13; + * @return the simulateMagic + */ + public int getSimulateMagic() { + return simulateMagic; + } + + /** + * optional uint32 simulate_magic = 13; + * @param value the simulateMagic to set + * @return this + */ + public DoGachaCsReq setSimulateMagic(final int value) { + bitField0_ |= 0x00000008; + simulateMagic = value; + return this; + } + @Override public DoGachaCsReq copyFrom(final DoGachaCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaRandom = other.gachaRandom; gachaId = other.gachaId; - simulateMagic = other.simulateMagic; + gachaRandom = other.gachaRandom; gachaNum = other.gachaNum; + simulateMagic = other.simulateMagic; } return this; } @@ -215,18 +215,18 @@ public final class DoGachaCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGachaRandom()) { - setGachaRandom(other.gachaRandom); - } if (other.hasGachaId()) { setGachaId(other.gachaId); } - if (other.hasSimulateMagic()) { - setSimulateMagic(other.simulateMagic); + if (other.hasGachaRandom()) { + setGachaRandom(other.gachaRandom); } if (other.hasGachaNum()) { setGachaNum(other.gachaNum); } + if (other.hasSimulateMagic()) { + setSimulateMagic(other.simulateMagic); + } return this; } @@ -237,10 +237,10 @@ public final class DoGachaCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - gachaRandom = 0; gachaId = 0; - simulateMagic = 0; + gachaRandom = 0; gachaNum = 0; + simulateMagic = 0; return this; } @@ -264,46 +264,46 @@ public final class DoGachaCsReqOuterClass { } DoGachaCsReq other = (DoGachaCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGachaRandom() || gachaRandom == other.gachaRandom) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasSimulateMagic() || simulateMagic == other.simulateMagic) - && (!hasGachaNum() || gachaNum == other.gachaNum); + && (!hasGachaRandom() || gachaRandom == other.gachaRandom) + && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasSimulateMagic() || simulateMagic == other.simulateMagic); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 72); - output.writeUInt32NoTag(simulateMagic); + output.writeUInt32NoTag(gachaRandom); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(gachaNum); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(simulateMagic); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaRandom); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(simulateMagic); } return size; } @@ -315,28 +315,19 @@ public final class DoGachaCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // gachaRandom - gachaRandom = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { + case 56: { // gachaId gachaId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // simulateMagic - simulateMagic = input.readUInt32(); - bitField0_ |= 0x00000004; + // gachaRandom + gachaRandom = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 80) { break; @@ -345,6 +336,15 @@ public final class DoGachaCsReqOuterClass { case 80: { // gachaNum gachaNum = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // simulateMagic + simulateMagic = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -369,16 +369,16 @@ public final class DoGachaCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaRandom, gachaRandom); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.gachaId, gachaId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.gachaRandom, gachaRandom); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.simulateMagic, simulateMagic); + output.writeUInt32(FieldNames.gachaNum, gachaNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.simulateMagic, simulateMagic); } output.endObject(); } @@ -390,11 +390,11 @@ public final class DoGachaCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1635961627: - case -47579616: { - if (input.isAtField(FieldNames.gachaRandom)) { + case -204751299: + case -2052301576: { + if (input.isAtField(FieldNames.gachaId)) { if (!input.trySkipNullValue()) { - gachaRandom = input.readUInt32(); + gachaId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,11 +402,11 @@ public final class DoGachaCsReqOuterClass { } break; } - case -204751299: - case -2052301576: { - if (input.isAtField(FieldNames.gachaId)) { + case -1635961627: + case -47579616: { + if (input.isAtField(FieldNames.gachaRandom)) { if (!input.trySkipNullValue()) { - gachaId = input.readUInt32(); + gachaRandom = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -414,23 +414,23 @@ public final class DoGachaCsReqOuterClass { } break; } - case -370053655: - case 1939465170: { - if (input.isAtField(FieldNames.simulateMagic)) { - if (!input.trySkipNullValue()) { - simulateMagic = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -2052317532: case 803166025: { if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { gachaNum = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case -370053655: + case 1939465170: { + if (input.isAtField(FieldNames.simulateMagic)) { + if (!input.trySkipNullValue()) { + simulateMagic = 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 gachaRandom = FieldName.forField("gachaRandom", "gacha_random"); - static final FieldName gachaId = FieldName.forField("gachaId", "gacha_id"); - static final FieldName simulateMagic = FieldName.forField("simulateMagic", "simulate_magic"); + 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java index c88d6a3..6b59cdd 100644 --- a/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DoGachaScRspOuterClass.java @@ -20,27 +20,27 @@ public final class DoGachaScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 gacha_num = 4; - */ - private int gachaNum; - - /** - * optional uint32 retcode = 11; - */ - private int retcode; - - /** - * optional uint32 gacha_id = 12; - */ - private int gachaId; - - /** - * optional uint32 ceiling_num = 15; + * optional uint32 ceiling_num = 4; */ private int ceilingNum; /** - * repeated .GachaItem gacha_item_list = 9; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * optional uint32 gacha_id = 10; + */ + private int gachaId; + + /** + * optional uint32 gacha_num = 12; + */ + private int gachaNum; + + /** + * repeated .GachaItem gacha_item_list = 1; */ private final RepeatedMessage gachaItemList = RepeatedMessage.newEmptyInstance(GachaItemOuterClass.GachaItem.getFactory()); @@ -55,44 +55,44 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_num = 4; - * @return whether the gachaNum field is set + * optional uint32 ceiling_num = 4; + * @return whether the ceilingNum field is set */ - public boolean hasGachaNum() { + public boolean hasCeilingNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 gacha_num = 4; + * optional uint32 ceiling_num = 4; * @return this */ - public DoGachaScRsp clearGachaNum() { + public DoGachaScRsp clearCeilingNum() { bitField0_ &= ~0x00000001; - gachaNum = 0; + ceilingNum = 0; return this; } /** - * optional uint32 gacha_num = 4; - * @return the gachaNum + * optional uint32 ceiling_num = 4; + * @return the ceilingNum */ - public int getGachaNum() { - return gachaNum; + public int getCeilingNum() { + return ceilingNum; } /** - * optional uint32 gacha_num = 4; - * @param value the gachaNum to set + * optional uint32 ceiling_num = 4; + * @param value the ceilingNum to set * @return this */ - public DoGachaScRsp setGachaNum(final int value) { + public DoGachaScRsp setCeilingNum(final int value) { bitField0_ |= 0x00000001; - gachaNum = value; + ceilingNum = value; return this; } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -100,7 +100,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return this */ public DoGachaScRsp clearRetcode() { @@ -110,7 +110,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -118,7 +118,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -129,7 +129,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 10; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -137,7 +137,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 10; * @return this */ public DoGachaScRsp clearGachaId() { @@ -147,7 +147,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 10; * @return the gachaId */ public int getGachaId() { @@ -155,7 +155,7 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 gacha_id = 12; + * optional uint32 gacha_id = 10; * @param value the gachaId to set * @return this */ @@ -166,44 +166,44 @@ public final class DoGachaScRspOuterClass { } /** - * optional uint32 ceiling_num = 15; - * @return whether the ceilingNum field is set + * optional uint32 gacha_num = 12; + * @return whether the gachaNum field is set */ - public boolean hasCeilingNum() { + public boolean hasGachaNum() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 ceiling_num = 15; + * optional uint32 gacha_num = 12; * @return this */ - public DoGachaScRsp clearCeilingNum() { + public DoGachaScRsp clearGachaNum() { bitField0_ &= ~0x00000008; - ceilingNum = 0; + gachaNum = 0; return this; } /** - * optional uint32 ceiling_num = 15; - * @return the ceilingNum + * optional uint32 gacha_num = 12; + * @return the gachaNum */ - public int getCeilingNum() { - return ceilingNum; + public int getGachaNum() { + return gachaNum; } /** - * optional uint32 ceiling_num = 15; - * @param value the ceilingNum to set + * optional uint32 gacha_num = 12; + * @param value the gachaNum to set * @return this */ - public DoGachaScRsp setCeilingNum(final int value) { + public DoGachaScRsp setGachaNum(final int value) { bitField0_ |= 0x00000008; - ceilingNum = value; + gachaNum = value; return this; } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_list = 1; * @return whether the gachaItemList field is set */ public boolean hasGachaItemList() { @@ -211,7 +211,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_list = 1; * @return this */ public DoGachaScRsp clearGachaItemList() { @@ -221,7 +221,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_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. @@ -235,7 +235,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_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 @@ -249,7 +249,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_list = 1; * @param value the gachaItemList to add * @return this */ @@ -260,7 +260,7 @@ public final class DoGachaScRspOuterClass { } /** - * repeated .GachaItem gacha_item_list = 9; + * repeated .GachaItem gacha_item_list = 1; * @param values the gachaItemList to add * @return this */ @@ -275,10 +275,10 @@ public final class DoGachaScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - gachaNum = other.gachaNum; + ceilingNum = other.ceilingNum; retcode = other.retcode; gachaId = other.gachaId; - ceilingNum = other.ceilingNum; + gachaNum = other.gachaNum; gachaItemList.copyFrom(other.gachaItemList); } return this; @@ -290,8 +290,8 @@ public final class DoGachaScRspOuterClass { return this; } cachedSize = -1; - if (other.hasGachaNum()) { - setGachaNum(other.gachaNum); + if (other.hasCeilingNum()) { + setCeilingNum(other.ceilingNum); } if (other.hasRetcode()) { setRetcode(other.retcode); @@ -299,8 +299,8 @@ public final class DoGachaScRspOuterClass { if (other.hasGachaId()) { setGachaId(other.gachaId); } - if (other.hasCeilingNum()) { - setCeilingNum(other.ceilingNum); + if (other.hasGachaNum()) { + setGachaNum(other.gachaNum); } if (other.hasGachaItemList()) { getMutableGachaItemList().addAll(other.gachaItemList); @@ -315,10 +315,10 @@ public final class DoGachaScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - gachaNum = 0; + ceilingNum = 0; retcode = 0; gachaId = 0; - ceilingNum = 0; + gachaNum = 0; gachaItemList.clear(); return this; } @@ -344,10 +344,10 @@ public final class DoGachaScRspOuterClass { } DoGachaScRsp other = (DoGachaScRsp) o; return bitField0_ == other.bitField0_ - && (!hasGachaNum() || gachaNum == other.gachaNum) + && (!hasCeilingNum() || ceilingNum == other.ceilingNum) && (!hasRetcode() || retcode == other.retcode) && (!hasGachaId() || gachaId == other.gachaId) - && (!hasCeilingNum() || ceilingNum == other.ceilingNum) + && (!hasGachaNum() || gachaNum == other.gachaNum) && (!hasGachaItemList() || gachaItemList.equals(other.gachaItemList)); } @@ -355,23 +355,23 @@ public final class DoGachaScRspOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(gachaNum); + output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(ceilingNum); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(gachaNum); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < gachaItemList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 10); output.writeMessageNoTag(gachaItemList.get(i)); } } @@ -381,7 +381,7 @@ public final class DoGachaScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); @@ -390,7 +390,7 @@ public final class DoGachaScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(ceilingNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaNum); } if ((bitField0_ & 0x00000010) != 0) { size += (1 * gachaItemList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(gachaItemList); @@ -406,42 +406,42 @@ public final class DoGachaScRspOuterClass { while (true) { switch (tag) { case 32: { - // gachaNum - gachaNum = input.readUInt32(); + // ceilingNum + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // gachaId + gachaId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // gachaId - gachaId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // ceilingNum - ceilingNum = input.readUInt32(); + // gachaNum + gachaNum = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 74) { + if (tag != 10) { break; } } - case 74: { + case 10: { // gachaItemList tag = input.readRepeatedMessage(gachaItemList, tag); bitField0_ |= 0x00000010; @@ -467,7 +467,7 @@ public final class DoGachaScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gachaNum, gachaNum); + output.writeUInt32(FieldNames.ceilingNum, ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -476,7 +476,7 @@ public final class DoGachaScRspOuterClass { output.writeUInt32(FieldNames.gachaId, gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.ceilingNum, ceilingNum); + output.writeUInt32(FieldNames.gachaNum, gachaNum); } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.gachaItemList, gachaItemList); @@ -491,11 +491,11 @@ public final class DoGachaScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -2052317532: - case 803166025: { - if (input.isAtField(FieldNames.gachaNum)) { + case -1655838327: + case 209119492: { + if (input.isAtField(FieldNames.ceilingNum)) { if (!input.trySkipNullValue()) { - gachaNum = input.readUInt32(); + ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -526,11 +526,11 @@ public final class DoGachaScRspOuterClass { } break; } - case -1655838327: - case 209119492: { - if (input.isAtField(FieldNames.ceilingNum)) { + case -2052317532: + case 803166025: { + if (input.isAtField(FieldNames.gachaNum)) { if (!input.trySkipNullValue()) { - ceilingNum = input.readUInt32(); + gachaNum = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -602,13 +602,13 @@ public final class DoGachaScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gachaNum = FieldName.forField("gachaNum", "gacha_num"); + static final FieldName ceilingNum = FieldName.forField("ceilingNum", "ceiling_num"); 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 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 abe3849..da3af14 100644 --- a/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressAvatarCsReqOuterClass.java @@ -19,20 +19,19 @@ public final class DressAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 equipment_unique_id = 3; - */ - private int equipmentUniqueId; - - /** - * optional uint32 base_avatar_id = 4; - */ - private int baseAvatarId; - - /** - * optional uint32 equip_avatar_id = 10; + * optional uint32 equip_avatar_id = 2; */ private int equipAvatarId; + /** + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * optional uint32 equipment_unique_id = 14; + */ + private int equipmentUniqueId; + private DressAvatarCsReq() { } @@ -44,99 +43,25 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 3; - * @return whether the equipmentUniqueId field is set + * optional uint32 equip_avatar_id = 2; + * @return whether the equipAvatarId field is set */ - public boolean hasEquipmentUniqueId() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 equipment_unique_id = 3; - * @return this - */ - public DressAvatarCsReq clearEquipmentUniqueId() { - bitField0_ &= ~0x00000001; - equipmentUniqueId = 0; - return this; - } - - /** - * optional uint32 equipment_unique_id = 3; - * @return the equipmentUniqueId - */ - public int getEquipmentUniqueId() { - return equipmentUniqueId; - } - - /** - * optional uint32 equipment_unique_id = 3; - * @param value the equipmentUniqueId to set - * @return this - */ - public DressAvatarCsReq setEquipmentUniqueId(final int value) { - bitField0_ |= 0x00000001; - equipmentUniqueId = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 4; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 4; - * @return this - */ - public DressAvatarCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 4; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 4; - * @param value the baseAvatarId to set - * @return this - */ - public DressAvatarCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 10; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 equip_avatar_id = 10; + * optional uint32 equip_avatar_id = 2; * @return this */ public DressAvatarCsReq clearEquipAvatarId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 10; + * optional uint32 equip_avatar_id = 2; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -144,24 +69,76 @@ public final class DressAvatarCsReqOuterClass { } /** - * optional uint32 equip_avatar_id = 10; + * optional uint32 equip_avatar_id = 2; * @param value the equipAvatarId to set * @return this */ public DressAvatarCsReq setEquipAvatarId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; equipAvatarId = value; return this; } + /** + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * optional uint32 equipment_unique_id = 14; + * @return whether the equipmentUniqueId field is set + */ + public boolean hasEquipmentUniqueId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * optional uint32 equipment_unique_id = 14; + * @return this + */ + public DressAvatarCsReq clearEquipmentUniqueId() { + bitField0_ &= ~0x00000002; + equipmentUniqueId = 0; + return this; + } + + /** + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * optional uint32 equipment_unique_id = 14; + * @return the equipmentUniqueId + */ + public int getEquipmentUniqueId() { + return equipmentUniqueId; + } + + /** + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * optional uint32 equipment_unique_id = 14; + * @param value the equipmentUniqueId to set + * @return this + */ + public DressAvatarCsReq setEquipmentUniqueId(final int value) { + bitField0_ |= 0x00000002; + equipmentUniqueId = value; + return this; + } + @Override public DressAvatarCsReq copyFrom(final DressAvatarCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - equipmentUniqueId = other.equipmentUniqueId; - baseAvatarId = other.baseAvatarId; equipAvatarId = other.equipAvatarId; + equipmentUniqueId = other.equipmentUniqueId; } return this; } @@ -172,15 +149,12 @@ public final class DressAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEquipmentUniqueId()) { - setEquipmentUniqueId(other.equipmentUniqueId); - } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasEquipAvatarId()) { setEquipAvatarId(other.equipAvatarId); } + if (other.hasEquipmentUniqueId()) { + setEquipmentUniqueId(other.equipmentUniqueId); + } return this; } @@ -191,9 +165,8 @@ public final class DressAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - equipmentUniqueId = 0; - baseAvatarId = 0; equipAvatarId = 0; + equipmentUniqueId = 0; return this; } @@ -217,24 +190,19 @@ public final class DressAvatarCsReqOuterClass { } DressAvatarCsReq other = (DressAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId); + && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) + && (!hasEquipmentUniqueId() || equipmentUniqueId == other.equipmentUniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(equipmentUniqueId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(equipAvatarId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(equipmentUniqueId); } } @@ -242,13 +210,10 @@ public final class DressAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipmentUniqueId); } return size; } @@ -260,28 +225,19 @@ public final class DressAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // equipmentUniqueId - equipmentUniqueId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 16: { // equipAvatarId equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // equipmentUniqueId + equipmentUniqueId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -305,13 +261,10 @@ public final class DressAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); + output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + output.writeUInt32(FieldNames.equipmentUniqueId, equipmentUniqueId); } output.endObject(); } @@ -323,11 +276,11 @@ public final class DressAvatarCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1867136902: - case 760467160: { - if (input.isAtField(FieldNames.equipmentUniqueId)) { + case 169047204: + case 33057906: { + if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { - equipmentUniqueId = input.readUInt32(); + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +288,11 @@ public final class DressAvatarCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -1867136902: + case 760467160: { + if (input.isAtField(FieldNames.equipmentUniqueId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,18 +300,6 @@ public final class DressAvatarCsReqOuterClass { } break; } - case 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { - if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -412,11 +353,9 @@ public final class DressAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName equipmentUniqueId = FieldName.forField("equipmentUniqueId", "equipment_unique_id"); - - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_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 7ee8c62..a4b7a5a 100644 --- a/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/DressRelicAvatarCsReqOuterClass.java @@ -20,17 +20,16 @@ public final class DressRelicAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 6; - */ - private int baseAvatarId; - - /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 2; */ private int equipAvatarId; /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_list = 1; */ private final RepeatedMessage paramList = RepeatedMessage.newEmptyInstance(RelicParamOuterClass.RelicParam.getFactory()); @@ -45,62 +44,25 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 6; - * @return whether the baseAvatarId field is set + * optional uint32 equip_avatar_id = 2; + * @return whether the equipAvatarId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 6; - * @return this - */ - public DressRelicAvatarCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000001; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 6; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 6; - * @param value the baseAvatarId to set - * @return this - */ - public DressRelicAvatarCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000001; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 13; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 2; * @return this */ public DressRelicAvatarCsReq clearEquipAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 2; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -108,36 +70,48 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * optional uint32 equip_avatar_id = 13; + * optional uint32 equip_avatar_id = 2; * @param value the equipAvatarId to set * @return this */ public DressRelicAvatarCsReq setEquipAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; equipAvatarId = value; return this; } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_list = 1; * @return whether the paramList field is set */ public boolean hasParamList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_list = 1; * @return this */ public DressRelicAvatarCsReq clearParamList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; paramList.clear(); return this; } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_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. @@ -151,7 +125,11 @@ public final class DressRelicAvatarCsReqOuterClass { } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_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 @@ -160,28 +138,36 @@ public final class DressRelicAvatarCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableParamList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return paramList; } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_list = 1; * @param value the paramList to add * @return this */ public DressRelicAvatarCsReq addParamList(final RelicParamOuterClass.RelicParam value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; paramList.add(value); return this; } /** - * repeated .RelicParam param_list = 12; + * 
+     *  uint32 base_avatar_id = 15;
+     *
+ * + * repeated .RelicParam param_list = 1; * @param values the paramList to add * @return this */ public DressRelicAvatarCsReq addAllParamList(final RelicParamOuterClass.RelicParam... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; paramList.addAll(values); return this; } @@ -191,7 +177,6 @@ public final class DressRelicAvatarCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; equipAvatarId = other.equipAvatarId; paramList.copyFrom(other.paramList); } @@ -204,9 +189,6 @@ public final class DressRelicAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasEquipAvatarId()) { setEquipAvatarId(other.equipAvatarId); } @@ -223,7 +205,6 @@ public final class DressRelicAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; equipAvatarId = 0; paramList.clear(); return this; @@ -250,7 +231,6 @@ public final class DressRelicAvatarCsReqOuterClass { } DressRelicAvatarCsReq other = (DressRelicAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasParamList() || paramList.equals(other.paramList)); } @@ -258,16 +238,12 @@ public final class DressRelicAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(equipAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < paramList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 10); output.writeMessageNoTag(paramList.get(i)); } } @@ -277,12 +253,9 @@ public final class DressRelicAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * paramList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(paramList); } return size; @@ -295,28 +268,19 @@ public final class DressRelicAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 16: { // equipAvatarId equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { + case 10: { // paramList tag = input.readRepeatedMessage(paramList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; if (tag != 0) { break; } @@ -339,12 +303,9 @@ public final class DressRelicAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedMessage(FieldNames.paramList, paramList); } output.endObject(); @@ -357,24 +318,12 @@ public final class DressRelicAvatarCsReqOuterClass { } 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 169047204: case 33057906: { if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -386,7 +335,7 @@ public final class DressRelicAvatarCsReqOuterClass { if (input.isAtField(FieldNames.paramList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(paramList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -446,8 +395,6 @@ public final class DressRelicAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_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 48c7885..b6736c0 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 = 1; + * optional uint32 talent_id = 9; */ private int talentId; @@ -34,7 +34,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 9; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -42,7 +42,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 9; * @return this */ public EnableRogueTalentCsReq clearTalentId() { @@ -52,7 +52,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 9; * @return the talentId */ public int getTalentId() { @@ -60,7 +60,7 @@ public final class EnableRogueTalentCsReqOuterClass { } /** - * optional uint32 talent_id = 1; + * optional uint32 talent_id = 9; * @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) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(talentId); } } @@ -150,7 +150,7 @@ public final class EnableRogueTalentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // 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 b45079b..bccc344 100644 --- a/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnableRogueTalentScRspOuterClass.java @@ -24,7 +24,7 @@ public final class EnableRogueTalentScRspOuterClass { private int retcode; /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 13; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -76,7 +76,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 13; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 13; * @return this */ public EnableRogueTalentScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_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 EnableRogueTalentScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 1; + * optional .RogueTalentInfo talent_info = 13; * @param value the talentInfo to set * @return this */ @@ -203,7 +203,7 @@ public final class EnableRogueTalentScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 106); output.writeMessageNoTag(talentInfo); } } @@ -232,11 +232,11 @@ public final class EnableRogueTalentScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 106) { break; } } - case 10: { + case 106: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionCsReqOuterClass.java index a1a136f..228f3d3 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 = 7; + * optional .MotionInfo motion = 5; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -34,7 +34,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 7; + * optional .MotionInfo motion = 5; * @return whether the motion field is set */ public boolean hasMotion() { @@ -42,7 +42,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 7; + * optional .MotionInfo motion = 5; * @return this */ public EnterMapRotationRegionCsReq clearMotion() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 7; + * optional .MotionInfo 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. @@ -66,7 +66,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 7; + * optional .MotionInfo 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 @@ -80,7 +80,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { } /** - * optional .MotionInfo motion = 7; + * optional .MotionInfo motion = 5; * @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) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(motion); } } @@ -171,7 +171,7 @@ public final class EnterMapRotationRegionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 42: { // 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 5c7a629..0252ca0 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterMapRotationRegionScRspOuterClass.java @@ -19,7 +19,7 @@ public final class EnterMapRotationRegionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 11; */ private int retcode; @@ -29,7 +29,7 @@ public final class EnterMapRotationRegionScRspOuterClass { private int clientPosVersion; /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 9; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 11; * @return this */ public EnterMapRotationRegionScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 9; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 9; * @return this */ public EnterMapRotationRegionScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo 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 EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo 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 EnterMapRotationRegionScRspOuterClass { } /** - * optional .MotionInfo motion = 4; + * optional .MotionInfo motion = 9; * @param value the motion to set * @return this */ @@ -246,7 +246,7 @@ public final class EnterMapRotationRegionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -254,7 +254,7 @@ public final class EnterMapRotationRegionScRspOuterClass { output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 74); output.writeMessageNoTag(motion); } } @@ -281,7 +281,7 @@ public final class EnterMapRotationRegionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -295,11 +295,11 @@ public final class EnterMapRotationRegionScRspOuterClass { clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 74) { break; } } - case 34: { + case 74: { // 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 e13190d..2e6a3f4 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class EnterRogueMapRoomCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 site_id = 7; - */ - private int siteId; - - /** - * optional uint32 room_id = 10; + * optional uint32 room_id = 11; */ private int roomId; + /** + * optional uint32 site_id = 14; + */ + private int siteId; + private EnterRogueMapRoomCsReq() { } @@ -39,62 +39,25 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 site_id = 7; - * @return whether the siteId field is set + * optional uint32 room_id = 11; + * @return whether the roomId field is set */ - public boolean hasSiteId() { + public boolean hasRoomId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 site_id = 7; - * @return this - */ - public EnterRogueMapRoomCsReq clearSiteId() { - bitField0_ &= ~0x00000001; - siteId = 0; - return this; - } - - /** - * optional uint32 site_id = 7; - * @return the siteId - */ - public int getSiteId() { - return siteId; - } - - /** - * optional uint32 site_id = 7; - * @param value the siteId to set - * @return this - */ - public EnterRogueMapRoomCsReq setSiteId(final int value) { - bitField0_ |= 0x00000001; - siteId = value; - return this; - } - - /** - * optional uint32 room_id = 10; - * @return whether the roomId field is set - */ - public boolean hasRoomId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 room_id = 10; + * optional uint32 room_id = 11; * @return this */ public EnterRogueMapRoomCsReq clearRoomId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; roomId = 0; return this; } /** - * optional uint32 room_id = 10; + * optional uint32 room_id = 11; * @return the roomId */ public int getRoomId() { @@ -102,23 +65,60 @@ public final class EnterRogueMapRoomCsReqOuterClass { } /** - * optional uint32 room_id = 10; + * optional uint32 room_id = 11; * @param value the roomId to set * @return this */ public EnterRogueMapRoomCsReq setRoomId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; roomId = value; return this; } + /** + * optional uint32 site_id = 14; + * @return whether the siteId field is set + */ + public boolean hasSiteId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 site_id = 14; + * @return this + */ + public EnterRogueMapRoomCsReq clearSiteId() { + bitField0_ &= ~0x00000002; + siteId = 0; + return this; + } + + /** + * optional uint32 site_id = 14; + * @return the siteId + */ + public int getSiteId() { + return siteId; + } + + /** + * optional uint32 site_id = 14; + * @param value the siteId to set + * @return this + */ + public EnterRogueMapRoomCsReq setSiteId(final int value) { + bitField0_ |= 0x00000002; + siteId = value; + return this; + } + @Override public EnterRogueMapRoomCsReq copyFrom(final EnterRogueMapRoomCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - siteId = other.siteId; roomId = other.roomId; + siteId = other.siteId; } return this; } @@ -129,12 +129,12 @@ public final class EnterRogueMapRoomCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSiteId()) { - setSiteId(other.siteId); - } if (other.hasRoomId()) { setRoomId(other.roomId); } + if (other.hasSiteId()) { + setSiteId(other.siteId); + } return this; } @@ -145,8 +145,8 @@ public final class EnterRogueMapRoomCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - siteId = 0; roomId = 0; + siteId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnterRogueMapRoomCsReqOuterClass { } EnterRogueMapRoomCsReq other = (EnterRogueMapRoomCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSiteId() || siteId == other.siteId) - && (!hasRoomId() || roomId == other.roomId); + && (!hasRoomId() || roomId == other.roomId) + && (!hasSiteId() || siteId == other.siteId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(siteId); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(roomId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(siteId); } } @@ -190,10 +190,10 @@ public final class EnterRogueMapRoomCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); } return size; } @@ -205,18 +205,18 @@ public final class EnterRogueMapRoomCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // siteId - siteId = input.readUInt32(); + case 88: { + // roomId + roomId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 112) { break; } } - case 80: { - // roomId - roomId = input.readUInt32(); + case 112: { + // siteId + siteId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class EnterRogueMapRoomCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.siteId, siteId); + output.writeUInt32(FieldNames.roomId, roomId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.roomId, roomId); + output.writeUInt32(FieldNames.siteId, siteId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnterRogueMapRoomCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -902090046: - case 2100001043: { - if (input.isAtField(FieldNames.siteId)) { + case -925319338: + case 1379892991: { + if (input.isAtField(FieldNames.roomId)) { if (!input.trySkipNullValue()) { - siteId = input.readUInt32(); + roomId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnterRogueMapRoomCsReqOuterClass { } break; } - case -925319338: - case 1379892991: { - if (input.isAtField(FieldNames.roomId)) { + case -902090046: + case 2100001043: { + if (input.isAtField(FieldNames.siteId)) { if (!input.trySkipNullValue()) { - roomId = input.readUInt32(); + siteId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnterRogueMapRoomCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName siteId = FieldName.forField("siteId", "site_id"); - static final FieldName roomId = FieldName.forField("roomId", "room_id"); + + static final FieldName siteId = FieldName.forField("siteId", "site_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java index 87da8fb..7f1e879 100644 --- a/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnterRogueMapRoomScRspOuterClass.java @@ -18,26 +18,26 @@ public final class EnterRogueMapRoomScRspOuterClass { public static final class EnterRogueMapRoomScRsp extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 cur_site_id = 3; + */ + private int curSiteId; + /** * optional uint32 retcode = 10; */ private int retcode; /** - * optional uint32 cur_site_id = 15; - */ - private int curSiteId; - - /** - * optional .SceneInfo scene = 5; - */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - - /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 5; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + /** + * optional .SceneInfo scene = 7; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + private EnterRogueMapRoomScRsp() { } @@ -48,12 +48,49 @@ public final class EnterRogueMapRoomScRspOuterClass { return new EnterRogueMapRoomScRsp(); } + /** + * optional uint32 cur_site_id = 3; + * @return whether the curSiteId field is set + */ + public boolean hasCurSiteId() { + 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_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -61,7 +98,7 @@ public final class EnterRogueMapRoomScRspOuterClass { * @return this */ public EnterRogueMapRoomScRsp clearRetcode() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; retcode = 0; return this; } @@ -80,125 +117,31 @@ public final class EnterRogueMapRoomScRspOuterClass { * @return this */ public EnterRogueMapRoomScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional uint32 cur_site_id = 15; - * @return whether the curSiteId field is set + * optional .LineupInfo lineup = 5; + * @return whether the lineup field is set */ - public boolean hasCurSiteId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_site_id = 15; - * @return this - */ - public EnterRogueMapRoomScRsp clearCurSiteId() { - bitField0_ &= ~0x00000002; - curSiteId = 0; - return this; - } - - /** - * optional uint32 cur_site_id = 15; - * @return the curSiteId - */ - public int getCurSiteId() { - return curSiteId; - } - - /** - * optional uint32 cur_site_id = 15; - * @param value the curSiteId to set - * @return this - */ - public EnterRogueMapRoomScRsp setCurSiteId(final int value) { - bitField0_ |= 0x00000002; - curSiteId = value; - return this; - } - - /** - * optional .SceneInfo scene = 5; - * @return whether the scene field is set - */ - public boolean hasScene() { + public boolean hasLineup() { return (bitField0_ & 0x00000004) != 0; } /** - * optional .SceneInfo scene = 5; - * @return this - */ - public EnterRogueMapRoomScRsp clearScene() { - bitField0_ &= ~0x00000004; - scene.clear(); - return this; - } - - /** - * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneInfoOuterClass.SceneInfo getScene() { - return scene; - } - - /** - * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000004; - return scene; - } - - /** - * optional .SceneInfo scene = 5; - * @param value the scene to set - * @return this - */ - public EnterRogueMapRoomScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000004; - scene.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 6; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 5; * @return this */ public EnterRogueMapRoomScRsp clearLineup() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; lineup.clear(); return this; } /** - * optional .LineupInfo lineup = 6; + * 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. @@ -212,7 +155,7 @@ public final class EnterRogueMapRoomScRspOuterClass { } /** - * optional .LineupInfo lineup = 6; + * 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 @@ -221,30 +164,87 @@ public final class EnterRogueMapRoomScRspOuterClass { * @return internal storage object for modifications */ public LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return lineup; } /** - * optional .LineupInfo lineup = 6; + * optional .LineupInfo lineup = 5; * @param value the lineup to set * @return this */ public EnterRogueMapRoomScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public EnterRogueMapRoomScRsp clearScene() { + bitField0_ &= ~0x00000008; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000008; + return scene; + } + + /** + * optional .SceneInfo scene = 7; + * @param value the scene to set + * @return this + */ + public EnterRogueMapRoomScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000008; + scene.copyFrom(value); + return this; + } + @Override public EnterRogueMapRoomScRsp copyFrom(final EnterRogueMapRoomScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curSiteId = other.curSiteId; - scene.copyFrom(other.scene); + retcode = other.retcode; lineup.copyFrom(other.lineup); + scene.copyFrom(other.scene); } return this; } @@ -255,18 +255,18 @@ public final class EnterRogueMapRoomScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurSiteId()) { setCurSiteId(other.curSiteId); } - if (other.hasScene()) { - getMutableScene().mergeFrom(other.scene); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } return this; } @@ -277,10 +277,10 @@ public final class EnterRogueMapRoomScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curSiteId = 0; - scene.clear(); + retcode = 0; lineup.clear(); + scene.clear(); return this; } @@ -291,8 +291,8 @@ public final class EnterRogueMapRoomScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - scene.clearQuick(); lineup.clearQuick(); + scene.clearQuick(); return this; } @@ -306,29 +306,29 @@ public final class EnterRogueMapRoomScRspOuterClass { } EnterRogueMapRoomScRsp other = (EnterRogueMapRoomScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurSiteId() || curSiteId == other.curSiteId) - && (!hasScene() || scene.equals(other.scene)) - && (!hasLineup() || lineup.equals(other.lineup)); + && (!hasRetcode() || retcode == other.retcode) + && (!hasLineup() || lineup.equals(other.lineup)) + && (!hasScene() || scene.equals(other.scene)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(curSiteId); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(curSiteId); - } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 42); - output.writeMessageNoTag(scene); + output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 58); + output.writeMessageNoTag(scene); } } @@ -336,16 +336,16 @@ public final class EnterRogueMapRoomScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curSiteId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } return size; } @@ -357,18 +357,18 @@ public final class EnterRogueMapRoomScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // retcode - retcode = input.readUInt32(); + case 24: { + // curSiteId + curSiteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 80) { break; } } - case 120: { - // curSiteId - curSiteId = input.readUInt32(); + case 80: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 42) { @@ -376,17 +376,17 @@ public final class EnterRogueMapRoomScRspOuterClass { } } case 42: { - // scene - input.readMessage(scene); + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 58) { break; } } - case 50: { - // lineup - input.readMessage(lineup); + case 58: { + // scene + input.readMessage(scene); 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.retcode, retcode); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.curSiteId, curSiteId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.lineup, lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.scene, scene); } output.endObject(); } @@ -432,10 +432,11 @@ public final class EnterRogueMapRoomScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -443,11 +444,10 @@ public final class EnterRogueMapRoomScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -455,21 +455,21 @@ public final class EnterRogueMapRoomScRspOuterClass { } 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_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 109254796: { + if (input.isAtField(FieldNames.scene)) { + if (!input.trySkipNullValue()) { + input.readMessage(scene); bitField0_ |= 0x00000008; } } else { @@ -530,13 +530,13 @@ public final class EnterRogueMapRoomScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curSiteId = FieldName.forField("curSiteId", "cur_site_id"); - static final FieldName scene = FieldName.forField("scene"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName lineup = FieldName.forField("lineup"); + + static final FieldName scene = FieldName.forField("scene"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnterSceneByServerScNotifyOuterClass.java index eb3679f..09d08eb 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 = 8; + * optional .EnterSceneReason reason = 5; */ private int reason; /** - * optional .LineupInfo lineup = 11; + * optional .LineupInfo lineup = 3; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 8; + * optional .EnterSceneReason reason = 5; * @return whether the reason field is set */ public boolean hasReason() { @@ -52,7 +52,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 8; + * optional .EnterSceneReason reason = 5; * @return this */ public EnterSceneByServerScNotify clearReason() { @@ -62,7 +62,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 8; + * optional .EnterSceneReason reason = 5; * @return the reason */ public EnterSceneReasonOuterClass.EnterSceneReason getReason() { @@ -95,7 +95,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .EnterSceneReason reason = 8; + * optional .EnterSceneReason reason = 5; * @param value the reason to set * @return this */ @@ -107,7 +107,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 11; + * optional .LineupInfo lineup = 3; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -115,7 +115,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 11; + * optional .LineupInfo lineup = 3; * @return this */ public EnterSceneByServerScNotify clearLineup() { @@ -125,7 +125,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 11; + * 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. @@ -139,7 +139,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 11; + * 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 @@ -153,7 +153,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .LineupInfo lineup = 11; + * optional .LineupInfo lineup = 3; * @param value the lineup to set * @return this */ @@ -164,7 +164,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * @return whether the scene field is set */ public boolean hasScene() { @@ -172,7 +172,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * @return this */ public EnterSceneByServerScNotify clearScene() { @@ -182,7 +182,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 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. @@ -196,7 +196,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 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 @@ -210,7 +210,7 @@ public final class EnterSceneByServerScNotifyOuterClass { } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 8; * @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) 64); + output.writeRawByte((byte) 40); output.writeEnumNoTag(reason); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 26); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 66); output.writeMessageNoTag(scene); } } @@ -328,7 +328,7 @@ public final class EnterSceneByServerScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // 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 != 90) { + if (tag != 26) { break; } } - case 90: { + case 26: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 122) { + if (tag != 66) { break; } } - case 122: { + case 66: { // 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 e6dbb7a..1031c72 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 entry_id = 2; - */ - private int entryId; - - /** - * optional uint32 teleport_id = 13; + * optional uint32 teleport_id = 2; */ private int teleportId; + /** + * optional uint32 entry_id = 5; + */ + private int entryId; + private EnterSceneCsReq() { } @@ -39,62 +39,25 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 entry_id = 2; - * @return whether the entryId field is set + * optional uint32 teleport_id = 2; + * @return whether the teleportId field is set */ - public boolean hasEntryId() { + public boolean hasTeleportId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 entry_id = 2; - * @return this - */ - public EnterSceneCsReq clearEntryId() { - bitField0_ &= ~0x00000001; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 2; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 2; - * @param value the entryId to set - * @return this - */ - public EnterSceneCsReq setEntryId(final int value) { - bitField0_ |= 0x00000001; - entryId = value; - return this; - } - - /** - * optional uint32 teleport_id = 13; - * @return whether the teleportId field is set - */ - public boolean hasTeleportId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 teleport_id = 13; + * optional uint32 teleport_id = 2; * @return this */ public EnterSceneCsReq clearTeleportId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; teleportId = 0; return this; } /** - * optional uint32 teleport_id = 13; + * optional uint32 teleport_id = 2; * @return the teleportId */ public int getTeleportId() { @@ -102,23 +65,60 @@ public final class EnterSceneCsReqOuterClass { } /** - * optional uint32 teleport_id = 13; + * optional uint32 teleport_id = 2; * @param value the teleportId to set * @return this */ public EnterSceneCsReq setTeleportId(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public EnterSceneCsReq clearEntryId() { + bitField0_ &= ~0x00000002; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 5; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 5; + * @param value the entryId to set + * @return this + */ + public EnterSceneCsReq setEntryId(final int value) { + bitField0_ |= 0x00000002; + entryId = value; + return this; + } + @Override public EnterSceneCsReq copyFrom(final EnterSceneCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - entryId = other.entryId; teleportId = other.teleportId; + entryId = other.entryId; } return this; } @@ -129,12 +129,12 @@ public final class EnterSceneCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasTeleportId()) { setTeleportId(other.teleportId); } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } return this; } @@ -145,8 +145,8 @@ public final class EnterSceneCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - entryId = 0; teleportId = 0; + entryId = 0; return this; } @@ -170,19 +170,19 @@ public final class EnterSceneCsReqOuterClass { } EnterSceneCsReq other = (EnterSceneCsReq) o; return bitField0_ == other.bitField0_ - && (!hasEntryId() || entryId == other.entryId) - && (!hasTeleportId() || teleportId == other.teleportId); + && (!hasTeleportId() || teleportId == other.teleportId) + && (!hasEntryId() || entryId == other.entryId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(entryId); + output.writeUInt32NoTag(teleportId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(teleportId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(entryId); } } @@ -190,10 +190,10 @@ public final class EnterSceneCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(teleportId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } return size; } @@ -206,17 +206,17 @@ public final class EnterSceneCsReqOuterClass { while (true) { switch (tag) { case 16: { - // entryId - entryId = input.readUInt32(); + // teleportId + teleportId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 40) { break; } } - case 104: { - // teleportId - teleportId = input.readUInt32(); + case 40: { + // entryId + entryId = 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.entryId, entryId); + output.writeUInt32(FieldNames.teleportId, teleportId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.teleportId, teleportId); + output.writeUInt32(FieldNames.entryId, entryId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class EnterSceneCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class EnterSceneCsReqOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class EnterSceneCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName teleportId = FieldName.forField("teleportId", "teleport_id"); + + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java index 103b0a3..8e469bc 100644 --- a/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EnteredSceneInfoOuterClass.java @@ -24,7 +24,7 @@ public final class EnteredSceneInfoOuterClass { private int planeId; /** - * optional uint32 floor_id = 13; + * optional uint32 floor_id = 15; */ private int floorId; @@ -76,7 +76,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 13; + * optional uint32 floor_id = 15; * @return whether the floorId field is set */ public boolean hasFloorId() { @@ -84,7 +84,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 13; + * optional uint32 floor_id = 15; * @return this */ public EnteredSceneInfo clearFloorId() { @@ -94,7 +94,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 13; + * optional uint32 floor_id = 15; * @return the floorId */ public int getFloorId() { @@ -102,7 +102,7 @@ public final class EnteredSceneInfoOuterClass { } /** - * optional uint32 floor_id = 13; + * optional uint32 floor_id = 15; * @param value the floorId to set * @return this */ @@ -181,7 +181,7 @@ public final class EnteredSceneInfoOuterClass { output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(floorId); } } @@ -210,11 +210,11 @@ public final class EnteredSceneInfoOuterClass { planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // 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 fd15fe0..0327417 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffChangeInfoOuterClass.java @@ -19,17 +19,17 @@ public final class EntityBuffChangeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 remove_buff_id = 2; - */ - private int removeBuffId; - - /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; */ private int entityId; /** - * optional .BuffInfo add_buff_info = 7; + * optional uint32 remove_buff_id = 15; + */ + private int removeBuffId; + + /** + * optional .BuffInfo add_buff_info = 13; */ private final BuffInfoOuterClass.BuffInfo addBuffInfo = BuffInfoOuterClass.BuffInfo.newInstance(); @@ -44,62 +44,25 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 remove_buff_id = 2; - * @return whether the removeBuffId field is set + * optional uint32 entity_id = 12; + * @return whether the entityId field is set */ - public boolean hasRemoveBuffId() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 remove_buff_id = 2; - * @return this - */ - public EntityBuffChangeInfo clearRemoveBuffId() { - bitField0_ &= ~0x00000001; - removeBuffId = 0; - return this; - } - - /** - * optional uint32 remove_buff_id = 2; - * @return the removeBuffId - */ - public int getRemoveBuffId() { - return removeBuffId; - } - - /** - * optional uint32 remove_buff_id = 2; - * @param value the removeBuffId to set - * @return this - */ - public EntityBuffChangeInfo setRemoveBuffId(final int value) { - bitField0_ |= 0x00000001; - removeBuffId = value; - return this; - } - - /** - * optional uint32 entity_id = 10; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @return this */ public EntityBuffChangeInfo clearEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @return the entityId */ public int getEntityId() { @@ -107,18 +70,55 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional uint32 entity_id = 10; + * optional uint32 entity_id = 12; * @param value the entityId to set * @return this */ public EntityBuffChangeInfo setEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; entityId = value; return this; } /** - * optional .BuffInfo add_buff_info = 7; + * optional uint32 remove_buff_id = 15; + * @return whether the removeBuffId field is set + */ + public boolean hasRemoveBuffId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 remove_buff_id = 15; + * @return this + */ + public EntityBuffChangeInfo clearRemoveBuffId() { + bitField0_ &= ~0x00000002; + removeBuffId = 0; + return this; + } + + /** + * optional uint32 remove_buff_id = 15; + * @return the removeBuffId + */ + public int getRemoveBuffId() { + return removeBuffId; + } + + /** + * optional uint32 remove_buff_id = 15; + * @param value the removeBuffId to set + * @return this + */ + public EntityBuffChangeInfo setRemoveBuffId(final int value) { + bitField0_ |= 0x00000002; + removeBuffId = value; + return this; + } + + /** + * optional .BuffInfo add_buff_info = 13; * @return whether the addBuffInfo field is set */ public boolean hasAddBuffInfo() { @@ -126,7 +126,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 7; + * optional .BuffInfo add_buff_info = 13; * @return this */ public EntityBuffChangeInfo clearAddBuffInfo() { @@ -136,7 +136,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 7; + * optional .BuffInfo add_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. @@ -150,7 +150,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 7; + * optional .BuffInfo add_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 @@ -164,7 +164,7 @@ public final class EntityBuffChangeInfoOuterClass { } /** - * optional .BuffInfo add_buff_info = 7; + * optional .BuffInfo add_buff_info = 13; * @param value the addBuffInfo to set * @return this */ @@ -179,8 +179,8 @@ public final class EntityBuffChangeInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - removeBuffId = other.removeBuffId; entityId = other.entityId; + removeBuffId = other.removeBuffId; addBuffInfo.copyFrom(other.addBuffInfo); } return this; @@ -192,12 +192,12 @@ public final class EntityBuffChangeInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRemoveBuffId()) { - setRemoveBuffId(other.removeBuffId); - } if (other.hasEntityId()) { setEntityId(other.entityId); } + if (other.hasRemoveBuffId()) { + setRemoveBuffId(other.removeBuffId); + } if (other.hasAddBuffInfo()) { getMutableAddBuffInfo().mergeFrom(other.addBuffInfo); } @@ -211,8 +211,8 @@ public final class EntityBuffChangeInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - removeBuffId = 0; entityId = 0; + removeBuffId = 0; addBuffInfo.clear(); return this; } @@ -238,23 +238,23 @@ public final class EntityBuffChangeInfoOuterClass { } EntityBuffChangeInfo other = (EntityBuffChangeInfo) o; return bitField0_ == other.bitField0_ - && (!hasRemoveBuffId() || removeBuffId == other.removeBuffId) && (!hasEntityId() || entityId == other.entityId) + && (!hasRemoveBuffId() || removeBuffId == other.removeBuffId) && (!hasAddBuffInfo() || addBuffInfo.equals(other.addBuffInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(removeBuffId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(entityId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(removeBuffId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(addBuffInfo); } } @@ -263,10 +263,10 @@ public final class EntityBuffChangeInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(addBuffInfo); @@ -281,25 +281,25 @@ public final class EntityBuffChangeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // removeBuffId - removeBuffId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 96: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 120) { break; } } - case 58: { + case 120: { + // removeBuffId + removeBuffId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { // addBuffInfo input.readMessage(addBuffInfo); bitField0_ |= 0x00000004; @@ -326,10 +326,10 @@ public final class EntityBuffChangeInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.removeBuffId, removeBuffId); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.removeBuffId, removeBuffId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.addBuffInfo, addBuffInfo); @@ -344,11 +344,11 @@ public final class EntityBuffChangeInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1339555214: - case 927119308: { - if (input.isAtField(FieldNames.removeBuffId)) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { - removeBuffId = input.readUInt32(); + entityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -356,11 +356,11 @@ public final class EntityBuffChangeInfoOuterClass { } break; } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { + case -1339555214: + case 927119308: { + if (input.isAtField(FieldNames.removeBuffId)) { if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); + removeBuffId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class EntityBuffChangeInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName removeBuffId = FieldName.forField("removeBuffId", "remove_buff_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_id"); + static final FieldName removeBuffId = FieldName.forField("removeBuffId", "remove_buff_id"); + static final FieldName addBuffInfo = FieldName.forField("addBuffInfo", "add_buff_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java index 21b9e1c..b645b02 100644 --- a/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EntityBuffInfoOuterClass.java @@ -20,12 +20,12 @@ public final class EntityBuffInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 10; */ private int entityId; /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_list = 4; */ private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BuffInfoOuterClass.BuffInfo.getFactory()); @@ -40,7 +40,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 10; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -48,7 +48,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 10; * @return this */ public EntityBuffInfo clearEntityId() { @@ -58,7 +58,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 10; * @return the entityId */ public int getEntityId() { @@ -66,7 +66,7 @@ public final class EntityBuffInfoOuterClass { } /** - * optional uint32 entity_id = 5; + * optional uint32 entity_id = 10; * @param value the entityId to set * @return this */ @@ -77,7 +77,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_list = 4; * @return whether the buffList field is set */ public boolean hasBuffList() { @@ -85,7 +85,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_list = 4; * @return this */ public EntityBuffInfo clearBuffList() { @@ -95,7 +95,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_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 EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_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 EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_list = 4; * @param value the buffList to add * @return this */ @@ -134,7 +134,7 @@ public final class EntityBuffInfoOuterClass { } /** - * repeated .BuffInfo buff_list = 15; + * repeated .BuffInfo buff_list = 4; * @param values the buffList to add * @return this */ @@ -210,12 +210,12 @@ public final class EntityBuffInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 34); output.writeMessageNoTag(buffList.get(i)); } } @@ -240,16 +240,16 @@ public final class EntityBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 80: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 34) { break; } } - case 122: { + case 34: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java b/src/generated/main/emu/lunarcore/proto/EntityMotionOuterClass.java index 5897bd7..bbda166 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 = 4; + * optional uint32 entity_id = 10; */ private int entityId; /** - * optional uint32 map_layer = 12; + * optional uint32 map_layer = 14; */ private int mapLayer; /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 4; + * optional uint32 entity_id = 10; * @return whether the entityId field is set */ public boolean hasEntityId() { @@ -52,7 +52,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 4; + * optional uint32 entity_id = 10; * @return this */ public EntityMotion clearEntityId() { @@ -62,7 +62,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 4; + * optional uint32 entity_id = 10; * @return the entityId */ public int getEntityId() { @@ -70,7 +70,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 entity_id = 4; + * optional uint32 entity_id = 10; * @param value the entityId to set * @return this */ @@ -81,7 +81,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 12; + * optional uint32 map_layer = 14; * @return whether the mapLayer field is set */ public boolean hasMapLayer() { @@ -89,7 +89,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 12; + * optional uint32 map_layer = 14; * @return this */ public EntityMotion clearMapLayer() { @@ -99,7 +99,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 12; + * optional uint32 map_layer = 14; * @return the mapLayer */ public int getMapLayer() { @@ -107,7 +107,7 @@ public final class EntityMotionOuterClass { } /** - * optional uint32 map_layer = 12; + * optional uint32 map_layer = 14; * @param value the mapLayer to set * @return this */ @@ -118,7 +118,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 4; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 4; * @return this */ public EntityMotion clearMotion() { @@ -136,7 +136,7 @@ public final class EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 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 EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 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 EntityMotionOuterClass { } /** - * optional .MotionInfo motion = 1; + * optional .MotionInfo motion = 4; * @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) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 34); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class EntityMotionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // entityId entityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // mapLayer mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 10) { + if (tag != 34) { break; } } - case 10: { + case 34: { // 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 d5df1f5..f5cfb8d 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 slot = 4; - */ - private int slot; - - /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 5; */ private int relicUniqueId; + /** + * optional uint32 slot = 12; + */ + private int slot; + private EquipRelic() { } @@ -39,62 +39,25 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 slot = 4; - * @return whether the slot field is set + * optional uint32 relic_unique_id = 5; + * @return whether the relicUniqueId field is set */ - public boolean hasSlot() { + public boolean hasRelicUniqueId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 4; - * @return this - */ - public EquipRelic 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 EquipRelic setSlot(final int value) { - bitField0_ |= 0x00000001; - slot = value; - return this; - } - - /** - * optional uint32 relic_unique_id = 11; - * @return whether the relicUniqueId field is set - */ - public boolean hasRelicUniqueId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 5; * @return this */ public EquipRelic clearRelicUniqueId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; relicUniqueId = 0; return this; } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 5; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -102,23 +65,60 @@ public final class EquipRelicOuterClass { } /** - * optional uint32 relic_unique_id = 11; + * optional uint32 relic_unique_id = 5; * @param value the relicUniqueId to set * @return this */ public EquipRelic setRelicUniqueId(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public EquipRelic clearSlot() { + bitField0_ &= ~0x00000002; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 12; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 12; + * @param value the slot to set + * @return this + */ + public EquipRelic setSlot(final int value) { + bitField0_ |= 0x00000002; + slot = value; + return this; + } + @Override public EquipRelic copyFrom(final EquipRelic other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; relicUniqueId = other.relicUniqueId; + slot = other.slot; } return this; } @@ -129,12 +129,12 @@ public final class EquipRelicOuterClass { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasRelicUniqueId()) { setRelicUniqueId(other.relicUniqueId); } + if (other.hasSlot()) { + setSlot(other.slot); + } return this; } @@ -145,8 +145,8 @@ public final class EquipRelicOuterClass { } cachedSize = -1; bitField0_ = 0; - slot = 0; relicUniqueId = 0; + slot = 0; return this; } @@ -170,19 +170,19 @@ public final class EquipRelicOuterClass { } EquipRelic other = (EquipRelic) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) - && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId); + && (!hasRelicUniqueId() || relicUniqueId == other.relicUniqueId) + && (!hasSlot() || slot == other.slot); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(relicUniqueId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(slot); } } @@ -190,10 +190,10 @@ public final class EquipRelicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(relicUniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } return size; } @@ -205,18 +205,18 @@ public final class EquipRelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // slot - slot = input.readUInt32(); + case 40: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // relicUniqueId - relicUniqueId = input.readUInt32(); + case 96: { + // slot + slot = 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.slot, slot); + output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.relicUniqueId, relicUniqueId); + output.writeUInt32(FieldNames.slot, slot); } output.endObject(); } @@ -256,10 +256,11 @@ public final class EquipRelicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class EquipRelicOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -331,9 +331,9 @@ public final class EquipRelicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); - static final FieldName relicUniqueId = FieldName.forField("relicUniqueId", "relic_unique_id"); + + static final FieldName slot = FieldName.forField("slot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java index d927aa0..28c1d9a 100644 --- a/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/EquipmentOuterClass.java @@ -19,24 +19,9 @@ public final class EquipmentOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 2; + * optional uint32 rank = 5; */ - private int tid; - - /** - * optional uint32 level = 3; - */ - private int level; - - /** - * optional uint32 promotion = 5; - */ - private int promotion; - - /** - * optional uint32 equip_avatar_id = 6; - */ - private int equipAvatarId; + private int rank; /** * optional uint32 exp = 7; @@ -44,22 +29,36 @@ public final class EquipmentOuterClass { private int exp; /** - * optional uint32 unique_id = 8; + * optional uint32 level = 9; + */ + private int level; + + /** + * optional uint32 promotion = 10; + */ + private int promotion; + + /** + * optional uint32 unique_id = 11; */ private int uniqueId; /** - * optional uint32 rank = 13; + * optional uint32 tid = 12; */ - private int rank; + private int tid; /** - * optional uint32 base_avatar_id = 14; + * optional uint32 equip_avatar_id = 13; */ - private int baseAvatarId; + private int equipAvatarId; /** - * optional bool is_protected = 12; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional bool is_protected = 14; */ private boolean isProtected; @@ -74,150 +73,39 @@ public final class EquipmentOuterClass { } /** - * optional uint32 tid = 2; - * @return whether the tid field is set + * optional uint32 rank = 5; + * @return whether the rank field is set */ - public boolean hasTid() { + public boolean hasRank() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 tid = 2; + * optional uint32 rank = 5; * @return this */ - public Equipment clearTid() { + public Equipment clearRank() { bitField0_ &= ~0x00000001; - tid = 0; + rank = 0; return this; } /** - * optional uint32 tid = 2; - * @return the tid + * optional uint32 rank = 5; + * @return the rank */ - public int getTid() { - return tid; + public int getRank() { + return rank; } /** - * optional uint32 tid = 2; - * @param value the tid to set + * optional uint32 rank = 5; + * @param value the rank to set * @return this */ - public Equipment setTid(final int value) { + public Equipment setRank(final int value) { bitField0_ |= 0x00000001; - tid = value; - return this; - } - - /** - * optional uint32 level = 3; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 3; - * @return this - */ - public Equipment clearLevel() { - bitField0_ &= ~0x00000002; - level = 0; - return this; - } - - /** - * optional uint32 level = 3; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 3; - * @param value the level to set - * @return this - */ - public Equipment setLevel(final int value) { - bitField0_ |= 0x00000002; - level = 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 Equipment 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 Equipment setPromotion(final int value) { - bitField0_ |= 0x00000004; - promotion = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 6; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 equip_avatar_id = 6; - * @return this - */ - public Equipment clearEquipAvatarId() { - bitField0_ &= ~0x00000008; - equipAvatarId = 0; - return this; - } - - /** - * optional uint32 equip_avatar_id = 6; - * @return the equipAvatarId - */ - public int getEquipAvatarId() { - return equipAvatarId; - } - - /** - * optional uint32 equip_avatar_id = 6; - * @param value the equipAvatarId to set - * @return this - */ - public Equipment setEquipAvatarId(final int value) { - bitField0_ |= 0x00000008; - equipAvatarId = value; + rank = value; return this; } @@ -226,7 +114,7 @@ public final class EquipmentOuterClass { * @return whether the exp field is set */ public boolean hasExp() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -234,7 +122,7 @@ public final class EquipmentOuterClass { * @return this */ public Equipment clearExp() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; exp = 0; return this; } @@ -253,31 +141,105 @@ public final class EquipmentOuterClass { * @return this */ public Equipment setExp(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; exp = value; return this; } /** - * optional uint32 unique_id = 8; - * @return whether the uniqueId field is set + * optional uint32 level = 9; + * @return whether the level field is set */ - public boolean hasUniqueId() { - return (bitField0_ & 0x00000020) != 0; + public boolean hasLevel() { + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 unique_id = 8; + * 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; + * @return this + */ + public Equipment clearPromotion() { + bitField0_ &= ~0x00000008; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 10; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 10; + * @param value the promotion to set + * @return this + */ + public Equipment setPromotion(final int value) { + bitField0_ |= 0x00000008; + promotion = value; + return this; + } + + /** + * optional uint32 unique_id = 11; + * @return whether the uniqueId field is set + */ + public boolean hasUniqueId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 unique_id = 11; * @return this */ public Equipment clearUniqueId() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; uniqueId = 0; return this; } /** - * optional uint32 unique_id = 8; + * optional uint32 unique_id = 11; * @return the uniqueId */ public int getUniqueId() { @@ -285,110 +247,122 @@ public final class EquipmentOuterClass { } /** - * optional uint32 unique_id = 8; + * optional uint32 unique_id = 11; * @param value the uniqueId to set * @return this */ public Equipment setUniqueId(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; uniqueId = value; return this; } /** - * optional uint32 rank = 13; - * @return whether the rank field is set + * optional uint32 tid = 12; + * @return whether the tid field is set */ - public boolean hasRank() { + 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; + * @return whether the equipAvatarId field is set + */ + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 rank = 13; + * optional uint32 equip_avatar_id = 13; * @return this */ - public Equipment clearRank() { + public Equipment clearEquipAvatarId() { bitField0_ &= ~0x00000040; - rank = 0; + equipAvatarId = 0; return this; } /** - * optional uint32 rank = 13; - * @return the rank + * optional uint32 equip_avatar_id = 13; + * @return the equipAvatarId */ - public int getRank() { - return rank; + public int getEquipAvatarId() { + return equipAvatarId; } /** - * optional uint32 rank = 13; - * @param value the rank to set + * optional uint32 equip_avatar_id = 13; + * @param value the equipAvatarId to set * @return this */ - public Equipment setRank(final int value) { + public Equipment setEquipAvatarId(final int value) { bitField0_ |= 0x00000040; - rank = value; + equipAvatarId = value; return this; } /** - * optional uint32 base_avatar_id = 14; - * @return whether the baseAvatarId field is set + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional bool is_protected = 14; + * @return whether the isProtected field is set */ - public boolean hasBaseAvatarId() { + public boolean hasIsProtected() { return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 base_avatar_id = 14; - * @return this - */ - public Equipment clearBaseAvatarId() { - bitField0_ &= ~0x00000080; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 14; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 14; - * @param value the baseAvatarId to set - * @return this - */ - public Equipment setBaseAvatarId(final int value) { - bitField0_ |= 0x00000080; - baseAvatarId = value; - return this; - } - - /** - * optional bool is_protected = 12; - * @return whether the isProtected field is set - */ - public boolean hasIsProtected() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * optional bool is_protected = 12; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional bool is_protected = 14; * @return this */ public Equipment clearIsProtected() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; isProtected = false; return this; } /** - * optional bool is_protected = 12; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional bool is_protected = 14; * @return the isProtected */ public boolean getIsProtected() { @@ -396,12 +370,16 @@ public final class EquipmentOuterClass { } /** - * optional bool is_protected = 12; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional bool is_protected = 14; * @param value the isProtected to set * @return this */ public Equipment setIsProtected(final boolean value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; isProtected = value; return this; } @@ -411,14 +389,13 @@ public final class EquipmentOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - tid = other.tid; + rank = other.rank; + exp = other.exp; level = other.level; promotion = other.promotion; - equipAvatarId = other.equipAvatarId; - exp = other.exp; uniqueId = other.uniqueId; - rank = other.rank; - baseAvatarId = other.baseAvatarId; + tid = other.tid; + equipAvatarId = other.equipAvatarId; isProtected = other.isProtected; } return this; @@ -430,8 +407,11 @@ public final class EquipmentOuterClass { return this; } cachedSize = -1; - if (other.hasTid()) { - setTid(other.tid); + if (other.hasRank()) { + setRank(other.rank); + } + if (other.hasExp()) { + setExp(other.exp); } if (other.hasLevel()) { setLevel(other.level); @@ -439,20 +419,14 @@ public final class EquipmentOuterClass { if (other.hasPromotion()) { setPromotion(other.promotion); } - if (other.hasEquipAvatarId()) { - setEquipAvatarId(other.equipAvatarId); - } - if (other.hasExp()) { - setExp(other.exp); - } if (other.hasUniqueId()) { setUniqueId(other.uniqueId); } - if (other.hasRank()) { - setRank(other.rank); + if (other.hasTid()) { + setTid(other.tid); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasEquipAvatarId()) { + setEquipAvatarId(other.equipAvatarId); } if (other.hasIsProtected()) { setIsProtected(other.isProtected); @@ -467,14 +441,13 @@ public final class EquipmentOuterClass { } cachedSize = -1; bitField0_ = 0; - tid = 0; + rank = 0; + exp = 0; level = 0; promotion = 0; - equipAvatarId = 0; - exp = 0; uniqueId = 0; - rank = 0; - baseAvatarId = 0; + tid = 0; + equipAvatarId = 0; isProtected = false; return this; } @@ -499,53 +472,48 @@ public final class EquipmentOuterClass { } Equipment other = (Equipment) o; return bitField0_ == other.bitField0_ - && (!hasTid() || tid == other.tid) + && (!hasRank() || rank == other.rank) + && (!hasExp() || exp == other.exp) && (!hasLevel() || level == other.level) && (!hasPromotion() || promotion == other.promotion) - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) - && (!hasExp() || exp == other.exp) && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasRank() || rank == other.rank) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!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) 16); - output.writeUInt32NoTag(tid); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(equipAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(exp); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 64); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(promotion); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(uniqueId); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(tid); + } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(rank); + output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000080) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 96); output.writeBoolNoTag(isProtected); } } @@ -554,30 +522,27 @@ public final class EquipmentOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); - } - if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } - if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); + } + if ((bitField0_ & 0x00000080) != 0) { size += 2; } return size; @@ -590,37 +555,10 @@ public final class EquipmentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // tid - tid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // equipAvatarId - equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 56) { break; @@ -629,15 +567,42 @@ public final class EquipmentOuterClass { case 56: { // exp exp = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { + 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(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // tid + tid = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 104) { @@ -645,8 +610,8 @@ public final class EquipmentOuterClass { } } case 104: { - // rank - rank = input.readUInt32(); + // equipAvatarId + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 112) { @@ -654,18 +619,9 @@ public final class EquipmentOuterClass { } } case 112: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // isProtected isProtected = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { break; @@ -689,30 +645,27 @@ public final class EquipmentOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.tid, tid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeUInt32(FieldNames.rank, rank); } - if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.exp, exp); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.promotion, promotion); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.tid, tid); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); + } + if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); } output.endObject(); @@ -725,10 +678,10 @@ public final class EquipmentOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 114831: { - if (input.isAtField(FieldNames.tid)) { + case 3492908: { + if (input.isAtField(FieldNames.rank)) { if (!input.trySkipNullValue()) { - tid = input.readUInt32(); + rank = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -736,45 +689,33 @@ public final class EquipmentOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = 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 169047204: - case 33057906: { - if (input.isAtField(FieldNames.equipAvatarId)) { - if (!input.trySkipNullValue()) { - equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + 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(); @@ -786,6 +727,17 @@ public final class EquipmentOuterClass { 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 { @@ -793,10 +745,11 @@ public final class EquipmentOuterClass { } break; } - case 3492908: { - if (input.isAtField(FieldNames.rank)) { + case 169047204: + case 33057906: { + if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { - rank = input.readUInt32(); + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -804,24 +757,12 @@ public final class EquipmentOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { - if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } case 569879972: case -1919645991: { if (input.isAtField(FieldNames.isProtected)) { if (!input.trySkipNullValue()) { isProtected = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -880,21 +821,19 @@ public final class EquipmentOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName tid = FieldName.forField("tid"); + static final FieldName rank = FieldName.forField("rank"); + + static final FieldName exp = FieldName.forField("exp"); static final FieldName level = FieldName.forField("level"); static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); - - static final FieldName exp = FieldName.forField("exp"); - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName rank = FieldName.forField("rank"); + static final FieldName tid = FieldName.forField("tid"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + 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 9e5e19a..0eebe75 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 = 5; + * optional uint32 avatar_id = 9; */ private int avatarId; /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 15; */ private int gachaType; @@ -39,7 +39,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 9; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 9; * @return this */ public ExchangeGachaCeilingCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 9; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 avatar_id = 5; + * optional uint32 avatar_id = 9; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 15; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -84,7 +84,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 15; * @return this */ public ExchangeGachaCeilingCsReq clearGachaType() { @@ -94,7 +94,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 15; * @return the gachaType */ public int getGachaType() { @@ -102,7 +102,7 @@ public final class ExchangeGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 15; * @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) 40); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(gachaType); } } @@ -205,16 +205,16 @@ public final class ExchangeGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 72: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // 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 921475e..72dc4e4 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 avatar_id = 11; - */ - private int avatarId; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; */ private int retcode; + /** + * optional uint32 avatar_id = 9; + */ + private int avatarId; + /** * optional uint32 gacha_type = 15; */ private int gachaType; /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 6; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 14; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -54,62 +54,25 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 avatar_id = 11; - * @return whether the avatarId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasAvatarId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 11; - * @return this - */ - public ExchangeGachaCeilingScRsp clearAvatarId() { - bitField0_ &= ~0x00000001; - 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 ExchangeGachaCeilingScRsp setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = 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; + * optional uint32 retcode = 1; * @return this */ public ExchangeGachaCeilingScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -117,16 +80,53 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public ExchangeGachaCeilingScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public ExchangeGachaCeilingScRsp clearAvatarId() { + bitField0_ &= ~0x00000002; + 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 ExchangeGachaCeilingScRsp setAvatarId(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + /** * optional uint32 gacha_type = 15; * @return whether the gachaType field is set @@ -165,7 +165,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 6; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -173,7 +173,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 6; * @return this */ public ExchangeGachaCeilingScRsp clearTransferItemList() { @@ -183,7 +183,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_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. @@ -197,7 +197,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_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 @@ -211,7 +211,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .ItemList transfer_item_list = 8; + * optional .ItemList transfer_item_list = 6; * @param value the transferItemList to set * @return this */ @@ -222,7 +222,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 14; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -230,7 +230,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 14; * @return this */ public ExchangeGachaCeilingScRsp clearGachaCeiling() { @@ -240,7 +240,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 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. @@ -254,7 +254,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 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 @@ -268,7 +268,7 @@ public final class ExchangeGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 12; + * optional .GachaCeiling gacha_ceiling = 14; * @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_; - avatarId = other.avatarId; retcode = other.retcode; + avatarId = other.avatarId; 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.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } if (other.hasGachaType()) { setGachaType(other.gachaType); } @@ -324,8 +324,8 @@ public final class ExchangeGachaCeilingScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; retcode = 0; + avatarId = 0; gachaType = 0; transferItemList.clear(); gachaCeiling.clear(); @@ -354,8 +354,8 @@ public final class ExchangeGachaCeilingScRspOuterClass { } ExchangeGachaCeilingScRsp other = (ExchangeGachaCeilingScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) && (!hasRetcode() || retcode == other.retcode) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasGachaType() || gachaType == other.gachaType) && (!hasTransferItemList() || transferItemList.equals(other.transferItemList)) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)); @@ -364,23 +364,23 @@ public final class ExchangeGachaCeilingScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 50); output.writeMessageNoTag(transferItemList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 114); 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(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(gachaType); @@ -413,18 +413,18 @@ public final class ExchangeGachaCeilingScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // avatarId - avatarId = input.readUInt32(); + case 8: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { - // retcode - retcode = input.readUInt32(); + case 72: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 120) { @@ -436,20 +436,20 @@ public final class ExchangeGachaCeilingScRspOuterClass { gachaType = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 50) { break; } } - case 66: { + case 50: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { + case 114: { // 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.avatarId, avatarId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.gachaType, gachaType); @@ -500,11 +500,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -512,10 +511,11 @@ public final class ExchangeGachaCeilingScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -612,10 +612,10 @@ public final class ExchangeGachaCeilingScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + 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/ExchangeHcoinScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java index 6066f56..a997031 100644 --- a/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ExchangeHcoinScRspOuterClass.java @@ -19,12 +19,12 @@ public final class ExchangeHcoinScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional uint32 num = 12; + * optional uint32 num = 11; */ private int num; @@ -39,7 +39,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return this */ public ExchangeHcoinScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 11; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 11; * @return this */ public ExchangeHcoinScRsp clearNum() { @@ -94,7 +94,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 11; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class ExchangeHcoinScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 11; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public final class ExchangeHcoinScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class ExchangeHcoinScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ExpUpEquipmentCsReqOuterClass.java index a2ca4d9..a221c2f 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 = 9; + * optional uint32 equipment_unique_id = 6; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 8; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 6; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 6; * @return this */ public ExpUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 6; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 9; + * optional uint32 equipment_unique_id = 6; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 8; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 8; * @return this */ public ExpUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class ExpUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 2; + * optional .ItemCostList item_cost_list = 8; * @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) 72); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 66); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 48: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 66) { break; } } - case 18: { + case 66: { // 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 005df2d..395c149 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 = 14; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_item_list = 11; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return this */ public ExpUpEquipmentScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_item_list = 11; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_item_list = 11; * @return this */ public ExpUpEquipmentScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_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. @@ -109,7 +109,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_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 @@ -123,7 +123,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_item_list = 11; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpEquipmentScRspOuterClass { } /** - * repeated .PileItem return_item_list = 15; + * repeated .PileItem return_item_list = 11; * @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) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 90); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 90) { break; } } - case 122: { + case 90: { // 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 8f8bf9d..22c2c0a 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 = 5; + * optional uint32 relic_unique_id = 11; */ private int relicUniqueId; /** - * optional .ItemCostList item_cost_list = 10; + * optional .ItemCostList item_cost_list = 1; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 11; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 11; * @return this */ public ExpUpRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 11; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 5; + * optional uint32 relic_unique_id = 11; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 10; + * optional .ItemCostList item_cost_list = 1; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 10; + * optional .ItemCostList item_cost_list = 1; * @return this */ public ExpUpRelicCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 10; + * 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 ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 10; + * 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 ExpUpRelicCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 10; + * optional .ItemCostList item_cost_list = 1; * @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) 40); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class ExpUpRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 88: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 10) { break; } } - case 82: { + case 10: { // 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 2fa3a77..629388f 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 = 5; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 10; */ private final RepeatedMessage returnItemList = RepeatedMessage.newEmptyInstance(PileItemOuterClass.PileItem.getFactory()); @@ -40,7 +40,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * 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 ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return this */ public ExpUpRelicScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 10; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -85,7 +85,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 10; * @return this */ public ExpUpRelicScRsp clearReturnItemList() { @@ -95,7 +95,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * 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 ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * 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 ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 10; * @param value the returnItemList to add * @return this */ @@ -134,7 +134,7 @@ public final class ExpUpRelicScRspOuterClass { } /** - * repeated .PileItem return_item_list = 12; + * repeated .PileItem return_item_list = 10; * @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) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < returnItemList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 82); output.writeMessageNoTag(returnItemList.get(i)); } } @@ -240,16 +240,16 @@ public final class ExpUpRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 82) { break; } } - case 98: { + case 82: { // 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 e255cce..f552876 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 begin_time = 3; - */ - private long beginTime; - - /** - * optional int64 end_time = 11; + * optional int64 end_time = 2; */ private long endTime; /** - * optional uint32 gacha_id = 4; + * optional int64 begin_time = 11; + */ + private long beginTime; + + /** + * optional uint32 gacha_id = 1; */ private int gachaId; @@ -44,62 +44,25 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 begin_time = 3; - * @return whether the beginTime field is set + * optional int64 end_time = 2; + * @return whether the endTime field is set */ - public boolean hasBeginTime() { + public boolean hasEndTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 begin_time = 3; - * @return this - */ - public FarmStageGachaInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 3; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 3; - * @param value the beginTime to set - * @return this - */ - public FarmStageGachaInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 11; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 11; + * optional int64 end_time = 2; * @return this */ public FarmStageGachaInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 11; + * optional int64 end_time = 2; * @return the endTime */ public long getEndTime() { @@ -107,18 +70,55 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional int64 end_time = 11; + * optional int64 end_time = 2; * @param value the endTime to set * @return this */ public FarmStageGachaInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 gacha_id = 4; + * optional int64 begin_time = 11; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 11; + * @return this + */ + public FarmStageGachaInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 11; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 11; + * @param value the beginTime to set + * @return this + */ + public FarmStageGachaInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 gacha_id = 1; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -126,7 +126,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 4; + * optional uint32 gacha_id = 1; * @return this */ public FarmStageGachaInfo clearGachaId() { @@ -136,7 +136,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 4; + * optional uint32 gacha_id = 1; * @return the gachaId */ public int getGachaId() { @@ -144,7 +144,7 @@ public final class FarmStageGachaInfoOuterClass { } /** - * optional uint32 gacha_id = 4; + * optional uint32 gacha_id = 1; * @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_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; gachaId = other.gachaId; } return this; @@ -172,12 +172,12 @@ public final class FarmStageGachaInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasGachaId()) { setGachaId(other.gachaId); } @@ -191,8 +191,8 @@ public final class FarmStageGachaInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; gachaId = 0; return this; } @@ -217,23 +217,23 @@ public final class FarmStageGachaInfoOuterClass { } FarmStageGachaInfo other = (FarmStageGachaInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasGachaId() || gachaId == other.gachaId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeInt64NoTag(beginTime); + output.writeRawByte((byte) 16); + output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); - output.writeInt64NoTag(endTime); + output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); 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(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(gachaId); @@ -260,9 +260,9 @@ public final class FarmStageGachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // beginTime - beginTime = input.readInt64(); + case 16: { + // endTime + endTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 88) { @@ -270,15 +270,15 @@ public final class FarmStageGachaInfoOuterClass { } } case 88: { - // endTime - endTime = input.readInt64(); + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 8) { break; } } - case 32: { + case 8: { // 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.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.gachaId, gachaId); @@ -323,11 +323,11 @@ public final class FarmStageGachaInfoOuterClass { } 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 { @@ -335,11 +335,11 @@ public final class FarmStageGachaInfoOuterClass { } 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 { @@ -412,10 +412,10 @@ public final class FarmStageGachaInfoOuterClass { * 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 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 new file mode 100644 index 0000000..4a5531a --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionCsReqOuterClass.java @@ -0,0 +1,490 @@ +// 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; +import us.hebi.quickbuf.Utf8String; + +public final class FinishTalkMissionCsReqOuterClass { + /** + * Protobuf type {@code FinishTalkMissionCsReq} + */ + public static final class FinishTalkMissionCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 sub_mission_id = 11; + */ + private int subMissionId; + + /** + * optional string talk_str = 2; + */ + private final Utf8String talkStr = Utf8String.newEmptyInstance(); + + /** + * repeated .MissionCustomValueData custom_value_list = 5; + */ + private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); + + private FinishTalkMissionCsReq() { + } + + /** + * @return a new empty instance of {@code FinishTalkMissionCsReq} + */ + public static FinishTalkMissionCsReq newInstance() { + return new FinishTalkMissionCsReq(); + } + + /** + * optional uint32 sub_mission_id = 11; + * @return whether the subMissionId field is set + */ + public boolean hasSubMissionId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 sub_mission_id = 11; + * @return this + */ + public FinishTalkMissionCsReq clearSubMissionId() { + bitField0_ &= ~0x00000001; + subMissionId = 0; + return this; + } + + /** + * optional uint32 sub_mission_id = 11; + * @return the subMissionId + */ + public int getSubMissionId() { + return subMissionId; + } + + /** + * optional uint32 sub_mission_id = 11; + * @param value the subMissionId to set + * @return this + */ + public FinishTalkMissionCsReq setSubMissionId(final int value) { + bitField0_ |= 0x00000001; + subMissionId = value; + return this; + } + + /** + * optional string talk_str = 2; + * @return whether the talkStr field is set + */ + public boolean hasTalkStr() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional string talk_str = 2; + * @return this + */ + public FinishTalkMissionCsReq clearTalkStr() { + bitField0_ &= ~0x00000002; + talkStr.clear(); + return this; + } + + /** + * optional string talk_str = 2; + * @return the talkStr + */ + public String getTalkStr() { + return talkStr.getString(); + } + + /** + * optional string talk_str = 2; + * @return internal {@code Utf8String} representation of talkStr for reading + */ + public Utf8String getTalkStrBytes() { + return this.talkStr; + } + + /** + * optional string talk_str = 2; + * @return internal {@code Utf8String} representation of talkStr for modifications + */ + public Utf8String getMutableTalkStrBytes() { + bitField0_ |= 0x00000002; + return this.talkStr; + } + + /** + * optional string talk_str = 2; + * @param value the talkStr to set + * @return this + */ + public FinishTalkMissionCsReq setTalkStr(final CharSequence value) { + bitField0_ |= 0x00000002; + talkStr.copyFrom(value); + return this; + } + + /** + * optional string talk_str = 2; + * @param value the talkStr to set + * @return this + */ + public FinishTalkMissionCsReq setTalkStr(final Utf8String value) { + bitField0_ |= 0x00000002; + talkStr.copyFrom(value); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 5; + * @return whether the customValueList field is set + */ + public boolean hasCustomValueList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 5; + * @return this + */ + public FinishTalkMissionCsReq clearCustomValueList() { + bitField0_ &= ~0x00000004; + customValueList.clear(); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_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 #getMutableCustomValueList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getCustomValueList( + ) { + return customValueList; + } + + /** + * repeated .MissionCustomValueData custom_value_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 getMutableCustomValueList( + ) { + bitField0_ |= 0x00000004; + return customValueList; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 5; + * @param value the customValueList to add + * @return this + */ + public FinishTalkMissionCsReq addCustomValueList( + final MissionCustomValueDataOuterClass.MissionCustomValueData value) { + bitField0_ |= 0x00000004; + customValueList.add(value); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 5; + * @param values the customValueList to add + * @return this + */ + public FinishTalkMissionCsReq addAllCustomValueList( + final MissionCustomValueDataOuterClass.MissionCustomValueData... values) { + bitField0_ |= 0x00000004; + customValueList.addAll(values); + return this; + } + + @Override + public FinishTalkMissionCsReq copyFrom(final FinishTalkMissionCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + subMissionId = other.subMissionId; + talkStr.copyFrom(other.talkStr); + customValueList.copyFrom(other.customValueList); + } + return this; + } + + @Override + public FinishTalkMissionCsReq mergeFrom(final FinishTalkMissionCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSubMissionId()) { + setSubMissionId(other.subMissionId); + } + if (other.hasTalkStr()) { + getMutableTalkStrBytes().copyFrom(other.talkStr); + } + if (other.hasCustomValueList()) { + getMutableCustomValueList().addAll(other.customValueList); + } + return this; + } + + @Override + public FinishTalkMissionCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + subMissionId = 0; + talkStr.clear(); + customValueList.clear(); + return this; + } + + @Override + public FinishTalkMissionCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + talkStr.clear(); + customValueList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof FinishTalkMissionCsReq)) { + return false; + } + FinishTalkMissionCsReq other = (FinishTalkMissionCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasSubMissionId() || subMissionId == other.subMissionId) + && (!hasTalkStr() || talkStr.equals(other.talkStr)) + && (!hasCustomValueList() || customValueList.equals(other.customValueList)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(subMissionId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 18); + output.writeStringNoTag(talkStr); + } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < customValueList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(customValueList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(subMissionId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(talkStr); + } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * customValueList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(customValueList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public FinishTalkMissionCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 88: { + // subMissionId + subMissionId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // talkStr + input.readString(talkStr); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // customValueList + tag = input.readRepeatedMessage(customValueList, tag); + bitField0_ |= 0x00000004; + 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.subMissionId, subMissionId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeString(FieldNames.talkStr, talkStr); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedMessage(FieldNames.customValueList, customValueList); + } + output.endObject(); + } + + @Override + public FinishTalkMissionCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -955858585: + case -1513479155: { + if (input.isAtField(FieldNames.subMissionId)) { + if (!input.trySkipNullValue()) { + subMissionId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1543716379: + case -610210786: { + if (input.isAtField(FieldNames.talkStr)) { + if (!input.trySkipNullValue()) { + input.readString(talkStr); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2009823550: + case 1803812922: { + if (input.isAtField(FieldNames.customValueList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(customValueList); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public FinishTalkMissionCsReq clone() { + return new FinishTalkMissionCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static FinishTalkMissionCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new FinishTalkMissionCsReq(), data).checkInitialized(); + } + + public static FinishTalkMissionCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new FinishTalkMissionCsReq(), input).checkInitialized(); + } + + public static FinishTalkMissionCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new FinishTalkMissionCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating FinishTalkMissionCsReq messages + */ + public static MessageFactory getFactory() { + return FinishTalkMissionCsReqFactory.INSTANCE; + } + + private enum FinishTalkMissionCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public FinishTalkMissionCsReq create() { + return FinishTalkMissionCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + 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/FinishTalkMissionScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java new file mode 100644 index 0000000..c7bdc01 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/FinishTalkMissionScRspOuterClass.java @@ -0,0 +1,570 @@ +// 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; +import us.hebi.quickbuf.Utf8String; + +public final class FinishTalkMissionScRspOuterClass { + /** + * Protobuf type {@code FinishTalkMissionScRsp} + */ + public static final class FinishTalkMissionScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 sub_mission_id = 3; + */ + private int subMissionId; + + /** + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional string talk_str = 9; + */ + private final Utf8String talkStr = Utf8String.newEmptyInstance(); + + /** + * repeated .MissionCustomValueData custom_value_list = 7; + */ + private final RepeatedMessage customValueList = RepeatedMessage.newEmptyInstance(MissionCustomValueDataOuterClass.MissionCustomValueData.getFactory()); + + private FinishTalkMissionScRsp() { + } + + /** + * @return a new empty instance of {@code FinishTalkMissionScRsp} + */ + public static FinishTalkMissionScRsp newInstance() { + return new FinishTalkMissionScRsp(); + } + + /** + * optional uint32 sub_mission_id = 3; + * @return whether the subMissionId field is set + */ + public boolean hasSubMissionId() { + 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; + * @return this + */ + public FinishTalkMissionScRsp 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 FinishTalkMissionScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional string talk_str = 9; + * @return whether the talkStr field is set + */ + public boolean hasTalkStr() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional string talk_str = 9; + * @return this + */ + public FinishTalkMissionScRsp clearTalkStr() { + bitField0_ &= ~0x00000004; + talkStr.clear(); + return this; + } + + /** + * optional string talk_str = 9; + * @return the talkStr + */ + public String getTalkStr() { + return talkStr.getString(); + } + + /** + * optional string talk_str = 9; + * @return internal {@code Utf8String} representation of talkStr for reading + */ + public Utf8String getTalkStrBytes() { + return this.talkStr; + } + + /** + * optional string talk_str = 9; + * @return internal {@code Utf8String} representation of talkStr for modifications + */ + public Utf8String getMutableTalkStrBytes() { + bitField0_ |= 0x00000004; + return this.talkStr; + } + + /** + * optional string talk_str = 9; + * @param value the talkStr to set + * @return this + */ + public FinishTalkMissionScRsp setTalkStr(final CharSequence value) { + bitField0_ |= 0x00000004; + talkStr.copyFrom(value); + return this; + } + + /** + * optional string talk_str = 9; + * @param value the talkStr to set + * @return this + */ + public FinishTalkMissionScRsp setTalkStr(final Utf8String value) { + bitField0_ |= 0x00000004; + talkStr.copyFrom(value); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 7; + * @return whether the customValueList field is set + */ + public boolean hasCustomValueList() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 7; + * @return this + */ + public FinishTalkMissionScRsp clearCustomValueList() { + bitField0_ &= ~0x00000008; + customValueList.clear(); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_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 #getMutableCustomValueList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getCustomValueList( + ) { + return customValueList; + } + + /** + * repeated .MissionCustomValueData custom_value_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 getMutableCustomValueList( + ) { + bitField0_ |= 0x00000008; + return customValueList; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 7; + * @param value the customValueList to add + * @return this + */ + public FinishTalkMissionScRsp addCustomValueList( + final MissionCustomValueDataOuterClass.MissionCustomValueData value) { + bitField0_ |= 0x00000008; + customValueList.add(value); + return this; + } + + /** + * repeated .MissionCustomValueData custom_value_list = 7; + * @param values the customValueList to add + * @return this + */ + public FinishTalkMissionScRsp addAllCustomValueList( + final MissionCustomValueDataOuterClass.MissionCustomValueData... values) { + bitField0_ |= 0x00000008; + customValueList.addAll(values); + return this; + } + + @Override + public FinishTalkMissionScRsp copyFrom(final FinishTalkMissionScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + subMissionId = other.subMissionId; + retcode = other.retcode; + talkStr.copyFrom(other.talkStr); + customValueList.copyFrom(other.customValueList); + } + return this; + } + + @Override + public FinishTalkMissionScRsp mergeFrom(final FinishTalkMissionScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSubMissionId()) { + setSubMissionId(other.subMissionId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasTalkStr()) { + getMutableTalkStrBytes().copyFrom(other.talkStr); + } + if (other.hasCustomValueList()) { + getMutableCustomValueList().addAll(other.customValueList); + } + return this; + } + + @Override + public FinishTalkMissionScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + subMissionId = 0; + retcode = 0; + talkStr.clear(); + customValueList.clear(); + return this; + } + + @Override + public FinishTalkMissionScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + talkStr.clear(); + customValueList.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof FinishTalkMissionScRsp)) { + return false; + } + FinishTalkMissionScRsp other = (FinishTalkMissionScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasSubMissionId() || subMissionId == other.subMissionId) + && (!hasRetcode() || retcode == other.retcode) + && (!hasTalkStr() || talkStr.equals(other.talkStr)) + && (!hasCustomValueList() || customValueList.equals(other.customValueList)); + } + + @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.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 74); + output.writeStringNoTag(talkStr); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < customValueList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(customValueList.get(i)); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(subMissionId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(talkStr); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * customValueList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(customValueList); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public FinishTalkMissionScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + 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: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // talkStr + input.readString(talkStr); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // customValueList + tag = input.readRepeatedMessage(customValueList, tag); + bitField0_ |= 0x00000008; + 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.subMissionId, subMissionId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeString(FieldNames.talkStr, talkStr); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedMessage(FieldNames.customValueList, customValueList); + } + output.endObject(); + } + + @Override + public FinishTalkMissionScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -955858585: + case -1513479155: { + if (input.isAtField(FieldNames.subMissionId)) { + if (!input.trySkipNullValue()) { + subMissionId = 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 -1543716379: + case -610210786: { + if (input.isAtField(FieldNames.talkStr)) { + if (!input.trySkipNullValue()) { + input.readString(talkStr); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2009823550: + case 1803812922: { + if (input.isAtField(FieldNames.customValueList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(customValueList); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public FinishTalkMissionScRsp clone() { + return new FinishTalkMissionScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static FinishTalkMissionScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new FinishTalkMissionScRsp(), data).checkInitialized(); + } + + public static FinishTalkMissionScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new FinishTalkMissionScRsp(), input).checkInitialized(); + } + + public static FinishTalkMissionScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new FinishTalkMissionScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating FinishTalkMissionScRsp messages + */ + public static MessageFactory getFactory() { + return FinishTalkMissionScRspFactory.INSTANCE; + } + + private enum FinishTalkMissionScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public FinishTalkMissionScRsp create() { + return FinishTalkMissionScRsp.newInstance(); + } + } + + /** + * 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 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 1dd52d4..fc8725e 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 = 7; + * optional .SimpleInfo simple_info = 12; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 12; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 12; * @return this */ public FriendApplyInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_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. @@ -66,7 +66,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_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 @@ -80,7 +80,7 @@ public final class FriendApplyInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 12; * @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) 58); + output.writeRawByte((byte) 98); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendApplyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 98: { // 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 e36ae8c..46af1af 100644 --- a/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/FriendListInfoOuterClass.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.Utf8String; public final class FriendListInfoOuterClass { /** @@ -19,15 +20,25 @@ public final class FriendListInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .PlayingState playing_state = 5; + * optional .PlayingState playing_state = 9; */ private int playingState; /** - * optional .SimpleInfo simple_info = 7; + * optional bool is_marked = 7; + */ + private boolean isMarked; + + /** + * optional .SimpleInfo simple_info = 2; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); + /** + * optional string remark_name = 13; + */ + private final Utf8String remarkName = Utf8String.newEmptyInstance(); + private FriendListInfo() { } @@ -39,7 +50,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 5; + * optional .PlayingState playing_state = 9; * @return whether the playingState field is set */ public boolean hasPlayingState() { @@ -47,7 +58,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 5; + * optional .PlayingState playing_state = 9; * @return this */ public FriendListInfo clearPlayingState() { @@ -57,7 +68,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 5; + * optional .PlayingState playing_state = 9; * @return the playingState */ public PlayingStateOuterClass.PlayingState getPlayingState() { @@ -90,7 +101,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .PlayingState playing_state = 5; + * optional .PlayingState playing_state = 9; * @param value the playingState to set * @return this */ @@ -101,25 +112,62 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; - * @return whether the simpleInfo field is set + * optional bool is_marked = 7; + * @return whether the isMarked field is set */ - public boolean hasSimpleInfo() { + public boolean hasIsMarked() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .SimpleInfo simple_info = 7; + * optional bool is_marked = 7; + * @return this + */ + public FriendListInfo clearIsMarked() { + bitField0_ &= ~0x00000002; + isMarked = false; + return this; + } + + /** + * optional bool is_marked = 7; + * @return the isMarked + */ + public boolean getIsMarked() { + return isMarked; + } + + /** + * optional bool is_marked = 7; + * @param value the isMarked to set + * @return this + */ + public FriendListInfo setIsMarked(final boolean value) { + bitField0_ |= 0x00000002; + isMarked = value; + return this; + } + + /** + * optional .SimpleInfo simple_info = 2; + * @return whether the simpleInfo field is set + */ + public boolean hasSimpleInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .SimpleInfo simple_info = 2; * @return this */ public FriendListInfo clearSimpleInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; simpleInfo.clear(); return this; } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_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. @@ -133,7 +181,7 @@ public final class FriendListInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_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 @@ -142,28 +190,95 @@ public final class FriendListInfoOuterClass { * @return internal storage object for modifications */ public SimpleInfoOuterClass.SimpleInfo getMutableSimpleInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return simpleInfo; } /** - * optional .SimpleInfo simple_info = 7; + * optional .SimpleInfo simple_info = 2; * @param value the simpleInfo to set * @return this */ public FriendListInfo setSimpleInfo(final SimpleInfoOuterClass.SimpleInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; simpleInfo.copyFrom(value); return this; } + /** + * optional string remark_name = 13; + * @return whether the remarkName field is set + */ + public boolean hasRemarkName() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional string remark_name = 13; + * @return this + */ + public FriendListInfo clearRemarkName() { + bitField0_ &= ~0x00000008; + remarkName.clear(); + return this; + } + + /** + * optional string remark_name = 13; + * @return the remarkName + */ + public String getRemarkName() { + return remarkName.getString(); + } + + /** + * optional string remark_name = 13; + * @return internal {@code Utf8String} representation of remarkName for reading + */ + public Utf8String getRemarkNameBytes() { + return this.remarkName; + } + + /** + * optional string remark_name = 13; + * @return internal {@code Utf8String} representation of remarkName for modifications + */ + public Utf8String getMutableRemarkNameBytes() { + bitField0_ |= 0x00000008; + return this.remarkName; + } + + /** + * optional string remark_name = 13; + * @param value the remarkName to set + * @return this + */ + public FriendListInfo setRemarkName(final CharSequence value) { + bitField0_ |= 0x00000008; + remarkName.copyFrom(value); + return this; + } + + /** + * optional string remark_name = 13; + * @param value the remarkName to set + * @return this + */ + public FriendListInfo setRemarkName(final Utf8String value) { + bitField0_ |= 0x00000008; + remarkName.copyFrom(value); + return this; + } + @Override public FriendListInfo copyFrom(final FriendListInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; playingState = other.playingState; + isMarked = other.isMarked; simpleInfo.copyFrom(other.simpleInfo); + remarkName.copyFrom(other.remarkName); } return this; } @@ -177,9 +292,15 @@ public final class FriendListInfoOuterClass { if (other.hasPlayingState()) { setPlayingStateValue(other.playingState); } + if (other.hasIsMarked()) { + setIsMarked(other.isMarked); + } if (other.hasSimpleInfo()) { getMutableSimpleInfo().mergeFrom(other.simpleInfo); } + if (other.hasRemarkName()) { + getMutableRemarkNameBytes().copyFrom(other.remarkName); + } return this; } @@ -191,7 +312,9 @@ public final class FriendListInfoOuterClass { cachedSize = -1; bitField0_ = 0; playingState = 0; + isMarked = false; simpleInfo.clear(); + remarkName.clear(); return this; } @@ -203,6 +326,7 @@ public final class FriendListInfoOuterClass { cachedSize = -1; bitField0_ = 0; simpleInfo.clearQuick(); + remarkName.clear(); return this; } @@ -217,19 +341,29 @@ public final class FriendListInfoOuterClass { FriendListInfo other = (FriendListInfo) o; return bitField0_ == other.bitField0_ && (!hasPlayingState() || playingState == other.playingState) - && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo)); + && (!hasIsMarked() || isMarked == other.isMarked) + && (!hasSimpleInfo() || simpleInfo.equals(other.simpleInfo)) + && (!hasRemarkName() || remarkName.equals(other.remarkName)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeEnumNoTag(playingState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 56); + output.writeBoolNoTag(isMarked); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 18); output.writeMessageNoTag(simpleInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 106); + output.writeStringNoTag(remarkName); + } } @Override @@ -239,8 +373,14 @@ public final class FriendListInfoOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(playingState); } if ((bitField0_ & 0x00000002) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(simpleInfo); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(remarkName); + } return size; } @@ -251,7 +391,7 @@ public final class FriendListInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 72: { // playingState final int value = input.readInt32(); if (PlayingStateOuterClass.PlayingState.forNumber(value) != null) { @@ -259,14 +399,32 @@ public final class FriendListInfoOuterClass { bitField0_ |= 0x00000001; } tag = input.readTag(); - if (tag != 58) { + if (tag != 56) { break; } } - case 58: { + case 56: { + // isMarked + isMarked = input.readBool(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // simpleInfo input.readMessage(simpleInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // remarkName + input.readString(remarkName); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -293,8 +451,14 @@ public final class FriendListInfoOuterClass { output.writeEnum(FieldNames.playingState, playingState, PlayingStateOuterClass.PlayingState.converter()); } if ((bitField0_ & 0x00000002) != 0) { + output.writeBool(FieldNames.isMarked, isMarked); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.simpleInfo, simpleInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeString(FieldNames.remarkName, remarkName); + } output.endObject(); } @@ -322,12 +486,36 @@ public final class FriendListInfoOuterClass { } break; } + case -407271946: + case -617266975: { + if (input.isAtField(FieldNames.isMarked)) { + if (!input.trySkipNullValue()) { + isMarked = input.readBool(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -1431903872: case -1419171045: { if (input.isAtField(FieldNames.simpleInfo)) { if (!input.trySkipNullValue()) { input.readMessage(simpleInfo); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1449259563: + case 1993449450: { + if (input.isAtField(FieldNames.remarkName)) { + if (!input.trySkipNullValue()) { + input.readString(remarkName); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -389,7 +577,11 @@ public final class FriendListInfoOuterClass { static class FieldNames { static final FieldName playingState = FieldName.forField("playingState", "playing_state"); + static final FieldName isMarked = FieldName.forField("isMarked", "is_marked"); + static final FieldName simpleInfo = FieldName.forField("simpleInfo", "simple_info"); + + static final FieldName remarkName = FieldName.forField("remarkName", "remark_name"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/FriendRecommendInfoOuterClass.java index 97b22f6..ff8b69c 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 = 1; + * optional .SimpleInfo simple_info = 3; */ private final SimpleInfoOuterClass.SimpleInfo simpleInfo = SimpleInfoOuterClass.SimpleInfo.newInstance(); @@ -34,7 +34,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 3; * @return whether the simpleInfo field is set */ public boolean hasSimpleInfo() { @@ -42,7 +42,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 3; * @return this */ public FriendRecommendInfo clearSimpleInfo() { @@ -52,7 +52,7 @@ public final class FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_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 FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_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 FriendRecommendInfoOuterClass { } /** - * optional .SimpleInfo simple_info = 1; + * optional .SimpleInfo simple_info = 3; * @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) 10); + output.writeRawByte((byte) 26); output.writeMessageNoTag(simpleInfo); } } @@ -171,7 +171,7 @@ public final class FriendRecommendInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 26: { // 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 292af81..e39bcb0 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaCeilingAvatarOuterClass.java @@ -19,15 +19,15 @@ public final class GachaCeilingAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 repeated_cnt = 3; - */ - private int repeatedCnt; - - /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 12; */ private int avatarId; + /** + * optional uint32 repeated_cnt = 14; + */ + private int repeatedCnt; + private GachaCeilingAvatar() { } @@ -39,62 +39,25 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 repeated_cnt = 3; - * @return whether the repeatedCnt field is set + * optional uint32 avatar_id = 12; + * @return whether the avatarId field is set */ - public boolean hasRepeatedCnt() { + public boolean hasAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 repeated_cnt = 3; - * @return this - */ - public GachaCeilingAvatar clearRepeatedCnt() { - bitField0_ &= ~0x00000001; - repeatedCnt = 0; - return this; - } - - /** - * optional uint32 repeated_cnt = 3; - * @return the repeatedCnt - */ - public int getRepeatedCnt() { - return repeatedCnt; - } - - /** - * optional uint32 repeated_cnt = 3; - * @param value the repeatedCnt to set - * @return this - */ - public GachaCeilingAvatar setRepeatedCnt(final int value) { - bitField0_ |= 0x00000001; - repeatedCnt = 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 = 12; * @return this */ public GachaCeilingAvatar clearAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; avatarId = 0; return this; } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 12; * @return the avatarId */ public int getAvatarId() { @@ -102,23 +65,60 @@ public final class GachaCeilingAvatarOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 12; * @param value the avatarId to set * @return this */ public GachaCeilingAvatar setAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; avatarId = value; return this; } + /** + * optional uint32 repeated_cnt = 14; + * @return whether the repeatedCnt field is set + */ + public boolean hasRepeatedCnt() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 repeated_cnt = 14; + * @return this + */ + public GachaCeilingAvatar clearRepeatedCnt() { + bitField0_ &= ~0x00000002; + repeatedCnt = 0; + return this; + } + + /** + * optional uint32 repeated_cnt = 14; + * @return the repeatedCnt + */ + public int getRepeatedCnt() { + return repeatedCnt; + } + + /** + * optional uint32 repeated_cnt = 14; + * @param value the repeatedCnt to set + * @return this + */ + public GachaCeilingAvatar setRepeatedCnt(final int value) { + bitField0_ |= 0x00000002; + repeatedCnt = value; + return this; + } + @Override public GachaCeilingAvatar copyFrom(final GachaCeilingAvatar other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - repeatedCnt = other.repeatedCnt; avatarId = other.avatarId; + repeatedCnt = other.repeatedCnt; } return this; } @@ -129,12 +129,12 @@ public final class GachaCeilingAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasRepeatedCnt()) { - setRepeatedCnt(other.repeatedCnt); - } if (other.hasAvatarId()) { setAvatarId(other.avatarId); } + if (other.hasRepeatedCnt()) { + setRepeatedCnt(other.repeatedCnt); + } return this; } @@ -145,8 +145,8 @@ public final class GachaCeilingAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - repeatedCnt = 0; avatarId = 0; + repeatedCnt = 0; return this; } @@ -170,19 +170,19 @@ public final class GachaCeilingAvatarOuterClass { } GachaCeilingAvatar other = (GachaCeilingAvatar) o; return bitField0_ == other.bitField0_ - && (!hasRepeatedCnt() || repeatedCnt == other.repeatedCnt) - && (!hasAvatarId() || avatarId == other.avatarId); + && (!hasAvatarId() || avatarId == other.avatarId) + && (!hasRepeatedCnt() || repeatedCnt == other.repeatedCnt); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(repeatedCnt); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(repeatedCnt); } } @@ -190,10 +190,10 @@ public final class GachaCeilingAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(repeatedCnt); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(repeatedCnt); } return size; } @@ -205,18 +205,18 @@ public final class GachaCeilingAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // repeatedCnt - repeatedCnt = input.readUInt32(); + case 96: { + // avatarId + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 112) { break; } } - case 72: { - // avatarId - avatarId = input.readUInt32(); + case 112: { + // repeatedCnt + repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class GachaCeilingAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.repeatedCnt, repeatedCnt); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.repeatedCnt, repeatedCnt); } output.endObject(); } @@ -256,11 +256,11 @@ public final class GachaCeilingAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1602543503: - case -1859935452: { - if (input.isAtField(FieldNames.repeatedCnt)) { + case 1787287636: + case -428636735: { + if (input.isAtField(FieldNames.avatarId)) { if (!input.trySkipNullValue()) { - repeatedCnt = input.readUInt32(); + avatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class GachaCeilingAvatarOuterClass { } break; } - case 1787287636: - case -428636735: { - if (input.isAtField(FieldNames.avatarId)) { + case 1602543503: + case -1859935452: { + if (input.isAtField(FieldNames.repeatedCnt)) { if (!input.trySkipNullValue()) { - avatarId = input.readUInt32(); + repeatedCnt = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class GachaCeilingAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName repeatedCnt = FieldName.forField("repeatedCnt", "repeated_cnt"); - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + + static final FieldName repeatedCnt = FieldName.forField("repeatedCnt", "repeated_cnt"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaCeilingOuterClass.java index 421c258..c11a01b 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 = 4; + * optional uint32 ceiling_num = 14; */ private int ceilingNum; /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 9; */ private boolean isClaimed; /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar avatar_list = 5; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(GachaCeilingAvatarOuterClass.GachaCeilingAvatar.getFactory()); @@ -45,7 +45,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 14; * @return whether the ceilingNum field is set */ public boolean hasCeilingNum() { @@ -53,7 +53,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 14; * @return this */ public GachaCeiling clearCeilingNum() { @@ -63,7 +63,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 14; * @return the ceilingNum */ public int getCeilingNum() { @@ -71,7 +71,7 @@ public final class GachaCeilingOuterClass { } /** - * optional uint32 ceiling_num = 4; + * optional uint32 ceiling_num = 14; * @param value the ceilingNum to set * @return this */ @@ -82,7 +82,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 9; * @return whether the isClaimed field is set */ public boolean hasIsClaimed() { @@ -90,7 +90,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 9; * @return this */ public GachaCeiling clearIsClaimed() { @@ -100,7 +100,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 9; * @return the isClaimed */ public boolean getIsClaimed() { @@ -108,7 +108,7 @@ public final class GachaCeilingOuterClass { } /** - * optional bool is_claimed = 5; + * optional bool is_claimed = 9; * @param value the isClaimed to set * @return this */ @@ -119,7 +119,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar avatar_list = 5; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar avatar_list = 5; * @return this */ public GachaCeiling clearAvatarList() { @@ -137,7 +137,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar 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. @@ -151,7 +151,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar 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 @@ -165,7 +165,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar avatar_list = 5; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GachaCeilingOuterClass { } /** - * repeated .GachaCeilingAvatar avatar_list = 9; + * repeated .GachaCeilingAvatar avatar_list = 5; * @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) 32); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(ceilingNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 72); output.writeBoolNoTag(isClaimed); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 42); output.writeMessageNoTag(avatarList.get(i)); } } @@ -296,25 +296,25 @@ public final class GachaCeilingOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 112: { // ceilingNum ceilingNum = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 72) { break; } } - case 40: { + case 72: { // isClaimed isClaimed = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 42) { break; } } - case 74: { + case 42: { // 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 3447100..123e683 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 begin_time = 1; - */ - private long beginTime; - - /** - * optional int64 end_time = 7; + * optional int64 end_time = 3; */ private long endTime; /** - * optional uint32 gacha_id = 10; + * optional int64 begin_time = 5; + */ + private long beginTime; + + /** + * optional uint32 gacha_id = 9; */ private int gachaId; /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 1; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); /** - * optional string history_url = 4; - */ - private final Utf8String historyUrl = Utf8String.newEmptyInstance(); - - /** - * optional string detail_url = 6; + * optional string detail_url = 2; */ private final Utf8String detailUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 up_info = 11; + * optional string history_url = 7; */ - private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); + private final Utf8String historyUrl = Utf8String.newEmptyInstance(); /** - * repeated uint32 featured = 13; + * repeated uint32 featured = 4; */ private final RepeatedInt featured = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 up_info = 10; + */ + private final RepeatedInt upInfo = RepeatedInt.newEmptyInstance(); + private GachaInfo() { } @@ -71,62 +71,25 @@ public final class GachaInfoOuterClass { } /** - * optional int64 begin_time = 1; - * @return whether the beginTime field is set + * optional int64 end_time = 3; + * @return whether the endTime field is set */ - public boolean hasBeginTime() { + public boolean hasEndTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 begin_time = 1; - * @return this - */ - public GachaInfo clearBeginTime() { - bitField0_ &= ~0x00000001; - beginTime = 0L; - return this; - } - - /** - * optional int64 begin_time = 1; - * @return the beginTime - */ - public long getBeginTime() { - return beginTime; - } - - /** - * optional int64 begin_time = 1; - * @param value the beginTime to set - * @return this - */ - public GachaInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 7; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 7; + * optional int64 end_time = 3; * @return this */ public GachaInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 7; + * optional int64 end_time = 3; * @return the endTime */ public long getEndTime() { @@ -134,18 +97,55 @@ public final class GachaInfoOuterClass { } /** - * optional int64 end_time = 7; + * optional int64 end_time = 3; * @param value the endTime to set * @return this */ public GachaInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 gacha_id = 10; + * optional int64 begin_time = 5; + * @return whether the beginTime field is set + */ + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 begin_time = 5; + * @return this + */ + public GachaInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * optional int64 begin_time = 5; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * optional int64 begin_time = 5; + * @param value the beginTime to set + * @return this + */ + public GachaInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 gacha_id = 9; * @return whether the gachaId field is set */ public boolean hasGachaId() { @@ -153,7 +153,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 9; * @return this */ public GachaInfo clearGachaId() { @@ -163,7 +163,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 9; * @return the gachaId */ public int getGachaId() { @@ -171,7 +171,7 @@ public final class GachaInfoOuterClass { } /** - * optional uint32 gacha_id = 10; + * optional uint32 gacha_id = 9; * @param value the gachaId to set * @return this */ @@ -182,7 +182,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 1; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -190,7 +190,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 1; * @return this */ public GachaInfo clearGachaCeiling() { @@ -200,7 +200,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 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. @@ -214,7 +214,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 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 @@ -228,7 +228,7 @@ public final class GachaInfoOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 5; + * optional .GachaCeiling gacha_ceiling = 1; * @param value the gachaCeiling to set * @return this */ @@ -239,90 +239,25 @@ public final class GachaInfoOuterClass { } /** - * optional string history_url = 4; - * @return whether the historyUrl field is set + * optional string detail_url = 2; + * @return whether the detailUrl field is set */ - public boolean hasHistoryUrl() { + public boolean hasDetailUrl() { return (bitField0_ & 0x00000010) != 0; } /** - * optional string history_url = 4; - * @return this - */ - public GachaInfo clearHistoryUrl() { - bitField0_ &= ~0x00000010; - historyUrl.clear(); - return this; - } - - /** - * optional string history_url = 4; - * @return the historyUrl - */ - public String getHistoryUrl() { - return historyUrl.getString(); - } - - /** - * optional string history_url = 4; - * @return internal {@code Utf8String} representation of historyUrl for reading - */ - public Utf8String getHistoryUrlBytes() { - return this.historyUrl; - } - - /** - * optional string history_url = 4; - * @return internal {@code Utf8String} representation of historyUrl for modifications - */ - public Utf8String getMutableHistoryUrlBytes() { - bitField0_ |= 0x00000010; - return this.historyUrl; - } - - /** - * optional string history_url = 4; - * @param value the historyUrl to set - * @return this - */ - public GachaInfo setHistoryUrl(final CharSequence value) { - bitField0_ |= 0x00000010; - historyUrl.copyFrom(value); - return this; - } - - /** - * optional string history_url = 4; - * @param value the historyUrl to set - * @return this - */ - public GachaInfo setHistoryUrl(final Utf8String value) { - bitField0_ |= 0x00000010; - historyUrl.copyFrom(value); - return this; - } - - /** - * optional string detail_url = 6; - * @return whether the detailUrl field is set - */ - public boolean hasDetailUrl() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @return this */ public GachaInfo clearDetailUrl() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; detailUrl.clear(); return this; } /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @return the detailUrl */ public String getDetailUrl() { @@ -330,7 +265,7 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @return internal {@code Utf8String} representation of detailUrl for reading */ public Utf8String getDetailUrlBytes() { @@ -338,124 +273,121 @@ public final class GachaInfoOuterClass { } /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @return internal {@code Utf8String} representation of detailUrl for modifications */ public Utf8String getMutableDetailUrlBytes() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return this.detailUrl; } /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @param value the detailUrl to set * @return this */ public GachaInfo setDetailUrl(final CharSequence value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; detailUrl.copyFrom(value); return this; } /** - * optional string detail_url = 6; + * optional string detail_url = 2; * @param value the detailUrl to set * @return this */ public GachaInfo setDetailUrl(final Utf8String value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; detailUrl.copyFrom(value); return this; } /** - * repeated uint32 up_info = 11; - * @return whether the upInfo field is set + * optional string history_url = 7; + * @return whether the historyUrl field is set */ - public boolean hasUpInfo() { + public boolean hasHistoryUrl() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional string history_url = 7; + * @return this + */ + public GachaInfo clearHistoryUrl() { + bitField0_ &= ~0x00000020; + historyUrl.clear(); + return this; + } + + /** + * optional string history_url = 7; + * @return the historyUrl + */ + public String getHistoryUrl() { + return historyUrl.getString(); + } + + /** + * optional string history_url = 7; + * @return internal {@code Utf8String} representation of historyUrl for reading + */ + public Utf8String getHistoryUrlBytes() { + return this.historyUrl; + } + + /** + * optional string history_url = 7; + * @return internal {@code Utf8String} representation of historyUrl for modifications + */ + public Utf8String getMutableHistoryUrlBytes() { + bitField0_ |= 0x00000020; + return this.historyUrl; + } + + /** + * optional string history_url = 7; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final CharSequence value) { + bitField0_ |= 0x00000020; + historyUrl.copyFrom(value); + return this; + } + + /** + * optional string history_url = 7; + * @param value the historyUrl to set + * @return this + */ + public GachaInfo setHistoryUrl(final Utf8String value) { + bitField0_ |= 0x00000020; + historyUrl.copyFrom(value); + return this; + } + + /** + * repeated uint32 featured = 4; + * @return whether the featured field is set + */ + public boolean hasFeatured() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated uint32 up_info = 11; - * @return this - */ - public GachaInfo clearUpInfo() { - bitField0_ &= ~0x00000040; - upInfo.clear(); - return this; - } - - /** - * repeated uint32 up_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 #getMutableUpInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUpInfo() { - return upInfo; - } - - /** - * repeated uint32 up_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 RepeatedInt getMutableUpInfo() { - bitField0_ |= 0x00000040; - return upInfo; - } - - /** - * repeated uint32 up_info = 11; - * @param value the upInfo to add - * @return this - */ - public GachaInfo addUpInfo(final int value) { - bitField0_ |= 0x00000040; - upInfo.add(value); - return this; - } - - /** - * repeated uint32 up_info = 11; - * @param values the upInfo to add - * @return this - */ - public GachaInfo addAllUpInfo(final int... values) { - bitField0_ |= 0x00000040; - upInfo.addAll(values); - return this; - } - - /** - * repeated uint32 featured = 13; - * @return whether the featured field is set - */ - public boolean hasFeatured() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated uint32 featured = 13; + * repeated uint32 featured = 4; * @return this */ public GachaInfo clearFeatured() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; featured.clear(); return this; } /** - * repeated uint32 featured = 13; + * 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. @@ -469,7 +401,7 @@ public final class GachaInfoOuterClass { } /** - * repeated uint32 featured = 13; + * 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 @@ -478,45 +410,113 @@ public final class GachaInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableFeatured() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return featured; } /** - * repeated uint32 featured = 13; + * repeated uint32 featured = 4; * @param value the featured to add * @return this */ public GachaInfo addFeatured(final int value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; featured.add(value); return this; } /** - * repeated uint32 featured = 13; + * repeated uint32 featured = 4; * @param values the featured to add * @return this */ public GachaInfo addAllFeatured(final int... values) { - bitField0_ |= 0x00000080; + 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; + * @return this + */ + public GachaInfo clearUpInfo() { + bitField0_ &= ~0x00000080; + upInfo.clear(); + return this; + } + + /** + * repeated uint32 up_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 #getMutableUpInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUpInfo() { + return upInfo; + } + + /** + * repeated uint32 up_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 RepeatedInt getMutableUpInfo() { + bitField0_ |= 0x00000080; + return upInfo; + } + + /** + * repeated uint32 up_info = 10; + * @param value the upInfo to add + * @return this + */ + public GachaInfo addUpInfo(final int value) { + bitField0_ |= 0x00000080; + upInfo.add(value); + return this; + } + + /** + * repeated uint32 up_info = 10; + * @param values the upInfo to add + * @return this + */ + public GachaInfo addAllUpInfo(final int... values) { + bitField0_ |= 0x00000080; + upInfo.addAll(values); + return this; + } + @Override public GachaInfo copyFrom(final GachaInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; + beginTime = other.beginTime; gachaId = other.gachaId; gachaCeiling.copyFrom(other.gachaCeiling); - historyUrl.copyFrom(other.historyUrl); detailUrl.copyFrom(other.detailUrl); - upInfo.copyFrom(other.upInfo); + historyUrl.copyFrom(other.historyUrl); featured.copyFrom(other.featured); + upInfo.copyFrom(other.upInfo); } return this; } @@ -527,30 +527,30 @@ public final class GachaInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); + } if (other.hasGachaId()) { setGachaId(other.gachaId); } if (other.hasGachaCeiling()) { getMutableGachaCeiling().mergeFrom(other.gachaCeiling); } - if (other.hasHistoryUrl()) { - getMutableHistoryUrlBytes().copyFrom(other.historyUrl); - } if (other.hasDetailUrl()) { getMutableDetailUrlBytes().copyFrom(other.detailUrl); } - if (other.hasUpInfo()) { - getMutableUpInfo().addAll(other.upInfo); + if (other.hasHistoryUrl()) { + getMutableHistoryUrlBytes().copyFrom(other.historyUrl); } if (other.hasFeatured()) { getMutableFeatured().addAll(other.featured); } + if (other.hasUpInfo()) { + getMutableUpInfo().addAll(other.upInfo); + } return this; } @@ -561,14 +561,14 @@ public final class GachaInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; + beginTime = 0L; gachaId = 0; gachaCeiling.clear(); - historyUrl.clear(); detailUrl.clear(); - upInfo.clear(); + historyUrl.clear(); featured.clear(); + upInfo.clear(); return this; } @@ -580,10 +580,10 @@ public final class GachaInfoOuterClass { cachedSize = -1; bitField0_ = 0; gachaCeiling.clearQuick(); - historyUrl.clear(); detailUrl.clear(); - upInfo.clear(); + historyUrl.clear(); featured.clear(); + upInfo.clear(); return this; } @@ -597,52 +597,52 @@ public final class GachaInfoOuterClass { } GachaInfo other = (GachaInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasGachaId() || gachaId == other.gachaId) && (!hasGachaCeiling() || gachaCeiling.equals(other.gachaCeiling)) - && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) && (!hasDetailUrl() || detailUrl.equals(other.detailUrl)) - && (!hasUpInfo() || upInfo.equals(other.upInfo)) - && (!hasFeatured() || featured.equals(other.featured)); + && (!hasHistoryUrl() || historyUrl.equals(other.historyUrl)) + && (!hasFeatured() || featured.equals(other.featured)) + && (!hasUpInfo() || upInfo.equals(other.upInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeInt64NoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 24); output.writeInt64NoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeInt64NoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(gachaId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 10); output.writeMessageNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 34); - output.writeStringNoTag(historyUrl); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 18); output.writeStringNoTag(detailUrl); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 58); + output.writeStringNoTag(historyUrl); + } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < upInfo.length(); i++) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(upInfo.array()[i]); + for (int i = 0; i < featured.length(); i++) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(featured.array()[i]); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < featured.length(); i++) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(featured.array()[i]); + for (int i = 0; i < upInfo.length(); i++) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(upInfo.array()[i]); } } } @@ -651,10 +651,10 @@ public final class GachaInfoOuterClass { 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(gachaId); @@ -663,16 +663,16 @@ public final class GachaInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(detailUrl); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(historyUrl); + } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); + size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * featured.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(featured); + size += (1 * upInfo.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(upInfo); } return size; } @@ -684,72 +684,72 @@ public final class GachaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 24: { // endTime endTime = input.readInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 40) { break; } } - case 80: { + case 40: { + // beginTime + beginTime = input.readInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { // gachaId gachaId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 10) { break; } } - case 42: { + case 10: { // 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; + } + } + case 58: { + // historyUrl + input.readString(historyUrl); + bitField0_ |= 0x00000020; + tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // historyUrl - input.readString(historyUrl); - bitField0_ |= 0x00000010; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // detailUrl - input.readString(detailUrl); - bitField0_ |= 0x00000020; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { - // upInfo [packed=true] - input.readPackedUInt32(upInfo, tag); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { // featured [packed=true] input.readPackedUInt32(featured, tag); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // upInfo [packed=true] + input.readPackedUInt32(upInfo, tag); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -766,15 +766,15 @@ public final class GachaInfoOuterClass { tag = input.readTag(); break; } - case 88: { - // upInfo [packed=false] - tag = input.readRepeatedUInt32(upInfo, tag); + case 32: { + // featured [packed=false] + tag = input.readRepeatedUInt32(featured, tag); bitField0_ |= 0x00000040; break; } - case 104: { - // featured [packed=false] - tag = input.readRepeatedUInt32(featured, tag); + case 80: { + // upInfo [packed=false] + tag = input.readRepeatedUInt32(upInfo, tag); bitField0_ |= 0x00000080; break; } @@ -786,10 +786,10 @@ public final class GachaInfoOuterClass { 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.gachaId, gachaId); @@ -798,16 +798,16 @@ public final class GachaInfoOuterClass { output.writeMessage(FieldNames.gachaCeiling, gachaCeiling); } if ((bitField0_ & 0x00000010) != 0) { - output.writeString(FieldNames.historyUrl, historyUrl); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeString(FieldNames.detailUrl, detailUrl); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeString(FieldNames.historyUrl, historyUrl); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); + output.writeRepeatedUInt32(FieldNames.featured, featured); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.featured, featured); + output.writeRepeatedUInt32(FieldNames.upInfo, upInfo); } output.endObject(); } @@ -819,11 +819,11 @@ public final class GachaInfoOuterClass { } 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 { @@ -831,11 +831,11 @@ public final class GachaInfoOuterClass { } 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 { @@ -867,11 +867,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_ |= 0x00000010; } } else { @@ -879,11 +879,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_ |= 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 { @@ -966,21 +966,21 @@ public final class GachaInfoOuterClass { * 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 gachaId = FieldName.forField("gachaId", "gacha_id"); static final FieldName gachaCeiling = FieldName.forField("gachaCeiling", "gacha_ceiling"); - static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); - static final FieldName detailUrl = FieldName.forField("detailUrl", "detail_url"); - static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); + static final FieldName historyUrl = FieldName.forField("historyUrl", "history_url"); static final FieldName featured = FieldName.forField("featured"); + + static final FieldName upInfo = FieldName.forField("upInfo", "up_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java index cd9c943..29a1d3b 100644 --- a/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GachaItemOuterClass.java @@ -24,17 +24,17 @@ public final class GachaItemOuterClass { private boolean isNew; /** - * optional .ItemList token_item = 1; + * optional .ItemList token_item = 8; */ private final ItemListOuterClass.ItemList tokenItem = ItemListOuterClass.ItemList.newInstance(); /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 13; */ private final ItemOuterClass.Item gachaItem = ItemOuterClass.Item.newInstance(); /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_item_list = 15; */ private final ItemListOuterClass.ItemList transferItemList = ItemListOuterClass.ItemList.newInstance(); @@ -86,7 +86,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 1; + * optional .ItemList token_item = 8; * @return whether the tokenItem field is set */ public boolean hasTokenItem() { @@ -94,7 +94,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 1; + * optional .ItemList token_item = 8; * @return this */ public GachaItem clearTokenItem() { @@ -104,7 +104,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 1; + * 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. @@ -118,7 +118,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 1; + * 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 @@ -132,7 +132,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList token_item = 1; + * optional .ItemList token_item = 8; * @param value the tokenItem to set * @return this */ @@ -143,7 +143,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 13; * @return whether the gachaItem field is set */ public boolean hasGachaItem() { @@ -151,7 +151,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 13; * @return this */ public GachaItem clearGachaItem() { @@ -161,7 +161,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 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. @@ -175,7 +175,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 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 @@ -189,7 +189,7 @@ public final class GachaItemOuterClass { } /** - * optional .Item gacha_item = 6; + * optional .Item gacha_item = 13; * @param value the gachaItem to set * @return this */ @@ -200,7 +200,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_item_list = 15; * @return whether the transferItemList field is set */ public boolean hasTransferItemList() { @@ -208,7 +208,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_item_list = 15; * @return this */ public GachaItem clearTransferItemList() { @@ -218,7 +218,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_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. @@ -232,7 +232,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_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 @@ -246,7 +246,7 @@ public final class GachaItemOuterClass { } /** - * optional .ItemList transfer_item_list = 9; + * optional .ItemList transfer_item_list = 15; * @param value the transferItemList to set * @return this */ @@ -340,15 +340,15 @@ public final class GachaItemOuterClass { output.writeBoolNoTag(isNew); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 66); output.writeMessageNoTag(tokenItem); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 106); output.writeMessageNoTag(gachaItem); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(transferItemList); } } @@ -383,29 +383,29 @@ public final class GachaItemOuterClass { isNew = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { + case 66: { // tokenItem input.readMessage(tokenItem); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { + if (tag != 106) { break; } } - case 50: { + case 106: { // gachaItem input.readMessage(gachaItem); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // transferItemList input.readMessage(transferItemList); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java index 7f1558d..6926de5 100644 --- a/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GateserverOuterClass.java @@ -20,95 +20,95 @@ public final class GateserverOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 port = 3; + * optional uint32 port = 11; */ private int port; /** - * optional bool unk1 = 7; + * optional bool unk1 = 9; */ private boolean unk1; /** - * optional bool unk2 = 11; + * optional bool unk2 = 12; */ private boolean unk2; /** - * optional bool unk3 = 33; + * optional bool unk3 = 1020; */ private boolean unk3; /** - * optional bool unk4 = 859; + * optional bool unk4 = 1353; */ private boolean unk4; /** - * optional bool unk5 = 1213; + * optional bool unk5 = 1433; */ private boolean unk5; /** - * optional bool unk6 = 1236; + * optional bool unk6 = 1739; */ private boolean unk6; /** - * optional bool unk7 = 1698; + * optional bool unk7 = 1826; */ private boolean unk7; /** - * optional string region_name = 9; - */ - private final Utf8String regionName = Utf8String.newEmptyInstance(); - - /** - * optional string ex_resource_url = 12; - */ - private final Utf8String exResourceUrl = Utf8String.newEmptyInstance(); - - /** - * optional string lua_url = 13; - */ - private final Utf8String luaUrl = Utf8String.newEmptyInstance(); - - /** - * optional string asset_bundle_url = 14; - */ - private final Utf8String assetBundleUrl = Utf8String.newEmptyInstance(); - - /** - * optional string ip = 15; + * optional string ip = 2; */ private final Utf8String ip = Utf8String.newEmptyInstance(); /** - * optional string ifix_version = 260; + * optional string lua_url = 3; + */ + 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; */ private final Utf8String ifixVersion = Utf8String.newEmptyInstance(); /** - * optional string client_secret_key = 274; + * optional string mdk_res_version = 707; + */ + private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); + + /** + * optional string client_secret_key = 870; */ private final Utf8String clientSecretKey = Utf8String.newEmptyInstance(); /** - * optional string ifix_url = 696; + * optional string ifix_url = 1680; */ private final Utf8String ifixUrl = Utf8String.newEmptyInstance(); /** - * optional string msg = 900; + * optional string msg = 2016; */ private final Utf8String msg = Utf8String.newEmptyInstance(); - /** - * optional string mdk_res_version = 1895; - */ - private final Utf8String mdkResVersion = Utf8String.newEmptyInstance(); - private Gateserver() { } @@ -120,7 +120,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 3; + * optional uint32 port = 11; * @return whether the port field is set */ public boolean hasPort() { @@ -128,7 +128,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 3; + * optional uint32 port = 11; * @return this */ public Gateserver clearPort() { @@ -138,7 +138,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 3; + * optional uint32 port = 11; * @return the port */ public int getPort() { @@ -146,7 +146,7 @@ public final class GateserverOuterClass { } /** - * optional uint32 port = 3; + * optional uint32 port = 11; * @param value the port to set * @return this */ @@ -157,7 +157,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 7; + * optional bool unk1 = 9; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -165,7 +165,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 7; + * optional bool unk1 = 9; * @return this */ public Gateserver clearUnk1() { @@ -175,7 +175,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 7; + * optional bool unk1 = 9; * @return the unk1 */ public boolean getUnk1() { @@ -183,7 +183,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk1 = 7; + * optional bool unk1 = 9; * @param value the unk1 to set * @return this */ @@ -194,7 +194,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 11; + * optional bool unk2 = 12; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -202,7 +202,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 11; + * optional bool unk2 = 12; * @return this */ public Gateserver clearUnk2() { @@ -212,7 +212,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 11; + * optional bool unk2 = 12; * @return the unk2 */ public boolean getUnk2() { @@ -220,7 +220,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk2 = 11; + * optional bool unk2 = 12; * @param value the unk2 to set * @return this */ @@ -231,7 +231,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 33; + * optional bool unk3 = 1020; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -239,7 +239,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 33; + * optional bool unk3 = 1020; * @return this */ public Gateserver clearUnk3() { @@ -249,7 +249,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 33; + * optional bool unk3 = 1020; * @return the unk3 */ public boolean getUnk3() { @@ -257,7 +257,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk3 = 33; + * optional bool unk3 = 1020; * @param value the unk3 to set * @return this */ @@ -268,7 +268,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 859; + * optional bool unk4 = 1353; * @return whether the unk4 field is set */ public boolean hasUnk4() { @@ -276,7 +276,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 859; + * optional bool unk4 = 1353; * @return this */ public Gateserver clearUnk4() { @@ -286,7 +286,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 859; + * optional bool unk4 = 1353; * @return the unk4 */ public boolean getUnk4() { @@ -294,7 +294,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk4 = 859; + * optional bool unk4 = 1353; * @param value the unk4 to set * @return this */ @@ -305,7 +305,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1213; + * optional bool unk5 = 1433; * @return whether the unk5 field is set */ public boolean hasUnk5() { @@ -313,7 +313,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1213; + * optional bool unk5 = 1433; * @return this */ public Gateserver clearUnk5() { @@ -323,7 +323,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1213; + * optional bool unk5 = 1433; * @return the unk5 */ public boolean getUnk5() { @@ -331,7 +331,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk5 = 1213; + * optional bool unk5 = 1433; * @param value the unk5 to set * @return this */ @@ -342,7 +342,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1236; + * optional bool unk6 = 1739; * @return whether the unk6 field is set */ public boolean hasUnk6() { @@ -350,7 +350,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1236; + * optional bool unk6 = 1739; * @return this */ public Gateserver clearUnk6() { @@ -360,7 +360,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1236; + * optional bool unk6 = 1739; * @return the unk6 */ public boolean getUnk6() { @@ -368,7 +368,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk6 = 1236; + * optional bool unk6 = 1739; * @param value the unk6 to set * @return this */ @@ -379,7 +379,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1698; + * optional bool unk7 = 1826; * @return whether the unk7 field is set */ public boolean hasUnk7() { @@ -387,7 +387,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1698; + * optional bool unk7 = 1826; * @return this */ public Gateserver clearUnk7() { @@ -397,7 +397,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1698; + * optional bool unk7 = 1826; * @return the unk7 */ public boolean getUnk7() { @@ -405,7 +405,7 @@ public final class GateserverOuterClass { } /** - * optional bool unk7 = 1698; + * optional bool unk7 = 1826; * @param value the unk7 to set * @return this */ @@ -416,155 +416,90 @@ public final class GateserverOuterClass { } /** - * optional string region_name = 9; - * @return whether the regionName field is set + * optional string ip = 2; + * @return whether the ip field is set */ - public boolean hasRegionName() { + public boolean hasIp() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string region_name = 9; + * optional string ip = 2; * @return this */ - public Gateserver clearRegionName() { + public Gateserver clearIp() { bitField0_ &= ~0x00000100; - regionName.clear(); + ip.clear(); return this; } /** - * optional string region_name = 9; - * @return the regionName + * optional string ip = 2; + * @return the ip */ - public String getRegionName() { - return regionName.getString(); + public String getIp() { + return ip.getString(); } /** - * optional string region_name = 9; - * @return internal {@code Utf8String} representation of regionName for reading + * optional string ip = 2; + * @return internal {@code Utf8String} representation of ip for reading */ - public Utf8String getRegionNameBytes() { - return this.regionName; + public Utf8String getIpBytes() { + return this.ip; } /** - * optional string region_name = 9; - * @return internal {@code Utf8String} representation of regionName for modifications + * optional string ip = 2; + * @return internal {@code Utf8String} representation of ip for modifications */ - public Utf8String getMutableRegionNameBytes() { + public Utf8String getMutableIpBytes() { bitField0_ |= 0x00000100; - return this.regionName; + return this.ip; } /** - * optional string region_name = 9; - * @param value the regionName to set + * optional string ip = 2; + * @param value the ip to set * @return this */ - public Gateserver setRegionName(final CharSequence value) { + public Gateserver setIp(final CharSequence value) { bitField0_ |= 0x00000100; - regionName.copyFrom(value); + ip.copyFrom(value); return this; } /** - * optional string region_name = 9; - * @param value the regionName to set + * optional string ip = 2; + * @param value the ip to set * @return this */ - public Gateserver setRegionName(final Utf8String value) { + public Gateserver setIp(final Utf8String value) { bitField0_ |= 0x00000100; - regionName.copyFrom(value); + ip.copyFrom(value); return this; } /** - * optional string ex_resource_url = 12; - * @return whether the exResourceUrl field is set + * optional string lua_url = 3; + * @return whether the luaUrl field is set */ - public boolean hasExResourceUrl() { + public boolean hasLuaUrl() { return (bitField0_ & 0x00000200) != 0; } /** - * optional string ex_resource_url = 12; - * @return this - */ - public Gateserver clearExResourceUrl() { - bitField0_ &= ~0x00000200; - exResourceUrl.clear(); - return this; - } - - /** - * optional string ex_resource_url = 12; - * @return the exResourceUrl - */ - public String getExResourceUrl() { - return exResourceUrl.getString(); - } - - /** - * optional string ex_resource_url = 12; - * @return internal {@code Utf8String} representation of exResourceUrl for reading - */ - public Utf8String getExResourceUrlBytes() { - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 12; - * @return internal {@code Utf8String} representation of exResourceUrl for modifications - */ - public Utf8String getMutableExResourceUrlBytes() { - bitField0_ |= 0x00000200; - return this.exResourceUrl; - } - - /** - * optional string ex_resource_url = 12; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final CharSequence value) { - bitField0_ |= 0x00000200; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string ex_resource_url = 12; - * @param value the exResourceUrl to set - * @return this - */ - public Gateserver setExResourceUrl(final Utf8String value) { - bitField0_ |= 0x00000200; - exResourceUrl.copyFrom(value); - return this; - } - - /** - * optional string lua_url = 13; - * @return whether the luaUrl field is set - */ - public boolean hasLuaUrl() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @return this */ public Gateserver clearLuaUrl() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; luaUrl.clear(); return this; } /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @return the luaUrl */ public String getLuaUrl() { @@ -572,7 +507,7 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @return internal {@code Utf8String} representation of luaUrl for reading */ public Utf8String getLuaUrlBytes() { @@ -580,38 +515,103 @@ public final class GateserverOuterClass { } /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @return internal {@code Utf8String} representation of luaUrl for modifications */ public Utf8String getMutableLuaUrlBytes() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return this.luaUrl; } /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @param value the luaUrl to set * @return this */ public Gateserver setLuaUrl(final CharSequence value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; luaUrl.copyFrom(value); return this; } /** - * optional string lua_url = 13; + * optional string lua_url = 3; * @param value the luaUrl to set * @return this */ public Gateserver setLuaUrl(final Utf8String value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; luaUrl.copyFrom(value); return this; } /** - * optional string asset_bundle_url = 14; + * 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() { @@ -619,7 +619,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @return this */ public Gateserver clearAssetBundleUrl() { @@ -629,7 +629,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @return the assetBundleUrl */ public String getAssetBundleUrl() { @@ -637,7 +637,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @return internal {@code Utf8String} representation of assetBundleUrl for reading */ public Utf8String getAssetBundleUrlBytes() { @@ -645,7 +645,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @return internal {@code Utf8String} representation of assetBundleUrl for modifications */ public Utf8String getMutableAssetBundleUrlBytes() { @@ -654,7 +654,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @param value the assetBundleUrl to set * @return this */ @@ -665,7 +665,7 @@ public final class GateserverOuterClass { } /** - * optional string asset_bundle_url = 14; + * optional string asset_bundle_url = 7; * @param value the assetBundleUrl to set * @return this */ @@ -676,72 +676,72 @@ public final class GateserverOuterClass { } /** - * optional string ip = 15; - * @return whether the ip field is set + * optional string region_name = 10; + * @return whether the regionName field is set */ - public boolean hasIp() { + public boolean hasRegionName() { return (bitField0_ & 0x00001000) != 0; } /** - * optional string ip = 15; + * optional string region_name = 10; * @return this */ - public Gateserver clearIp() { + public Gateserver clearRegionName() { bitField0_ &= ~0x00001000; - ip.clear(); + regionName.clear(); return this; } /** - * optional string ip = 15; - * @return the ip + * optional string region_name = 10; + * @return the regionName */ - public String getIp() { - return ip.getString(); + public String getRegionName() { + return regionName.getString(); } /** - * optional string ip = 15; - * @return internal {@code Utf8String} representation of ip for reading + * optional string region_name = 10; + * @return internal {@code Utf8String} representation of regionName for reading */ - public Utf8String getIpBytes() { - return this.ip; + public Utf8String getRegionNameBytes() { + return this.regionName; } /** - * optional string ip = 15; - * @return internal {@code Utf8String} representation of ip for modifications + * optional string region_name = 10; + * @return internal {@code Utf8String} representation of regionName for modifications */ - public Utf8String getMutableIpBytes() { + public Utf8String getMutableRegionNameBytes() { bitField0_ |= 0x00001000; - return this.ip; + return this.regionName; } /** - * optional string ip = 15; - * @param value the ip to set + * optional string region_name = 10; + * @param value the regionName to set * @return this */ - public Gateserver setIp(final CharSequence value) { + public Gateserver setRegionName(final CharSequence value) { bitField0_ |= 0x00001000; - ip.copyFrom(value); + regionName.copyFrom(value); return this; } /** - * optional string ip = 15; - * @param value the ip to set + * optional string region_name = 10; + * @param value the regionName to set * @return this */ - public Gateserver setIp(final Utf8String value) { + public Gateserver setRegionName(final Utf8String value) { bitField0_ |= 0x00001000; - ip.copyFrom(value); + regionName.copyFrom(value); return this; } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @return whether the ifixVersion field is set */ public boolean hasIfixVersion() { @@ -749,7 +749,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @return this */ public Gateserver clearIfixVersion() { @@ -759,7 +759,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @return the ifixVersion */ public String getIfixVersion() { @@ -767,7 +767,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @return internal {@code Utf8String} representation of ifixVersion for reading */ public Utf8String getIfixVersionBytes() { @@ -775,7 +775,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @return internal {@code Utf8String} representation of ifixVersion for modifications */ public Utf8String getMutableIfixVersionBytes() { @@ -784,7 +784,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @param value the ifixVersion to set * @return this */ @@ -795,7 +795,7 @@ public final class GateserverOuterClass { } /** - * optional string ifix_version = 260; + * optional string ifix_version = 570; * @param value the ifixVersion to set * @return this */ @@ -806,220 +806,25 @@ public final class GateserverOuterClass { } /** - * optional string client_secret_key = 274; - * @return whether the clientSecretKey field is set + * optional string mdk_res_version = 707; + * @return whether the mdkResVersion field is set */ - public boolean hasClientSecretKey() { + public boolean hasMdkResVersion() { return (bitField0_ & 0x00004000) != 0; } /** - * optional string client_secret_key = 274; - * @return this - */ - public Gateserver clearClientSecretKey() { - bitField0_ &= ~0x00004000; - clientSecretKey.clear(); - return this; - } - - /** - * optional string client_secret_key = 274; - * @return the clientSecretKey - */ - public String getClientSecretKey() { - return clientSecretKey.getString(); - } - - /** - * optional string client_secret_key = 274; - * @return internal {@code Utf8String} representation of clientSecretKey for reading - */ - public Utf8String getClientSecretKeyBytes() { - return this.clientSecretKey; - } - - /** - * optional string client_secret_key = 274; - * @return internal {@code Utf8String} representation of clientSecretKey for modifications - */ - public Utf8String getMutableClientSecretKeyBytes() { - bitField0_ |= 0x00004000; - return this.clientSecretKey; - } - - /** - * optional string client_secret_key = 274; - * @param value the clientSecretKey to set - * @return this - */ - public Gateserver setClientSecretKey(final CharSequence value) { - bitField0_ |= 0x00004000; - clientSecretKey.copyFrom(value); - return this; - } - - /** - * optional string client_secret_key = 274; - * @param value the clientSecretKey to set - * @return this - */ - public Gateserver setClientSecretKey(final Utf8String value) { - bitField0_ |= 0x00004000; - clientSecretKey.copyFrom(value); - return this; - } - - /** - * optional string ifix_url = 696; - * @return whether the ifixUrl field is set - */ - public boolean hasIfixUrl() { - return (bitField0_ & 0x00008000) != 0; - } - - /** - * optional string ifix_url = 696; - * @return this - */ - public Gateserver clearIfixUrl() { - bitField0_ &= ~0x00008000; - ifixUrl.clear(); - return this; - } - - /** - * optional string ifix_url = 696; - * @return the ifixUrl - */ - public String getIfixUrl() { - return ifixUrl.getString(); - } - - /** - * optional string ifix_url = 696; - * @return internal {@code Utf8String} representation of ifixUrl for reading - */ - public Utf8String getIfixUrlBytes() { - return this.ifixUrl; - } - - /** - * optional string ifix_url = 696; - * @return internal {@code Utf8String} representation of ifixUrl for modifications - */ - public Utf8String getMutableIfixUrlBytes() { - bitField0_ |= 0x00008000; - return this.ifixUrl; - } - - /** - * optional string ifix_url = 696; - * @param value the ifixUrl to set - * @return this - */ - public Gateserver setIfixUrl(final CharSequence value) { - bitField0_ |= 0x00008000; - ifixUrl.copyFrom(value); - return this; - } - - /** - * optional string ifix_url = 696; - * @param value the ifixUrl to set - * @return this - */ - public Gateserver setIfixUrl(final Utf8String value) { - bitField0_ |= 0x00008000; - ifixUrl.copyFrom(value); - return this; - } - - /** - * optional string msg = 900; - * @return whether the msg field is set - */ - public boolean hasMsg() { - return (bitField0_ & 0x00010000) != 0; - } - - /** - * optional string msg = 900; - * @return this - */ - public Gateserver clearMsg() { - bitField0_ &= ~0x00010000; - msg.clear(); - return this; - } - - /** - * optional string msg = 900; - * @return the msg - */ - public String getMsg() { - return msg.getString(); - } - - /** - * optional string msg = 900; - * @return internal {@code Utf8String} representation of msg for reading - */ - public Utf8String getMsgBytes() { - return this.msg; - } - - /** - * optional string msg = 900; - * @return internal {@code Utf8String} representation of msg for modifications - */ - public Utf8String getMutableMsgBytes() { - bitField0_ |= 0x00010000; - return this.msg; - } - - /** - * optional string msg = 900; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final CharSequence value) { - bitField0_ |= 0x00010000; - msg.copyFrom(value); - return this; - } - - /** - * optional string msg = 900; - * @param value the msg to set - * @return this - */ - public Gateserver setMsg(final Utf8String value) { - bitField0_ |= 0x00010000; - msg.copyFrom(value); - return this; - } - - /** - * optional string mdk_res_version = 1895; - * @return whether the mdkResVersion field is set - */ - public boolean hasMdkResVersion() { - return (bitField0_ & 0x00020000) != 0; - } - - /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @return this */ public Gateserver clearMdkResVersion() { - bitField0_ &= ~0x00020000; + bitField0_ &= ~0x00004000; mdkResVersion.clear(); return this; } /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @return the mdkResVersion */ public String getMdkResVersion() { @@ -1027,7 +832,7 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @return internal {@code Utf8String} representation of mdkResVersion for reading */ public Utf8String getMdkResVersionBytes() { @@ -1035,36 +840,231 @@ public final class GateserverOuterClass { } /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @return internal {@code Utf8String} representation of mdkResVersion for modifications */ public Utf8String getMutableMdkResVersionBytes() { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; return this.mdkResVersion; } /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final CharSequence value) { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; mdkResVersion.copyFrom(value); return this; } /** - * optional string mdk_res_version = 1895; + * optional string mdk_res_version = 707; * @param value the mdkResVersion to set * @return this */ public Gateserver setMdkResVersion(final Utf8String value) { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; mdkResVersion.copyFrom(value); return this; } + /** + * optional string client_secret_key = 870; + * @return whether the clientSecretKey field is set + */ + public boolean hasClientSecretKey() { + return (bitField0_ & 0x00008000) != 0; + } + + /** + * optional string client_secret_key = 870; + * @return this + */ + public Gateserver clearClientSecretKey() { + bitField0_ &= ~0x00008000; + clientSecretKey.clear(); + return this; + } + + /** + * optional string client_secret_key = 870; + * @return the clientSecretKey + */ + public String getClientSecretKey() { + return clientSecretKey.getString(); + } + + /** + * optional string client_secret_key = 870; + * @return internal {@code Utf8String} representation of clientSecretKey for reading + */ + public Utf8String getClientSecretKeyBytes() { + return this.clientSecretKey; + } + + /** + * optional string client_secret_key = 870; + * @return internal {@code Utf8String} representation of clientSecretKey for modifications + */ + public Utf8String getMutableClientSecretKeyBytes() { + bitField0_ |= 0x00008000; + return this.clientSecretKey; + } + + /** + * optional string client_secret_key = 870; + * @param value the clientSecretKey to set + * @return this + */ + public Gateserver setClientSecretKey(final CharSequence value) { + bitField0_ |= 0x00008000; + clientSecretKey.copyFrom(value); + return this; + } + + /** + * optional string client_secret_key = 870; + * @param value the clientSecretKey to set + * @return this + */ + public Gateserver setClientSecretKey(final Utf8String value) { + bitField0_ |= 0x00008000; + clientSecretKey.copyFrom(value); + return this; + } + + /** + * optional string ifix_url = 1680; + * @return whether the ifixUrl field is set + */ + public boolean hasIfixUrl() { + return (bitField0_ & 0x00010000) != 0; + } + + /** + * optional string ifix_url = 1680; + * @return this + */ + public Gateserver clearIfixUrl() { + bitField0_ &= ~0x00010000; + ifixUrl.clear(); + return this; + } + + /** + * optional string ifix_url = 1680; + * @return the ifixUrl + */ + public String getIfixUrl() { + return ifixUrl.getString(); + } + + /** + * optional string ifix_url = 1680; + * @return internal {@code Utf8String} representation of ifixUrl for reading + */ + public Utf8String getIfixUrlBytes() { + return this.ifixUrl; + } + + /** + * optional string ifix_url = 1680; + * @return internal {@code Utf8String} representation of ifixUrl for modifications + */ + public Utf8String getMutableIfixUrlBytes() { + bitField0_ |= 0x00010000; + return this.ifixUrl; + } + + /** + * optional string ifix_url = 1680; + * @param value the ifixUrl to set + * @return this + */ + public Gateserver setIfixUrl(final CharSequence value) { + bitField0_ |= 0x00010000; + ifixUrl.copyFrom(value); + return this; + } + + /** + * optional string ifix_url = 1680; + * @param value the ifixUrl to set + * @return this + */ + public Gateserver setIfixUrl(final Utf8String value) { + bitField0_ |= 0x00010000; + 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; @@ -1078,16 +1078,16 @@ public final class GateserverOuterClass { unk5 = other.unk5; unk6 = other.unk6; unk7 = other.unk7; - regionName.copyFrom(other.regionName); - exResourceUrl.copyFrom(other.exResourceUrl); - luaUrl.copyFrom(other.luaUrl); - assetBundleUrl.copyFrom(other.assetBundleUrl); ip.copyFrom(other.ip); + luaUrl.copyFrom(other.luaUrl); + 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); - mdkResVersion.copyFrom(other.mdkResVersion); } return this; } @@ -1122,24 +1122,27 @@ public final class GateserverOuterClass { if (other.hasUnk7()) { setUnk7(other.unk7); } - if (other.hasRegionName()) { - getMutableRegionNameBytes().copyFrom(other.regionName); - } - if (other.hasExResourceUrl()) { - getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); + if (other.hasIp()) { + getMutableIpBytes().copyFrom(other.ip); } if (other.hasLuaUrl()) { getMutableLuaUrlBytes().copyFrom(other.luaUrl); } + if (other.hasExResourceUrl()) { + getMutableExResourceUrlBytes().copyFrom(other.exResourceUrl); + } if (other.hasAssetBundleUrl()) { getMutableAssetBundleUrlBytes().copyFrom(other.assetBundleUrl); } - if (other.hasIp()) { - getMutableIpBytes().copyFrom(other.ip); + if (other.hasRegionName()) { + getMutableRegionNameBytes().copyFrom(other.regionName); } if (other.hasIfixVersion()) { getMutableIfixVersionBytes().copyFrom(other.ifixVersion); } + if (other.hasMdkResVersion()) { + getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); + } if (other.hasClientSecretKey()) { getMutableClientSecretKeyBytes().copyFrom(other.clientSecretKey); } @@ -1149,9 +1152,6 @@ public final class GateserverOuterClass { if (other.hasMsg()) { getMutableMsgBytes().copyFrom(other.msg); } - if (other.hasMdkResVersion()) { - getMutableMdkResVersionBytes().copyFrom(other.mdkResVersion); - } return this; } @@ -1170,16 +1170,16 @@ public final class GateserverOuterClass { unk5 = false; unk6 = false; unk7 = false; - regionName.clear(); - exResourceUrl.clear(); - luaUrl.clear(); - assetBundleUrl.clear(); ip.clear(); + luaUrl.clear(); + exResourceUrl.clear(); + assetBundleUrl.clear(); + regionName.clear(); ifixVersion.clear(); + mdkResVersion.clear(); clientSecretKey.clear(); ifixUrl.clear(); msg.clear(); - mdkResVersion.clear(); return this; } @@ -1190,16 +1190,16 @@ public final class GateserverOuterClass { } cachedSize = -1; bitField0_ = 0; - regionName.clear(); - exResourceUrl.clear(); - luaUrl.clear(); - assetBundleUrl.clear(); ip.clear(); + luaUrl.clear(); + exResourceUrl.clear(); + assetBundleUrl.clear(); + regionName.clear(); ifixVersion.clear(); + mdkResVersion.clear(); clientSecretKey.clear(); ifixUrl.clear(); msg.clear(); - mdkResVersion.clear(); return this; } @@ -1221,91 +1221,91 @@ public final class GateserverOuterClass { && (!hasUnk5() || unk5 == other.unk5) && (!hasUnk6() || unk6 == other.unk6) && (!hasUnk7() || unk7 == other.unk7) - && (!hasRegionName() || regionName.equals(other.regionName)) - && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) - && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) - && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) && (!hasIp() || ip.equals(other.ip)) + && (!hasLuaUrl() || luaUrl.equals(other.luaUrl)) + && (!hasExResourceUrl() || exResourceUrl.equals(other.exResourceUrl)) + && (!hasAssetBundleUrl() || assetBundleUrl.equals(other.assetBundleUrl)) + && (!hasRegionName() || regionName.equals(other.regionName)) && (!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)); + && (!hasMsg() || msg.equals(other.msg)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(port); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 72); output.writeBoolNoTag(unk1); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeBoolNoTag(unk2); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawLittleEndian16((short) 648); + output.writeRawLittleEndian16((short) 16352); output.writeBoolNoTag(unk3); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 13784); + output.writeRawLittleEndian16((short) 21704); output.writeBoolNoTag(unk4); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawLittleEndian16((short) 19432); + output.writeRawLittleEndian16((short) 22984); output.writeBoolNoTag(unk5); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawLittleEndian16((short) 19872); + output.writeRawLittleEndian16((short) 27864); output.writeBoolNoTag(unk6); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawLittleEndian16((short) 27280); + output.writeRawLittleEndian16((short) 29328); output.writeBoolNoTag(unk7); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 74); - output.writeStringNoTag(regionName); + output.writeRawByte((byte) 18); + output.writeStringNoTag(ip); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 98); - output.writeStringNoTag(exResourceUrl); - } - if ((bitField0_ & 0x00000400) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeStringNoTag(luaUrl); } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRawByte((byte) 42); + output.writeStringNoTag(exResourceUrl); + } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 58); output.writeStringNoTag(assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 122); - output.writeStringNoTag(ip); + output.writeRawByte((byte) 82); + output.writeStringNoTag(regionName); } if ((bitField0_ & 0x00002000) != 0) { - output.writeRawLittleEndian16((short) 4258); + output.writeRawLittleEndian16((short) 9170); output.writeStringNoTag(ifixVersion); } if ((bitField0_ & 0x00004000) != 0) { - output.writeRawLittleEndian16((short) 4498); - output.writeStringNoTag(clientSecretKey); + output.writeRawLittleEndian16((short) 11418); + output.writeStringNoTag(mdkResVersion); } if ((bitField0_ & 0x00008000) != 0) { - output.writeRawLittleEndian16((short) 11202); - output.writeStringNoTag(ifixUrl); + output.writeRawLittleEndian16((short) 14002); + output.writeStringNoTag(clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - output.writeRawLittleEndian16((short) 14498); - output.writeStringNoTag(msg); + output.writeRawLittleEndian16((short) 27010); + output.writeStringNoTag(ifixUrl); } if ((bitField0_ & 0x00020000) != 0) { - output.writeRawLittleEndian16((short) 30394); - output.writeStringNoTag(mdkResVersion); + output.writeRawLittleEndian16((short) 32386); + output.writeStringNoTag(msg); } } @@ -1337,34 +1337,34 @@ public final class GateserverOuterClass { size += 3; } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(regionName); + size += 1 + ProtoSink.computeStringSizeNoTag(ip); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(luaUrl); + size += 1 + ProtoSink.computeStringSizeNoTag(exResourceUrl); } if ((bitField0_ & 0x00000800) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(ip); + size += 1 + ProtoSink.computeStringSizeNoTag(regionName); } if ((bitField0_ & 0x00002000) != 0) { size += 2 + ProtoSink.computeStringSizeNoTag(ifixVersion); } if ((bitField0_ & 0x00004000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); + size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); } if ((bitField0_ & 0x00008000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); + size += 2 + ProtoSink.computeStringSizeNoTag(clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(msg); + size += 2 + ProtoSink.computeStringSizeNoTag(ifixUrl); } if ((bitField0_ & 0x00020000) != 0) { - size += 2 + ProtoSink.computeStringSizeNoTag(mdkResVersion); + size += 2 + ProtoSink.computeStringSizeNoTag(msg); } return size; } @@ -1376,162 +1376,162 @@ public final class GateserverOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 88: { // port port = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { + case 72: { // unk1 unk1 = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // unk2 unk2 = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 264) { + if (tag != 8160) { break; } } - case 264: { + case 8160: { // unk3 unk3 = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 6872) { + if (tag != 10824) { break; } } - case 6872: { + case 10824: { // unk4 unk4 = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 9704) { + if (tag != 11464) { break; } } - case 9704: { + case 11464: { // unk5 unk5 = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 9888) { + if (tag != 13912) { break; } } - case 9888: { + case 13912: { // unk6 unk6 = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 13584) { + if (tag != 14608) { break; } } - case 13584: { + case 14608: { // unk7 unk7 = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { - // regionName - input.readString(regionName); + case 18: { + // ip + input.readString(ip); bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 98) { + if (tag != 26) { break; } } - case 98: { - // exResourceUrl - input.readString(exResourceUrl); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { + case 26: { // luaUrl input.readString(luaUrl); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 114) { + if (tag != 42) { break; } } - case 114: { + 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 != 122) { + if (tag != 82) { break; } } - case 122: { - // ip - input.readString(ip); + case 82: { + // regionName + input.readString(regionName); bitField0_ |= 0x00001000; tag = input.readTag(); - if (tag != 2082) { + if (tag != 4562) { break; } } - case 2082: { + case 4562: { // ifixVersion input.readString(ifixVersion); bitField0_ |= 0x00002000; tag = input.readTag(); - if (tag != 2194) { + if (tag != 5658) { break; } } - case 2194: { - // clientSecretKey - input.readString(clientSecretKey); - bitField0_ |= 0x00004000; - tag = input.readTag(); - if (tag != 5570) { - break; - } - } - case 5570: { - // ifixUrl - input.readString(ifixUrl); - bitField0_ |= 0x00008000; - tag = input.readTag(); - if (tag != 7202) { - break; - } - } - case 7202: { - // msg - input.readString(msg); - bitField0_ |= 0x00010000; - tag = input.readTag(); - if (tag != 15162) { - break; - } - } - case 15162: { + case 5658: { // mdkResVersion input.readString(mdkResVersion); + bitField0_ |= 0x00004000; + tag = input.readTag(); + if (tag != 6962) { + break; + } + } + case 6962: { + // clientSecretKey + input.readString(clientSecretKey); + bitField0_ |= 0x00008000; + tag = input.readTag(); + if (tag != 13442) { + break; + } + } + case 13442: { + // ifixUrl + input.readString(ifixUrl); + bitField0_ |= 0x00010000; + tag = input.readTag(); + if (tag != 16130) { + break; + } + } + case 16130: { + // msg + input.readString(msg); bitField0_ |= 0x00020000; tag = input.readTag(); if (tag != 0) { @@ -1580,34 +1580,34 @@ public final class GateserverOuterClass { output.writeBool(FieldNames.unk7, unk7); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.regionName, regionName); + output.writeString(FieldNames.ip, ip); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.exResourceUrl, exResourceUrl); + output.writeString(FieldNames.luaUrl, luaUrl); } if ((bitField0_ & 0x00000400) != 0) { - output.writeString(FieldNames.luaUrl, luaUrl); + output.writeString(FieldNames.exResourceUrl, exResourceUrl); } if ((bitField0_ & 0x00000800) != 0) { output.writeString(FieldNames.assetBundleUrl, assetBundleUrl); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.ip, ip); + output.writeString(FieldNames.regionName, regionName); } if ((bitField0_ & 0x00002000) != 0) { output.writeString(FieldNames.ifixVersion, ifixVersion); } if ((bitField0_ & 0x00004000) != 0) { - output.writeString(FieldNames.clientSecretKey, clientSecretKey); + output.writeString(FieldNames.mdkResVersion, mdkResVersion); } if ((bitField0_ & 0x00008000) != 0) { - output.writeString(FieldNames.ifixUrl, ifixUrl); + output.writeString(FieldNames.clientSecretKey, clientSecretKey); } if ((bitField0_ & 0x00010000) != 0) { - output.writeString(FieldNames.msg, msg); + output.writeString(FieldNames.ifixUrl, ifixUrl); } if ((bitField0_ & 0x00020000) != 0) { - output.writeString(FieldNames.mdkResVersion, mdkResVersion); + output.writeString(FieldNames.msg, msg); } output.endObject(); } @@ -1707,11 +1707,10 @@ public final class GateserverOuterClass { } break; } - case -1990689889: - case -1565768458: { - if (input.isAtField(FieldNames.regionName)) { + case 3367: { + if (input.isAtField(FieldNames.ip)) { if (!input.trySkipNullValue()) { - input.readString(regionName); + input.readString(ip); bitField0_ |= 0x00000100; } } else { @@ -1719,23 +1718,23 @@ public final class GateserverOuterClass { } break; } - case 1643520974: - case -1086137910: { - if (input.isAtField(FieldNames.exResourceUrl)) { - if (!input.trySkipNullValue()) { - input.readString(exResourceUrl); - bitField0_ |= 0x00000200; - } - } else { - input.skipUnknownField(); - } - break; - } case -1091991977: case 508288168: { if (input.isAtField(FieldNames.luaUrl)) { if (!input.trySkipNullValue()) { input.readString(luaUrl); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1643520974: + case -1086137910: { + if (input.isAtField(FieldNames.exResourceUrl)) { + if (!input.trySkipNullValue()) { + input.readString(exResourceUrl); bitField0_ |= 0x00000400; } } else { @@ -1755,10 +1754,11 @@ public final class GateserverOuterClass { } break; } - case 3367: { - if (input.isAtField(FieldNames.ip)) { + case -1990689889: + case -1565768458: { + if (input.isAtField(FieldNames.regionName)) { if (!input.trySkipNullValue()) { - input.readString(ip); + input.readString(regionName); bitField0_ |= 0x00001000; } } else { @@ -1778,12 +1778,24 @@ public final class GateserverOuterClass { } break; } + case -1415579412: + case -204279250: { + if (input.isAtField(FieldNames.mdkResVersion)) { + if (!input.trySkipNullValue()) { + input.readString(mdkResVersion); + bitField0_ |= 0x00004000; + } + } else { + input.skipUnknownField(); + } + break; + } case -584558076: case 904194372: { if (input.isAtField(FieldNames.clientSecretKey)) { if (!input.trySkipNullValue()) { input.readString(clientSecretKey); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; } } else { input.skipUnknownField(); @@ -1795,7 +1807,7 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.ifixUrl)) { if (!input.trySkipNullValue()) { input.readString(ifixUrl); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; } } else { input.skipUnknownField(); @@ -1806,18 +1818,6 @@ public final class GateserverOuterClass { if (input.isAtField(FieldNames.msg)) { if (!input.trySkipNullValue()) { input.readString(msg); - bitField0_ |= 0x00010000; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1415579412: - case -204279250: { - if (input.isAtField(FieldNames.mdkResVersion)) { - if (!input.trySkipNullValue()) { - input.readString(mdkResVersion); bitField0_ |= 0x00020000; } } else { @@ -1893,25 +1893,25 @@ public final class GateserverOuterClass { static final FieldName unk7 = FieldName.forField("unk7"); - static final FieldName regionName = FieldName.forField("regionName", "region_name"); - - static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); + static final FieldName ip = FieldName.forField("ip"); static final FieldName luaUrl = FieldName.forField("luaUrl", "lua_url"); + static final FieldName exResourceUrl = FieldName.forField("exResourceUrl", "ex_resource_url"); + static final FieldName assetBundleUrl = FieldName.forField("assetBundleUrl", "asset_bundle_url"); - static final FieldName ip = FieldName.forField("ip"); + static final FieldName regionName = FieldName.forField("regionName", "region_name"); 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 msg = FieldName.forField("msg"); - - static final FieldName mdkResVersion = FieldName.forField("mdkResVersion", "mdk_res_version"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetActivityScheduleConfigScRspOuterClass.java index 4f32799..59d4fc0 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 = 4; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 2; */ private final RepeatedMessage activityScheduleList = RepeatedMessage.newEmptyInstance(ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return this */ public GetActivityScheduleConfigScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 2; * @return whether the activityScheduleList field is set */ public boolean hasActivityScheduleList() { @@ -85,7 +85,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 2; * @return this */ public GetActivityScheduleConfigScRsp clearActivityScheduleList() { @@ -95,7 +95,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_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. @@ -110,7 +110,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_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 @@ -125,7 +125,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 2; * @param value the activityScheduleList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetActivityScheduleConfigScRspOuterClass { } /** - * repeated .ActivityScheduleInfo activity_schedule_list = 8; + * repeated .ActivityScheduleInfo activity_schedule_list = 2; * @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) 32); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < activityScheduleList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 18); output.writeMessageNoTag(activityScheduleList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetActivityScheduleConfigScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 18) { break; } } - case 66: { + case 18: { // 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 96c6683..fa4ee72 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 retcode = 8; - */ - private int retcode; - - /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 3; */ private int curIndex; /** - * repeated .LineupInfo lineup_list = 4; + * optional uint32 retcode = 10; + */ + private int retcode; + + /** + * repeated .LineupInfo lineup_list = 5; */ private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); @@ -45,62 +45,25 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set + * optional uint32 cur_index = 3; + * @return whether the curIndex field is set */ - public boolean hasRetcode() { + public boolean hasCurIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 8; - * @return this - */ - public GetAllLineupDataScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - 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 GetAllLineupDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cur_index = 11; - * @return whether the curIndex field is set - */ - public boolean hasCurIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 3; * @return this */ public GetAllLineupDataScRsp clearCurIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curIndex = 0; return this; } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 3; * @return the curIndex */ public int getCurIndex() { @@ -108,18 +71,55 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * optional uint32 cur_index = 11; + * optional uint32 cur_index = 3; * @param value the curIndex to set * @return this */ public GetAllLineupDataScRsp setCurIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curIndex = value; return this; } /** - * repeated .LineupInfo lineup_list = 4; + * 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 GetAllLineupDataScRsp 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 GetAllLineupDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated .LineupInfo lineup_list = 5; * @return whether the lineupList field is set */ public boolean hasLineupList() { @@ -127,7 +127,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 4; + * repeated .LineupInfo lineup_list = 5; * @return this */ public GetAllLineupDataScRsp clearLineupList() { @@ -137,7 +137,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 4; + * repeated .LineupInfo lineup_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. @@ -151,7 +151,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 4; + * repeated .LineupInfo lineup_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 @@ -165,7 +165,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 4; + * repeated .LineupInfo lineup_list = 5; * @param value the lineupList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAllLineupDataScRspOuterClass { } /** - * repeated .LineupInfo lineup_list = 4; + * repeated .LineupInfo lineup_list = 5; * @param values the lineupList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetAllLineupDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curIndex = other.curIndex; + retcode = other.retcode; lineupList.copyFrom(other.lineupList); } return this; @@ -204,12 +204,12 @@ public final class GetAllLineupDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurIndex()) { setCurIndex(other.curIndex); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasLineupList()) { getMutableLineupList().addAll(other.lineupList); } @@ -223,8 +223,8 @@ public final class GetAllLineupDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curIndex = 0; + retcode = 0; lineupList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetAllLineupDataScRspOuterClass { } GetAllLineupDataScRsp other = (GetAllLineupDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurIndex() || curIndex == other.curIndex) + && (!hasRetcode() || retcode == other.retcode) && (!hasLineupList() || lineupList.equals(other.lineupList)); } @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(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(curIndex); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < lineupList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(lineupList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetAllLineupDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curIndex); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); @@ -295,25 +295,25 @@ public final class GetAllLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 24: { // curIndex curIndex = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 80) { break; } } - case 34: { + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // lineupList tag = input.readRepeatedMessage(lineupList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetAllLineupDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curIndex, curIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curIndex, curIndex); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.lineupList, lineupList); @@ -357,10 +357,11 @@ public final class GetAllLineupDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 537796210: + case 117333523: { + if (input.isAtField(FieldNames.curIndex)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curIndex = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class GetAllLineupDataScRspOuterClass { } break; } - case 537796210: - case 117333523: { - if (input.isAtField(FieldNames.curIndex)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - curIndex = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetAllLineupDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curIndex = FieldName.forField("curIndex", "cur_index"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetArchiveDataScRspOuterClass.java index 833dce1..406f55c 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 = 8; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 9; */ private final ArchiveDataOuterClass.ArchiveData archiveData = ArchiveDataOuterClass.ArchiveData.newInstance(); @@ -39,7 +39,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return this */ public GetArchiveDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 9; * @return whether the archiveData field is set */ public boolean hasArchiveData() { @@ -84,7 +84,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 9; * @return this */ public GetArchiveDataScRsp clearArchiveData() { @@ -94,7 +94,7 @@ public final class GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 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 GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 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 GetArchiveDataScRspOuterClass { } /** - * optional .ArchiveData archive_data = 14; + * optional .ArchiveData archive_data = 9; * @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) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 74); output.writeMessageNoTag(archiveData); } } @@ -226,16 +226,16 @@ public final class GetArchiveDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 74) { break; } } - case 114: { + case 74: { // 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 ff4601b..a995335 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 = 8; + * optional bool is_get_all = 1; */ private boolean isGetAll; /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_id_list = 12; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 8; + * optional bool is_get_all = 1; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -48,7 +48,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 8; + * optional bool is_get_all = 1; * @return this */ public GetAvatarDataCsReq clearIsGetAll() { @@ -58,7 +58,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 8; + * optional bool is_get_all = 1; * @return the isGetAll */ public boolean getIsGetAll() { @@ -66,7 +66,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * optional bool is_get_all = 8; + * optional bool is_get_all = 1; * @param value the isGetAll to set * @return this */ @@ -77,7 +77,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_id_list = 12; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -85,7 +85,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_id_list = 12; * @return this */ public GetAvatarDataCsReq clearBaseAvatarIdList() { @@ -95,7 +95,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_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. @@ -109,7 +109,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_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 @@ -123,7 +123,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_id_list = 12; * @param value the baseAvatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetAvatarDataCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 3; + * repeated uint32 base_avatar_id_list = 12; * @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) 64); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetAvatarDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 98) { break; } } - case 26: { + case 98: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetAvatarDataCsReqOuterClass { tag = input.readTag(); break; } - case 24: { + case 96: { // 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 a6aa69a..8de6c37 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 = 14; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional bool is_get_all = 2; + * optional bool is_get_all = 3; */ private boolean isGetAll; /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 9; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(AvatarOuterClass.Avatar.getFactory()); @@ -45,7 +45,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return this */ public GetAvatarDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 7; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 2; + * optional bool is_get_all = 3; * @return whether the isGetAll field is set */ public boolean hasIsGetAll() { @@ -90,7 +90,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 2; + * optional bool is_get_all = 3; * @return this */ public GetAvatarDataScRsp clearIsGetAll() { @@ -100,7 +100,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 2; + * optional bool is_get_all = 3; * @return the isGetAll */ public boolean getIsGetAll() { @@ -108,7 +108,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * optional bool is_get_all = 2; + * optional bool is_get_all = 3; * @param value the isGetAll to set * @return this */ @@ -119,7 +119,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 9; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -127,7 +127,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 9; * @return this */ public GetAvatarDataScRsp clearAvatarList() { @@ -137,7 +137,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_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 GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_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 GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 9; * @param value the avatarList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetAvatarDataScRspOuterClass { } /** - * repeated .Avatar avatar_list = 8; + * repeated .Avatar avatar_list = 9; * @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) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isGetAll); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(avatarList.get(i)); } } @@ -295,25 +295,25 @@ public final class GetAvatarDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 56: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 16) { + if (tag != 24) { break; } } - case 16: { + case 24: { // isGetAll isGetAll = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 74) { break; } } - case 66: { + case 74: { // 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 a898b9a..70047a9 100644 --- a/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetBagScRspOuterClass.java @@ -20,25 +20,25 @@ public final class GetBagScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .Material material_list = 7; + * repeated .Equipment equipment_list = 1; + */ + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + + /** + * repeated .Material material_list = 2; */ private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); /** - * repeated .Relic relic_list = 8; + * repeated .Relic relic_list = 15; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); - /** - * repeated .Equipment equipment_list = 15; - */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); - private GetBagScRsp() { } @@ -50,7 +50,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return this */ public GetBagScRsp clearRetcode() { @@ -68,7 +68,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public final class GetBagScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -87,161 +87,25 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Material material_list = 7; - * @return whether the materialList field is set + * repeated .Equipment equipment_list = 1; + * @return whether the equipmentList field is set */ - public boolean hasMaterialList() { + public boolean hasEquipmentList() { return (bitField0_ & 0x00000002) != 0; } /** - * repeated .Material material_list = 7; - * @return this - */ - public GetBagScRsp clearMaterialList() { - bitField0_ &= ~0x00000002; - materialList.clear(); - return this; - } - - /** - * repeated .Material material_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 #getMutableMaterialList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMaterialList() { - return materialList; - } - - /** - * repeated .Material material_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 getMutableMaterialList() { - bitField0_ |= 0x00000002; - return materialList; - } - - /** - * repeated .Material material_list = 7; - * @param value the materialList to add - * @return this - */ - public GetBagScRsp addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000002; - materialList.add(value); - return this; - } - - /** - * repeated .Material material_list = 7; - * @param values the materialList to add - * @return this - */ - public GetBagScRsp addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000002; - materialList.addAll(values); - return this; - } - - /** - * repeated .Relic relic_list = 8; - * @return whether the relicList field is set - */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .Relic relic_list = 8; - * @return this - */ - public GetBagScRsp clearRelicList() { - bitField0_ &= ~0x00000004; - relicList.clear(); - return this; - } - - /** - * repeated .Relic relic_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 #getMutableRelicList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getRelicList() { - return relicList; - } - - /** - * repeated .Relic relic_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 RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000004; - return relicList; - } - - /** - * repeated .Relic relic_list = 8; - * @param value the relicList to add - * @return this - */ - public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000004; - relicList.add(value); - return this; - } - - /** - * repeated .Relic relic_list = 8; - * @param values the relicList to add - * @return this - */ - public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000004; - relicList.addAll(values); - return this; - } - - /** - * repeated .Equipment equipment_list = 15; - * @return whether the equipmentList field is set - */ - public boolean hasEquipmentList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .Equipment equipment_list = 15; + * repeated .Equipment equipment_list = 1; * @return this */ public GetBagScRsp clearEquipmentList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; equipmentList.clear(); return this; } /** - * repeated .Equipment equipment_list = 15; + * 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. @@ -255,7 +119,7 @@ public final class GetBagScRspOuterClass { } /** - * repeated .Equipment equipment_list = 15; + * 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 @@ -264,41 +128,177 @@ public final class GetBagScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return equipmentList; } /** - * repeated .Equipment equipment_list = 15; + * repeated .Equipment equipment_list = 1; * @param value the equipmentList to add * @return this */ public GetBagScRsp addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; equipmentList.add(value); return this; } /** - * repeated .Equipment equipment_list = 15; + * repeated .Equipment equipment_list = 1; * @param values the equipmentList to add * @return this */ public GetBagScRsp addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public GetBagScRsp clearRelicList() { + bitField0_ &= ~0x00000008; + relicList.clear(); + return this; + } + + /** + * repeated .Relic relic_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 #getMutableRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getRelicList() { + return relicList; + } + + /** + * repeated .Relic relic_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 getMutableRelicList() { + bitField0_ |= 0x00000008; + return relicList; + } + + /** + * repeated .Relic relic_list = 15; + * @param value the relicList to add + * @return this + */ + public GetBagScRsp addRelicList(final RelicOuterClass.Relic value) { + bitField0_ |= 0x00000008; + relicList.add(value); + return this; + } + + /** + * repeated .Relic relic_list = 15; + * @param values the relicList to add + * @return this + */ + public GetBagScRsp addAllRelicList(final RelicOuterClass.Relic... values) { + bitField0_ |= 0x00000008; + relicList.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); - equipmentList.copyFrom(other.equipmentList); } return this; } @@ -312,15 +312,15 @@ public final class GetBagScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasEquipmentList()) { + getMutableEquipmentList().addAll(other.equipmentList); + } 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(); - equipmentList.clear(); return this; } @@ -345,9 +345,9 @@ public final class GetBagScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + equipmentList.clearQuick(); materialList.clearQuick(); relicList.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)) && (!hasMaterialList() || materialList.equals(other.materialList)) - && (!hasRelicList() || relicList.equals(other.relicList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)); + && (!hasRelicList() || relicList.equals(other.relicList)); } @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) { - for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(materialList.get(i)); + for (int i = 0; i < equipmentList.length(); i++) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(equipmentList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < relicList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(relicList.get(i)); + for (int i = 0; i < materialList.length(); i++) { + output.writeRawByte((byte) 18); + output.writeMessageNoTag(materialList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { + for (int i = 0; i < relicList.length(); i++) { output.writeRawByte((byte) 122); - output.writeMessageNoTag(equipmentList.get(i)); + output.writeMessageNoTag(relicList.get(i)); } } } @@ -400,13 +400,13 @@ public final class GetBagScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); + size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); + size += (1 * relicList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(relicList); } return size; } @@ -418,34 +418,34 @@ public final class GetBagScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); + bitField0_ |= 0x00000002; + if (tag != 18) { + break; + } + } + case 18: { // materialList tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000002; - if (tag != 66) { - break; - } - } - case 66: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000004; if (tag != 122) { break; } } case 122: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); + // relicList + tag = input.readRepeatedMessage(relicList, 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.materialList, materialList); + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.relicList, relicList); + output.writeRepeatedMessage(FieldNames.materialList, materialList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + output.writeRepeatedMessage(FieldNames.relicList, relicList); } output.endObject(); } @@ -501,12 +501,24 @@ public final class GetBagScRspOuterClass { } break; } + case 2007143244: + case 2109525167: { + if (input.isAtField(FieldNames.equipmentList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(equipmentList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -2115854747: case -1149360970: { if (input.isAtField(FieldNames.materialList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(materialList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -518,18 +530,6 @@ public final class GetBagScRspOuterClass { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { - if (!input.trySkipNullValue()) { - 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 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 3f88ad1..1332f9d 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 last_set_nickname_time = 10; - */ - private long lastSetNicknameTime; - - /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 4; */ private long nextRecoverTime; /** - * optional uint32 gameplay_birthday = 2; + * optional int64 last_set_nickname_time = 14; */ - private int gameplayBirthday; + private long lastSetNicknameTime; /** - * optional uint32 cur_day = 3; - */ - private int curDay; - - /** - * optional uint32 retcode = 7; - */ - private int retcode; - - /** - * optional uint32 exchange_times = 8; - */ - private int exchangeTimes; - - /** - * optional uint32 week_cocoon_finished_count = 11; + * optional uint32 week_cocoon_finished_count = 1; */ private int weekCocoonFinishedCount; /** - * optional .PlayerSettingInfo player_setting_info = 12; + * 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; + */ + private int curDay; + + /** + * optional .PlayerSettingInfo player_setting_info = 11; */ private final PlayerSettingInfoOuterClass.PlayerSettingInfo playerSettingInfo = PlayerSettingInfoOuterClass.PlayerSettingInfo.newInstance(); @@ -69,62 +69,25 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 last_set_nickname_time = 10; - * @return whether the lastSetNicknameTime field is set + * optional int64 next_recover_time = 4; + * @return whether the nextRecoverTime field is set */ - public boolean hasLastSetNicknameTime() { + public boolean hasNextRecoverTime() { return (bitField0_ & 0x00000001) != 0; } /** - * optional int64 last_set_nickname_time = 10; - * @return this - */ - public GetBasicInfoScRsp clearLastSetNicknameTime() { - bitField0_ &= ~0x00000001; - lastSetNicknameTime = 0L; - return this; - } - - /** - * optional int64 last_set_nickname_time = 10; - * @return the lastSetNicknameTime - */ - public long getLastSetNicknameTime() { - return lastSetNicknameTime; - } - - /** - * optional int64 last_set_nickname_time = 10; - * @param value the lastSetNicknameTime to set - * @return this - */ - public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { - bitField0_ |= 0x00000001; - lastSetNicknameTime = value; - return this; - } - - /** - * optional int64 next_recover_time = 15; - * @return whether the nextRecoverTime field is set - */ - public boolean hasNextRecoverTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 4; * @return this */ public GetBasicInfoScRsp clearNextRecoverTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; nextRecoverTime = 0L; return this; } /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 4; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -132,92 +95,129 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional int64 next_recover_time = 15; + * optional int64 next_recover_time = 4; * @param value the nextRecoverTime to set * @return this */ public GetBasicInfoScRsp setNextRecoverTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; nextRecoverTime = value; return this; } /** - * optional uint32 gameplay_birthday = 2; - * @return whether the gameplayBirthday field is set + * optional int64 last_set_nickname_time = 14; + * @return whether the lastSetNicknameTime field is set */ - public boolean hasGameplayBirthday() { + public boolean hasLastSetNicknameTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional int64 last_set_nickname_time = 14; + * @return this + */ + public GetBasicInfoScRsp clearLastSetNicknameTime() { + bitField0_ &= ~0x00000002; + lastSetNicknameTime = 0L; + return this; + } + + /** + * optional int64 last_set_nickname_time = 14; + * @return the lastSetNicknameTime + */ + public long getLastSetNicknameTime() { + return lastSetNicknameTime; + } + + /** + * optional int64 last_set_nickname_time = 14; + * @param value the lastSetNicknameTime to set + * @return this + */ + public GetBasicInfoScRsp setLastSetNicknameTime(final long value) { + bitField0_ |= 0x00000002; + lastSetNicknameTime = value; + return this; + } + + /** + * optional uint32 week_cocoon_finished_count = 1; + * @return whether the weekCocoonFinishedCount field is set + */ + public boolean hasWeekCocoonFinishedCount() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 gameplay_birthday = 2; + * optional uint32 week_cocoon_finished_count = 1; * @return this */ - public GetBasicInfoScRsp clearGameplayBirthday() { + public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { bitField0_ &= ~0x00000004; - gameplayBirthday = 0; + weekCocoonFinishedCount = 0; return this; } /** - * optional uint32 gameplay_birthday = 2; - * @return the gameplayBirthday + * optional uint32 week_cocoon_finished_count = 1; + * @return the weekCocoonFinishedCount */ - public int getGameplayBirthday() { - return gameplayBirthday; + public int getWeekCocoonFinishedCount() { + return weekCocoonFinishedCount; } /** - * optional uint32 gameplay_birthday = 2; - * @param value the gameplayBirthday to set + * optional uint32 week_cocoon_finished_count = 1; + * @param value the weekCocoonFinishedCount to set * @return this */ - public GetBasicInfoScRsp setGameplayBirthday(final int value) { + public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { bitField0_ |= 0x00000004; - gameplayBirthday = value; + weekCocoonFinishedCount = value; return this; } /** - * optional uint32 cur_day = 3; - * @return whether the curDay field is set + * optional uint32 exchange_times = 2; + * @return whether the exchangeTimes field is set */ - public boolean hasCurDay() { + public boolean hasExchangeTimes() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 cur_day = 3; + * optional uint32 exchange_times = 2; * @return this */ - public GetBasicInfoScRsp clearCurDay() { + public GetBasicInfoScRsp clearExchangeTimes() { bitField0_ &= ~0x00000008; - curDay = 0; + exchangeTimes = 0; return this; } /** - * optional uint32 cur_day = 3; - * @return the curDay + * optional uint32 exchange_times = 2; + * @return the exchangeTimes */ - public int getCurDay() { - return curDay; + public int getExchangeTimes() { + return exchangeTimes; } /** - * optional uint32 cur_day = 3; - * @param value the curDay to set + * optional uint32 exchange_times = 2; + * @param value the exchangeTimes to set * @return this */ - public GetBasicInfoScRsp setCurDay(final int value) { + public GetBasicInfoScRsp setExchangeTimes(final int value) { bitField0_ |= 0x00000008; - curDay = value; + exchangeTimes = value; return this; } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -225,7 +225,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return this */ public GetBasicInfoScRsp clearRetcode() { @@ -235,7 +235,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -243,7 +243,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -254,81 +254,81 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional uint32 exchange_times = 8; - * @return whether the exchangeTimes field is set + * optional uint32 gameplay_birthday = 13; + * @return whether the gameplayBirthday field is set */ - public boolean hasExchangeTimes() { + public boolean hasGameplayBirthday() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 exchange_times = 8; + * optional uint32 gameplay_birthday = 13; * @return this */ - public GetBasicInfoScRsp clearExchangeTimes() { + public GetBasicInfoScRsp clearGameplayBirthday() { bitField0_ &= ~0x00000020; - exchangeTimes = 0; + gameplayBirthday = 0; return this; } /** - * optional uint32 exchange_times = 8; - * @return the exchangeTimes + * optional uint32 gameplay_birthday = 13; + * @return the gameplayBirthday */ - public int getExchangeTimes() { - return exchangeTimes; + public int getGameplayBirthday() { + return gameplayBirthday; } /** - * optional uint32 exchange_times = 8; - * @param value the exchangeTimes to set + * optional uint32 gameplay_birthday = 13; + * @param value the gameplayBirthday to set * @return this */ - public GetBasicInfoScRsp setExchangeTimes(final int value) { + public GetBasicInfoScRsp setGameplayBirthday(final int value) { bitField0_ |= 0x00000020; - exchangeTimes = value; + gameplayBirthday = value; return this; } /** - * optional uint32 week_cocoon_finished_count = 11; - * @return whether the weekCocoonFinishedCount field is set + * optional uint32 cur_day = 15; + * @return whether the curDay field is set */ - public boolean hasWeekCocoonFinishedCount() { + public boolean hasCurDay() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 week_cocoon_finished_count = 11; + * optional uint32 cur_day = 15; * @return this */ - public GetBasicInfoScRsp clearWeekCocoonFinishedCount() { + public GetBasicInfoScRsp clearCurDay() { bitField0_ &= ~0x00000040; - weekCocoonFinishedCount = 0; + curDay = 0; return this; } /** - * optional uint32 week_cocoon_finished_count = 11; - * @return the weekCocoonFinishedCount + * optional uint32 cur_day = 15; + * @return the curDay */ - public int getWeekCocoonFinishedCount() { - return weekCocoonFinishedCount; + public int getCurDay() { + return curDay; } /** - * optional uint32 week_cocoon_finished_count = 11; - * @param value the weekCocoonFinishedCount to set + * optional uint32 cur_day = 15; + * @param value the curDay to set * @return this */ - public GetBasicInfoScRsp setWeekCocoonFinishedCount(final int value) { + public GetBasicInfoScRsp setCurDay(final int value) { bitField0_ |= 0x00000040; - weekCocoonFinishedCount = value; + curDay = value; return this; } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 11; * @return whether the playerSettingInfo field is set */ public boolean hasPlayerSettingInfo() { @@ -336,7 +336,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 11; * @return this */ public GetBasicInfoScRsp clearPlayerSettingInfo() { @@ -346,7 +346,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_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. @@ -360,7 +360,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_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 @@ -374,7 +374,7 @@ public final class GetBasicInfoScRspOuterClass { } /** - * optional .PlayerSettingInfo player_setting_info = 12; + * optional .PlayerSettingInfo player_setting_info = 11; * @param value the playerSettingInfo to set * @return this */ @@ -390,13 +390,13 @@ public final class GetBasicInfoScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - lastSetNicknameTime = other.lastSetNicknameTime; nextRecoverTime = other.nextRecoverTime; + lastSetNicknameTime = other.lastSetNicknameTime; + weekCocoonFinishedCount = other.weekCocoonFinishedCount; + exchangeTimes = other.exchangeTimes; + retcode = other.retcode; gameplayBirthday = other.gameplayBirthday; curDay = other.curDay; - retcode = other.retcode; - exchangeTimes = other.exchangeTimes; - weekCocoonFinishedCount = other.weekCocoonFinishedCount; playerSettingInfo.copyFrom(other.playerSettingInfo); } return this; @@ -408,11 +408,20 @@ public final class GetBasicInfoScRspOuterClass { return this; } cachedSize = -1; + if (other.hasNextRecoverTime()) { + setNextRecoverTime(other.nextRecoverTime); + } if (other.hasLastSetNicknameTime()) { setLastSetNicknameTime(other.lastSetNicknameTime); } - if (other.hasNextRecoverTime()) { - setNextRecoverTime(other.nextRecoverTime); + if (other.hasWeekCocoonFinishedCount()) { + setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); + } + if (other.hasExchangeTimes()) { + setExchangeTimes(other.exchangeTimes); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasGameplayBirthday()) { setGameplayBirthday(other.gameplayBirthday); @@ -420,15 +429,6 @@ public final class GetBasicInfoScRspOuterClass { if (other.hasCurDay()) { setCurDay(other.curDay); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } - if (other.hasExchangeTimes()) { - setExchangeTimes(other.exchangeTimes); - } - if (other.hasWeekCocoonFinishedCount()) { - setWeekCocoonFinishedCount(other.weekCocoonFinishedCount); - } if (other.hasPlayerSettingInfo()) { getMutablePlayerSettingInfo().mergeFrom(other.playerSettingInfo); } @@ -442,13 +442,13 @@ public final class GetBasicInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - lastSetNicknameTime = 0L; nextRecoverTime = 0L; + lastSetNicknameTime = 0L; + weekCocoonFinishedCount = 0; + exchangeTimes = 0; + retcode = 0; gameplayBirthday = 0; curDay = 0; - retcode = 0; - exchangeTimes = 0; - weekCocoonFinishedCount = 0; playerSettingInfo.clear(); return this; } @@ -474,48 +474,48 @@ public final class GetBasicInfoScRspOuterClass { } GetBasicInfoScRsp other = (GetBasicInfoScRsp) o; return bitField0_ == other.bitField0_ - && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) + && (!hasLastSetNicknameTime() || lastSetNicknameTime == other.lastSetNicknameTime) + && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) + && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) + && (!hasRetcode() || retcode == other.retcode) && (!hasGameplayBirthday() || gameplayBirthday == other.gameplayBirthday) && (!hasCurDay() || curDay == other.curDay) - && (!hasRetcode() || retcode == other.retcode) - && (!hasExchangeTimes() || exchangeTimes == other.exchangeTimes) - && (!hasWeekCocoonFinishedCount() || weekCocoonFinishedCount == other.weekCocoonFinishedCount) && (!hasPlayerSettingInfo() || playerSettingInfo.equals(other.playerSettingInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeInt64NoTag(lastSetNicknameTime); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 32); output.writeInt64NoTag(nextRecoverTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeInt64NoTag(lastSetNicknameTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(gameplayBirthday); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(curDay); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(exchangeTimes); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(gameplayBirthday); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(weekCocoonFinishedCount); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(curDay); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 90); output.writeMessageNoTag(playerSettingInfo); } } @@ -524,25 +524,25 @@ public final class GetBasicInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeInt64SizeNoTag(lastSetNicknameTime); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); + size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exchangeTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameplayBirthday); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(weekCocoonFinishedCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curDay); } 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 80: { - // lastSetNicknameTime - lastSetNicknameTime = input.readInt64(); + case 32: { + // nextRecoverTime + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // nextRecoverTime - nextRecoverTime = input.readInt64(); + 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: { - // gameplayBirthday - gameplayBirthday = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // curDay - curDay = input.readUInt32(); + // exchangeTimes + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 64) { + if (tag != 104) { break; } } - case 64: { - // exchangeTimes - exchangeTimes = input.readUInt32(); + case 104: { + // gameplayBirthday + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // weekCocoonFinishedCount - weekCocoonFinishedCount = input.readUInt32(); + case 120: { + // curDay + curDay = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { + case 90: { // playerSettingInfo input.readMessage(playerSettingInfo); bitField0_ |= 0x00000080; @@ -647,25 +647,25 @@ public final class GetBasicInfoScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.lastSetNicknameTime, lastSetNicknameTime); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); + output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.curDay, curDay); + output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.exchangeTimes, exchangeTimes); + output.writeUInt32(FieldNames.gameplayBirthday, gameplayBirthday); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.weekCocoonFinishedCount, weekCocoonFinishedCount); + output.writeUInt32(FieldNames.curDay, curDay); } if ((bitField0_ & 0x00000080) != 0) { output.writeMessage(FieldNames.playerSettingInfo, playerSettingInfo); @@ -680,11 +680,11 @@ public final class GetBasicInfoScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1278606439: - case 400029048: { - if (input.isAtField(FieldNames.lastSetNicknameTime)) { + case -1964148386: + case 394600084: { + if (input.isAtField(FieldNames.nextRecoverTime)) { if (!input.trySkipNullValue()) { - lastSetNicknameTime = input.readInt64(); + nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; } } else { @@ -692,11 +692,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1964148386: - case 394600084: { - if (input.isAtField(FieldNames.nextRecoverTime)) { + case 1278606439: + case 400029048: { + if (input.isAtField(FieldNames.lastSetNicknameTime)) { if (!input.trySkipNullValue()) { - nextRecoverTime = input.readInt64(); + lastSetNicknameTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -704,11 +704,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 686542531: - case 172986486: { - if (input.isAtField(FieldNames.gameplayBirthday)) { + case 1387396786: + case 668486783: { + if (input.isAtField(FieldNames.weekCocoonFinishedCount)) { if (!input.trySkipNullValue()) { - gameplayBirthday = input.readUInt32(); + weekCocoonFinishedCount = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -716,11 +716,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case -1349164740: - case 1126372637: { - if (input.isAtField(FieldNames.curDay)) { + case 1371137763: + case -119434710: { + if (input.isAtField(FieldNames.exchangeTimes)) { if (!input.trySkipNullValue()) { - curDay = input.readUInt32(); + exchangeTimes = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -739,11 +739,11 @@ public final class GetBasicInfoScRspOuterClass { } break; } - case 1371137763: - case -119434710: { - if (input.isAtField(FieldNames.exchangeTimes)) { + case 686542531: + case 172986486: { + if (input.isAtField(FieldNames.gameplayBirthday)) { if (!input.trySkipNullValue()) { - exchangeTimes = input.readUInt32(); + gameplayBirthday = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -751,11 +751,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_ |= 0x00000040; } } else { @@ -828,20 +828,20 @@ public final class GetBasicInfoScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time"); + static final FieldName lastSetNicknameTime = FieldName.forField("lastSetNicknameTime", "last_set_nickname_time"); - static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time"); + 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 retcode = FieldName.forField("retcode"); - - static final FieldName exchangeTimes = FieldName.forField("exchangeTimes", "exchange_times"); - - static final FieldName weekCocoonFinishedCount = FieldName.forField("weekCocoonFinishedCount", "week_cocoon_finished_count"); - 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 62d84b4..3c86ce2 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 = 1; + * optional uint32 retcode = 9; */ private int retcode; + /** + * repeated .Challenge challenge_list = 2; + */ + private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); + /** * repeated .ChallengeReward challenge_reward_list = 7; */ private final RepeatedMessage challengeRewardList = RepeatedMessage.newEmptyInstance(ChallengeRewardOuterClass.ChallengeReward.getFactory()); - /** - * repeated .Challenge challenge_list = 11; - */ - private final RepeatedMessage challengeList = RepeatedMessage.newEmptyInstance(ChallengeOuterClass.Challenge.getFactory()); - private GetChallengeScRsp() { } @@ -45,7 +45,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 9; * @return this */ public GetChallengeScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetChallengeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -81,12 +81,80 @@ public final class GetChallengeScRspOuterClass { return this; } + /** + * repeated .Challenge challenge_list = 2; + * @return whether the challengeList field is set + */ + public boolean hasChallengeList() { + 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_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -94,7 +162,7 @@ public final class GetChallengeScRspOuterClass { * @return this */ public GetChallengeScRsp clearChallengeRewardList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; challengeRewardList.clear(); return this; } @@ -124,7 +192,7 @@ public final class GetChallengeScRspOuterClass { */ public RepeatedMessage getMutableChallengeRewardList( ) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return challengeRewardList; } @@ -135,7 +203,7 @@ public final class GetChallengeScRspOuterClass { */ public GetChallengeScRsp addChallengeRewardList( final ChallengeRewardOuterClass.ChallengeReward value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; challengeRewardList.add(value); return this; } @@ -147,87 +215,19 @@ public final class GetChallengeScRspOuterClass { */ public GetChallengeScRsp addAllChallengeRewardList( final ChallengeRewardOuterClass.ChallengeReward... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; challengeRewardList.addAll(values); return this; } - /** - * repeated .Challenge challenge_list = 11; - * @return whether the challengeList field is set - */ - public boolean hasChallengeList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated .Challenge challenge_list = 11; - * @return this - */ - public GetChallengeScRsp clearChallengeList() { - bitField0_ &= ~0x00000004; - challengeList.clear(); - return this; - } - - /** - * repeated .Challenge challenge_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 #getMutableChallengeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getChallengeList() { - return challengeList; - } - - /** - * repeated .Challenge challenge_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 getMutableChallengeList() { - bitField0_ |= 0x00000004; - return challengeList; - } - - /** - * repeated .Challenge challenge_list = 11; - * @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 = 11; - * @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; - challengeRewardList.copyFrom(other.challengeRewardList); challengeList.copyFrom(other.challengeList); + challengeRewardList.copyFrom(other.challengeRewardList); } return this; } @@ -241,12 +241,12 @@ public final class GetChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasChallengeRewardList()) { - getMutableChallengeRewardList().addAll(other.challengeRewardList); - } if (other.hasChallengeList()) { getMutableChallengeList().addAll(other.challengeList); } + if (other.hasChallengeRewardList()) { + getMutableChallengeRewardList().addAll(other.challengeRewardList); + } return this; } @@ -258,8 +258,8 @@ public final class GetChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - challengeRewardList.clear(); challengeList.clear(); + challengeRewardList.clear(); return this; } @@ -270,8 +270,8 @@ public final class GetChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeRewardList.clearQuick(); challengeList.clearQuick(); + challengeRewardList.clearQuick(); return this; } @@ -286,26 +286,26 @@ public final class GetChallengeScRspOuterClass { GetChallengeScRsp other = (GetChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)) - && (!hasChallengeList() || challengeList.equals(other.challengeList)); + && (!hasChallengeList() || challengeList.equals(other.challengeList)) + && (!hasChallengeRewardList() || challengeRewardList.equals(other.challengeRewardList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 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) 18); + output.writeMessageNoTag(challengeList.get(i)); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < challengeList.length(); i++) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(challengeList.get(i)); + for (int i = 0; i < challengeRewardList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(challengeRewardList.get(i)); } } } @@ -317,10 +317,10 @@ public final class GetChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); + size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * challengeList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeList); + size += (1 * challengeRewardList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(challengeRewardList); } return size; } @@ -332,11 +332,19 @@ public final class GetChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // challengeList + tag = input.readRepeatedMessage(challengeList, tag); + bitField0_ |= 0x00000002; if (tag != 58) { break; } @@ -344,14 +352,6 @@ public final class GetChallengeScRspOuterClass { case 58: { // challengeRewardList tag = input.readRepeatedMessage(challengeRewardList, tag); - bitField0_ |= 0x00000002; - if (tag != 90) { - break; - } - } - case 90: { - // 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.challengeRewardList, challengeRewardList); + output.writeRepeatedMessage(FieldNames.challengeList, challengeList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.challengeList, challengeList); + output.writeRepeatedMessage(FieldNames.challengeRewardList, challengeRewardList); } output.endObject(); } @@ -404,11 +404,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_ |= 0x00000002; } } else { @@ -416,11 +416,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_ |= 0x00000004; } } else { @@ -483,9 +483,9 @@ public final class GetChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName challengeRewardList = FieldName.forField("challengeRewardList", "challenge_reward_list"); - static final FieldName challengeList = FieldName.forField("challengeList", "challenge_list"); + + static final FieldName challengeRewardList = FieldName.forField("challengeRewardList", "challenge_reward_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetCurChallengeScRspOuterClass.java index b804086..70d1005 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 = 13; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 15; */ private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return this */ public GetCurChallengeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 15; * @return whether the challengeInfo field is set */ public boolean hasChallengeInfo() { @@ -84,7 +84,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 15; * @return this */ public GetCurChallengeScRsp clearChallengeInfo() { @@ -94,7 +94,7 @@ public final class GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_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 GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_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 GetCurChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 11; + * optional .ChallengeInfo challenge_info = 15; * @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) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 122); output.writeMessageNoTag(challengeInfo); } } @@ -227,16 +227,16 @@ public final class GetCurChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 122) { break; } } - case 90: { + case 122: { // 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 9f0ec56..ac47b9f 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 = 2; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 15; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return this */ public GetCurLineupDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 15; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -84,7 +84,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 15; * @return this */ public GetCurLineupDataScRsp clearLineup() { @@ -94,7 +94,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * 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. @@ -108,7 +108,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * 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 @@ -122,7 +122,7 @@ public final class GetCurLineupDataScRspOuterClass { } /** - * optional .LineupInfo lineup = 7; + * optional .LineupInfo lineup = 15; * @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) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(lineup); } } @@ -226,16 +226,16 @@ public final class GetCurLineupDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 122) { break; } } - case 58: { + case 122: { // 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 beb9288..51e3fda 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 = 12; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 12; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return this */ public GetCurSceneInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 12; * @return whether the scene field is set */ public boolean hasScene() { @@ -84,7 +84,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 12; * @return this */ public GetCurSceneInfoScRsp clearScene() { @@ -94,7 +94,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * 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. @@ -108,7 +108,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * 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 @@ -122,7 +122,7 @@ public final class GetCurSceneInfoScRspOuterClass { } /** - * optional .SceneInfo scene = 3; + * optional .SceneInfo scene = 12; * @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) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 98); output.writeMessageNoTag(scene); } } @@ -226,16 +226,16 @@ public final class GetCurSceneInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 98) { break; } } - case 26: { + case 98: { // 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 a569473..a9052c2 100644 --- a/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetDailyActiveInfoScRspOuterClass.java @@ -21,7 +21,7 @@ public final class GetDailyActiveInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 daily_active_point = 6; + * optional uint32 daily_active_point = 3; */ private int dailyActivePoint; @@ -31,12 +31,12 @@ public final class GetDailyActiveInfoScRspOuterClass { private int retcode; /** - * repeated uint32 daily_active_quest_id_list = 2; + * repeated uint32 daily_active_quest_id_list = 14; */ private final RepeatedInt dailyActiveQuestIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_list = 1; */ private final RepeatedMessage dailyActiveLevelList = RepeatedMessage.newEmptyInstance(DailyActivityInfoOuterClass.DailyActivityInfo.getFactory()); @@ -51,7 +51,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 6; + * optional uint32 daily_active_point = 3; * @return whether the dailyActivePoint field is set */ public boolean hasDailyActivePoint() { @@ -59,7 +59,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 6; + * optional uint32 daily_active_point = 3; * @return this */ public GetDailyActiveInfoScRsp clearDailyActivePoint() { @@ -69,7 +69,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 6; + * optional uint32 daily_active_point = 3; * @return the dailyActivePoint */ public int getDailyActivePoint() { @@ -77,7 +77,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * optional uint32 daily_active_point = 6; + * optional uint32 daily_active_point = 3; * @param value the dailyActivePoint to set * @return this */ @@ -125,7 +125,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 2; + * repeated uint32 daily_active_quest_id_list = 14; * @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 = 2; + * repeated uint32 daily_active_quest_id_list = 14; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveQuestIdList() { @@ -143,7 +143,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 2; + * 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. @@ -157,7 +157,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 2; + * 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 @@ -171,7 +171,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 2; + * repeated uint32 daily_active_quest_id_list = 14; * @param value the dailyActiveQuestIdList to add * @return this */ @@ -182,7 +182,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated uint32 daily_active_quest_id_list = 2; + * repeated uint32 daily_active_quest_id_list = 14; * @param values the dailyActiveQuestIdList to add * @return this */ @@ -193,7 +193,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_list = 1; * @return whether the dailyActiveLevelList field is set */ public boolean hasDailyActiveLevelList() { @@ -201,7 +201,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_list = 1; * @return this */ public GetDailyActiveInfoScRsp clearDailyActiveLevelList() { @@ -211,7 +211,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_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. @@ -226,7 +226,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_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 @@ -241,7 +241,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_list = 1; * @param value the dailyActiveLevelList to add * @return this */ @@ -253,7 +253,7 @@ public final class GetDailyActiveInfoScRspOuterClass { } /** - * repeated .DailyActivityInfo daily_active_level_list = 12; + * repeated .DailyActivityInfo daily_active_level_list = 1; * @param values the dailyActiveLevelList to add * @return this */ @@ -343,7 +343,7 @@ public final class GetDailyActiveInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(dailyActivePoint); } if ((bitField0_ & 0x00000002) != 0) { @@ -352,13 +352,13 @@ public final class GetDailyActiveInfoScRspOuterClass { } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < dailyActiveQuestIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(dailyActiveQuestIdList.array()[i]); } } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dailyActiveLevelList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 10); output.writeMessageNoTag(dailyActiveLevelList.get(i)); } } @@ -389,7 +389,7 @@ public final class GetDailyActiveInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 24: { // dailyActivePoint dailyActivePoint = input.readUInt32(); bitField0_ |= 0x00000001; @@ -403,20 +403,20 @@ public final class GetDailyActiveInfoScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 114) { break; } } - case 18: { + case 114: { // dailyActiveQuestIdList [packed=true] input.readPackedUInt32(dailyActiveQuestIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 10) { break; } } - case 98: { + case 10: { // dailyActiveLevelList tag = input.readRepeatedMessage(dailyActiveLevelList, tag); bitField0_ |= 0x00000008; @@ -434,7 +434,7 @@ public final class GetDailyActiveInfoScRspOuterClass { tag = input.readTag(); break; } - case 16: { + case 112: { // 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 02ed0de..58d4dfb 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 = 6; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_info = 15; */ private final RepeatedMessage enteredSceneInfo = RepeatedMessage.newEmptyInstance(EnteredSceneInfoOuterClass.EnteredSceneInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return this */ public GetEnteredSceneScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_info = 15; * @return whether the enteredSceneInfo field is set */ public boolean hasEnteredSceneInfo() { @@ -85,7 +85,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_info = 15; * @return this */ public GetEnteredSceneScRsp clearEnteredSceneInfo() { @@ -95,7 +95,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_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. @@ -109,7 +109,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_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 @@ -124,7 +124,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_info = 15; * @param value the enteredSceneInfo to add * @return this */ @@ -136,7 +136,7 @@ public final class GetEnteredSceneScRspOuterClass { } /** - * repeated .EnteredSceneInfo entered_scene_info = 13; + * repeated .EnteredSceneInfo entered_scene_info = 15; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < enteredSceneInfo.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 122); output.writeMessageNoTag(enteredSceneInfo.get(i)); } } @@ -243,16 +243,16 @@ public final class GetEnteredSceneScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 122) { break; } } - case 106: { + case 122: { // 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 7cd297e..2760a8b 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 = 6; + * repeated uint32 farm_stage_gacha_id_list = 12; */ private final RepeatedInt farmStageGachaIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 6; + * repeated uint32 farm_stage_gacha_id_list = 12; * @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 = 6; + * repeated uint32 farm_stage_gacha_id_list = 12; * @return this */ public GetFarmStageGachaInfoCsReq clearFarmStageGachaIdList() { @@ -53,7 +53,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 6; + * repeated uint32 farm_stage_gacha_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. @@ -67,7 +67,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 6; + * repeated uint32 farm_stage_gacha_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 @@ -81,7 +81,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 6; + * repeated uint32 farm_stage_gacha_id_list = 12; * @param value the farmStageGachaIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { } /** - * repeated uint32 farm_stage_gacha_id_list = 6; + * repeated uint32 farm_stage_gacha_id_list = 12; * @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) 48); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(farmStageGachaIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 98: { // farmStageGachaIdList [packed=true] input.readPackedUInt32(farmStageGachaIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFarmStageGachaInfoCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 96: { // 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 1694b9b..2532212 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 = 8; + * optional uint32 retcode = 1; */ private int retcode; /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; */ private final RepeatedMessage farmStageGachaInfoList = RepeatedMessage.newEmptyInstance(FarmStageGachaInfoOuterClass.FarmStageGachaInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return this */ public GetFarmStageGachaInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; * @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 = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; * @return this */ public GetFarmStageGachaInfoScRsp clearFarmStageGachaInfoList() { @@ -95,7 +95,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_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. @@ -110,7 +110,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_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 @@ -125,7 +125,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; * @param value the farmStageGachaInfoList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFarmStageGachaInfoScRspOuterClass { } /** - * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 3; + * repeated .FarmStageGachaInfo farm_stage_gacha_info_list = 4; * @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) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < farmStageGachaInfoList.length(); i++) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 34); output.writeMessageNoTag(farmStageGachaInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFarmStageGachaInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { + case 34: { // 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 9adaf96..12cc4d8 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 = 13; + * repeated uint32 npc_talk_list = 14; */ private final RepeatedInt npcTalkList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_list = 14; * @return whether the npcTalkList field is set */ public boolean hasNpcTalkList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_list = 14; * @return this */ public GetFirstTalkByPerformanceNpcCsReq clearNpcTalkList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_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. @@ -67,7 +67,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_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 @@ -81,7 +81,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_list = 14; * @param value the npcTalkList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { } /** - * repeated uint32 npc_talk_list = 13; + * repeated uint32 npc_talk_list = 14; * @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) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(npcTalkList.array()[i]); } } @@ -187,7 +187,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 106: { + case 114: { // npcTalkList [packed=true] input.readPackedUInt32(npcTalkList, tag); bitField0_ |= 0x00000001; @@ -206,7 +206,7 @@ public final class GetFirstTalkByPerformanceNpcCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 112: { // 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 4836b96..f79ad86 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 = 6; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_info_list = 10; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(NpcTalkInfoOuterClass.NpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_info_list = 10; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_info_list = 10; * @return this */ public GetFirstTalkByPerformanceNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_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. @@ -109,7 +109,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_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 @@ -123,7 +123,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_info_list = 10; * @param value the npcTalkInfoList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { } /** - * repeated .NpcTalkInfo npc_talk_info_list = 15; + * repeated .NpcTalkInfo npc_talk_info_list = 10; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 82); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFirstTalkByPerformanceNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // 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 f60315a..b252175 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 = 15; + * repeated uint32 npc_id_list = 1; */ private final RepeatedInt npcIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_id_list = 1; * @return whether the npcIdList field is set */ public boolean hasNpcIdList() { @@ -43,7 +43,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_id_list = 1; * @return this */ public GetFirstTalkNpcCsReq clearNpcIdList() { @@ -53,7 +53,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_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. @@ -67,7 +67,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_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 @@ -81,7 +81,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_id_list = 1; * @param value the npcIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { } /** - * repeated uint32 npc_id_list = 15; + * repeated uint32 npc_id_list = 1; * @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) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(npcIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 10: { // npcIdList [packed=true] input.readPackedUInt32(npcIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetFirstTalkNpcCsReqOuterClass { tag = input.readTag(); break; } - case 120: { + case 8: { // 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 0679520..92f0292 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 = 10; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; */ private final RepeatedMessage npcTalkInfoList = RepeatedMessage.newEmptyInstance(FirstNpcTalkInfoOuterClass.FirstNpcTalkInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return this */ public GetFirstTalkNpcScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; * @return whether the npcTalkInfoList field is set */ public boolean hasNpcTalkInfoList() { @@ -85,7 +85,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; * @return this */ public GetFirstTalkNpcScRsp clearNpcTalkInfoList() { @@ -95,7 +95,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_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 GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_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 @@ -124,7 +124,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; * @param value the npcTalkInfoList to add * @return this */ @@ -136,7 +136,7 @@ public final class GetFirstTalkNpcScRspOuterClass { } /** - * repeated .FirstNpcTalkInfo npc_talk_info_list = 12; + * repeated .FirstNpcTalkInfo npc_talk_info_list = 15; * @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) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < npcTalkInfoList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(npcTalkInfoList.get(i)); } } @@ -243,16 +243,16 @@ public final class GetFirstTalkNpcScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // 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 83f6afa..6d3ff1b 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendApplyListInfoScRspOuterClass.java @@ -25,7 +25,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { private int retcode; /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_list = 15; */ private final RepeatedMessage friendApplyList = RepeatedMessage.newEmptyInstance(FriendApplyInfoOuterClass.FriendApplyInfo.getFactory()); @@ -77,7 +77,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_list = 15; * @return whether the friendApplyList field is set */ public boolean hasFriendApplyList() { @@ -85,7 +85,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_list = 15; * @return this */ public GetFriendApplyListInfoScRsp clearFriendApplyList() { @@ -95,7 +95,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_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 GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_list = 15; * @param value the friendApplyList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } /** - * repeated .FriendApplyInfo friend_apply_list = 4; + * repeated .FriendApplyInfo friend_apply_list = 15; * @param values the friendApplyList to add * @return this */ @@ -217,7 +217,7 @@ public final class GetFriendApplyListInfoScRspOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendApplyList.length(); i++) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); output.writeMessageNoTag(friendApplyList.get(i)); } } @@ -247,11 +247,11 @@ public final class GetFriendApplyListInfoScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 122) { break; } } - case 34: { + case 122: { // 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 b8ebfa2..1086b1b 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 = 15; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_list = 4; */ private final RepeatedMessage friendList = RepeatedMessage.newEmptyInstance(FriendListInfoOuterClass.FriendListInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return this */ public GetFriendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_list = 4; * @return whether the friendList field is set */ public boolean hasFriendList() { @@ -85,7 +85,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_list = 4; * @return this */ public GetFriendListInfoScRsp clearFriendList() { @@ -95,7 +95,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_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 GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_list = 4; * @param value the friendList to add * @return this */ @@ -135,7 +135,7 @@ public final class GetFriendListInfoScRspOuterClass { } /** - * repeated .FriendListInfo friend_list = 7; + * repeated .FriendListInfo friend_list = 4; * @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) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 34); output.writeMessageNoTag(friendList.get(i)); } } @@ -242,16 +242,16 @@ public final class GetFriendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // 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 9daa3b7..e68bdf8 100644 --- a/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetFriendLoginInfoScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetFriendLoginInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; */ private int retcode; @@ -40,7 +40,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return this */ public GetFriendLoginInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendLoginInfoScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -210,7 +210,7 @@ public final class GetFriendLoginInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -240,7 +240,7 @@ public final class GetFriendLoginInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetFriendRecommendListInfoScRspOuterClass.java index 94c67be..7d5853f 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 = 2; + * optional uint32 retcode = 6; */ private int retcode; /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_list = 15; */ private final RepeatedMessage friendRecommendList = RepeatedMessage.newEmptyInstance(FriendRecommendInfoOuterClass.FriendRecommendInfo.getFactory()); @@ -40,7 +40,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return this */ public GetFriendRecommendListInfoScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_list = 15; * @return whether the friendRecommendList field is set */ public boolean hasFriendRecommendList() { @@ -85,7 +85,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_list = 15; * @return this */ public GetFriendRecommendListInfoScRsp clearFriendRecommendList() { @@ -95,7 +95,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_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 GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_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 GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_list = 15; * @param value the friendRecommendList to add * @return this */ @@ -137,7 +137,7 @@ public final class GetFriendRecommendListInfoScRspOuterClass { } /** - * repeated .FriendRecommendInfo friend_recommend_list = 9; + * repeated .FriendRecommendInfo friend_recommend_list = 15; * @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) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < friendRecommendList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(friendRecommendList.get(i)); } } @@ -244,16 +244,16 @@ public final class GetFriendRecommendListInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 122) { break; } } - case 74: { + case 122: { // 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 b1d7c04..d076f21 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 = 2; + * optional uint32 gacha_type = 7; */ private int gachaType; @@ -34,7 +34,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 2; + * optional uint32 gacha_type = 7; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -42,7 +42,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 2; + * optional uint32 gacha_type = 7; * @return this */ public GetGachaCeilingCsReq clearGachaType() { @@ -52,7 +52,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 2; + * optional uint32 gacha_type = 7; * @return the gachaType */ public int getGachaType() { @@ -60,7 +60,7 @@ public final class GetGachaCeilingCsReqOuterClass { } /** - * optional uint32 gacha_type = 2; + * optional uint32 gacha_type = 7; * @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) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaType); } } @@ -150,7 +150,7 @@ public final class GetGachaCeilingCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // 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 d6c8f6a..e39438a 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 = 5; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 9; */ private int gachaType; /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 13; */ private final GachaCeilingOuterClass.GachaCeiling gachaCeiling = GachaCeilingOuterClass.GachaCeiling.newInstance(); @@ -44,7 +44,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * 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 GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return this */ public GetGachaCeilingScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 9; * @return whether the gachaType field is set */ public boolean hasGachaType() { @@ -89,7 +89,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 9; * @return this */ public GetGachaCeilingScRsp clearGachaType() { @@ -99,7 +99,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 9; * @return the gachaType */ public int getGachaType() { @@ -107,7 +107,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional uint32 gacha_type = 13; + * optional uint32 gacha_type = 9; * @param value the gachaType to set * @return this */ @@ -118,7 +118,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 13; * @return whether the gachaCeiling field is set */ public boolean hasGachaCeiling() { @@ -126,7 +126,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 13; * @return this */ public GetGachaCeilingScRsp clearGachaCeiling() { @@ -136,7 +136,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 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. @@ -150,7 +150,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 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 @@ -164,7 +164,7 @@ public final class GetGachaCeilingScRspOuterClass { } /** - * optional .GachaCeiling gacha_ceiling = 3; + * optional .GachaCeiling gacha_ceiling = 13; * @param value the gachaCeiling to set * @return this */ @@ -246,15 +246,15 @@ public final class GetGachaCeilingScRspOuterClass { @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) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(gachaType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 106); output.writeMessageNoTag(gachaCeiling); } } @@ -281,25 +281,25 @@ public final class GetGachaCeilingScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // gachaType gachaType = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 106) { break; } } - case 26: { + case 106: { // gachaCeiling input.readMessage(gachaCeiling); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java index 836e4cf..f43680f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetGachaInfoScRspOuterClass.java @@ -25,12 +25,12 @@ public final class GetGachaInfoScRspOuterClass { private int retcode; /** - * optional uint32 gacha_random = 8; + * optional uint32 gacha_random = 7; */ private int gachaRandom; /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_info_list = 2; */ private final RepeatedMessage gachaInfoList = RepeatedMessage.newEmptyInstance(GachaInfoOuterClass.GachaInfo.getFactory()); @@ -82,7 +82,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 8; + * optional uint32 gacha_random = 7; * @return whether the gachaRandom field is set */ public boolean hasGachaRandom() { @@ -90,7 +90,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 8; + * optional uint32 gacha_random = 7; * @return this */ public GetGachaInfoScRsp clearGachaRandom() { @@ -100,7 +100,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 8; + * optional uint32 gacha_random = 7; * @return the gachaRandom */ public int getGachaRandom() { @@ -108,7 +108,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * optional uint32 gacha_random = 8; + * optional uint32 gacha_random = 7; * @param value the gachaRandom to set * @return this */ @@ -119,7 +119,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_info_list = 2; * @return whether the gachaInfoList field is set */ public boolean hasGachaInfoList() { @@ -127,7 +127,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_info_list = 2; * @return this */ public GetGachaInfoScRsp clearGachaInfoList() { @@ -137,7 +137,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_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. @@ -151,7 +151,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_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 @@ -165,7 +165,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_info_list = 2; * @param value the gachaInfoList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetGachaInfoScRspOuterClass { } /** - * repeated .GachaInfo gacha_info_list = 9; + * repeated .GachaInfo gacha_info_list = 2; * @param values the gachaInfoList to add * @return this */ @@ -262,12 +262,12 @@ public final class GetGachaInfoScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(gachaRandom); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < gachaInfoList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 18); output.writeMessageNoTag(gachaInfoList.get(i)); } } @@ -300,20 +300,20 @@ public final class GetGachaInfoScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { + case 56: { // gachaRandom gachaRandom = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 18) { break; } } - case 74: { + case 18: { // gachaInfoList tag = input.readRepeatedMessage(gachaInfoList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java index 5c9fdaf..31af325 100644 --- a/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetHeroBasicTypeInfoScRspOuterClass.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 GetHeroBasicTypeInfoScRspOuterClass { @@ -20,22 +21,27 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .Gender gender = 7; - */ - private int gender; - - /** - * optional .HeroBasicType cur_basic_type = 8; + * optional .HeroBasicType cur_basic_type = 3; */ private int curBasicType; /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * optional .Gender gender = 11; + */ + private int gender; + + /** + * repeated uint32 unlocked_basic_types = 8; + */ + private final RepeatedInt unlockedBasicTypes = RepeatedInt.newEmptyInstance(); + + /** + * repeated .HeroBasicTypeInfo basic_type_info_list = 15; */ private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); @@ -50,7 +56,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +64,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return this */ public GetHeroBasicTypeInfoScRsp clearRetcode() { @@ -68,7 +74,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -76,7 +82,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -87,87 +93,25 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * optional .Gender gender = 7; - * @return whether the gender field is set + * optional .HeroBasicType cur_basic_type = 3; + * @return whether the curBasicType field is set */ - public boolean hasGender() { + public boolean hasCurBasicType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .Gender gender = 7; - * @return this - */ - public GetHeroBasicTypeInfoScRsp clearGender() { - bitField0_ &= ~0x00000002; - gender = 0; - return this; - } - - /** - * optional .Gender gender = 7; - * @return the gender - */ - public GenderOuterClass.Gender getGender() { - return GenderOuterClass.Gender.forNumber(gender); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). - * - * @return numeric wire representation - */ - public int getGenderValue() { - return gender; - } - - /** - * 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 GenderOuterClass.Gender}. Setting an invalid value - * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { - bitField0_ |= 0x00000002; - gender = value; - return this; - } - - /** - * optional .Gender gender = 7; - * @param value the gender to set - * @return this - */ - public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { - bitField0_ |= 0x00000002; - gender = value.getNumber(); - return this; - } - - /** - * optional .HeroBasicType cur_basic_type = 8; - * @return whether the curBasicType field is set - */ - public boolean hasCurBasicType() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .HeroBasicType cur_basic_type = 8; + * optional .HeroBasicType cur_basic_type = 3; * @return this */ public GetHeroBasicTypeInfoScRsp clearCurBasicType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curBasicType = 0; return this; } /** - * optional .HeroBasicType cur_basic_type = 8; + * optional .HeroBasicType cur_basic_type = 3; * @return the curBasicType */ public HeroBasicTypeOuterClass.HeroBasicType getCurBasicType() { @@ -194,43 +138,173 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { * @return this */ public GetHeroBasicTypeInfoScRsp setCurBasicTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curBasicType = value; return this; } /** - * optional .HeroBasicType cur_basic_type = 8; + * optional .HeroBasicType cur_basic_type = 3; * @param value the curBasicType to set * @return this */ public GetHeroBasicTypeInfoScRsp setCurBasicType( final HeroBasicTypeOuterClass.HeroBasicType value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curBasicType = value.getNumber(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; - * @return whether the basicTypeInfoList field is set + * optional .Gender gender = 11; + * @return whether the gender field is set */ - public boolean hasBasicTypeInfoList() { + public boolean hasGender() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .Gender gender = 11; + * @return this + */ + public GetHeroBasicTypeInfoScRsp clearGender() { + bitField0_ &= ~0x00000004; + gender = 0; + return this; + } + + /** + * optional .Gender gender = 11; + * @return the gender + */ + public GenderOuterClass.Gender getGender() { + return GenderOuterClass.Gender.forNumber(gender); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link GetHeroBasicTypeInfoScRsp#getGender()}.getNumber(). + * + * @return numeric wire representation + */ + public int getGenderValue() { + return gender; + } + + /** + * 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 GenderOuterClass.Gender}. Setting an invalid value + * can cause {@link GetHeroBasicTypeInfoScRsp#getGender()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setGenderValue(final int value) { + bitField0_ |= 0x00000004; + gender = value; + return this; + } + + /** + * optional .Gender gender = 11; + * @param value the gender to set + * @return this + */ + public GetHeroBasicTypeInfoScRsp setGender(final GenderOuterClass.Gender value) { + bitField0_ |= 0x00000004; + gender = value.getNumber(); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 8; + * @return whether the unlockedBasicTypes field is set + */ + public boolean hasUnlockedBasicTypes() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * repeated uint32 unlocked_basic_types = 8; + * @return this + */ + public GetHeroBasicTypeInfoScRsp clearUnlockedBasicTypes() { + bitField0_ &= ~0x00000008; + unlockedBasicTypes.clear(); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 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 #getMutableUnlockedBasicTypes()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUnlockedBasicTypes() { + return unlockedBasicTypes; + } + + /** + * repeated uint32 unlocked_basic_types = 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 getMutableUnlockedBasicTypes() { + bitField0_ |= 0x00000008; + return unlockedBasicTypes; + } + + /** + * repeated uint32 unlocked_basic_types = 8; + * @param value the unlockedBasicTypes to add + * @return this + */ + public GetHeroBasicTypeInfoScRsp addUnlockedBasicTypes(final int value) { + bitField0_ |= 0x00000008; + unlockedBasicTypes.add(value); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 8; + * @param values the unlockedBasicTypes to add + * @return this + */ + public GetHeroBasicTypeInfoScRsp addAllUnlockedBasicTypes(final int... values) { + bitField0_ |= 0x00000008; + unlockedBasicTypes.addAll(values); + return this; + } + + /** + * repeated .HeroBasicTypeInfo basic_type_info_list = 15; + * @return whether the basicTypeInfoList field is set + */ + public boolean hasBasicTypeInfoList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .HeroBasicTypeInfo basic_type_info_list = 15; * @return this */ public GetHeroBasicTypeInfoScRsp clearBasicTypeInfoList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; basicTypeInfoList.clear(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * repeated .HeroBasicTypeInfo basic_type_info_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. @@ -244,7 +318,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * repeated .HeroBasicTypeInfo basic_type_info_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 @@ -254,30 +328,30 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { */ public RepeatedMessage getMutableBasicTypeInfoList( ) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return basicTypeInfoList; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * repeated .HeroBasicTypeInfo basic_type_info_list = 15; * @param value the basicTypeInfoList to add * @return this */ public GetHeroBasicTypeInfoScRsp addBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; basicTypeInfoList.add(value); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 9; + * repeated .HeroBasicTypeInfo basic_type_info_list = 15; * @param values the basicTypeInfoList to add * @return this */ public GetHeroBasicTypeInfoScRsp addAllBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; basicTypeInfoList.addAll(values); return this; } @@ -288,8 +362,9 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - gender = other.gender; curBasicType = other.curBasicType; + gender = other.gender; + unlockedBasicTypes.copyFrom(other.unlockedBasicTypes); basicTypeInfoList.copyFrom(other.basicTypeInfoList); } return this; @@ -304,11 +379,14 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasCurBasicType()) { + setCurBasicTypeValue(other.curBasicType); + } if (other.hasGender()) { setGenderValue(other.gender); } - if (other.hasCurBasicType()) { - setCurBasicTypeValue(other.curBasicType); + if (other.hasUnlockedBasicTypes()) { + getMutableUnlockedBasicTypes().addAll(other.unlockedBasicTypes); } if (other.hasBasicTypeInfoList()) { getMutableBasicTypeInfoList().addAll(other.basicTypeInfoList); @@ -324,8 +402,9 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - gender = 0; curBasicType = 0; + gender = 0; + unlockedBasicTypes.clear(); basicTypeInfoList.clear(); return this; } @@ -337,6 +416,7 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + unlockedBasicTypes.clear(); basicTypeInfoList.clearQuick(); return this; } @@ -352,28 +432,35 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { GetHeroBasicTypeInfoScRsp other = (GetHeroBasicTypeInfoScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasGender() || gender == other.gender) && (!hasCurBasicType() || curBasicType == other.curBasicType) + && (!hasGender() || gender == other.gender) + && (!hasUnlockedBasicTypes() || unlockedBasicTypes.equals(other.unlockedBasicTypes)) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeEnumNoTag(gender); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 24); output.writeEnumNoTag(curBasicType); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeEnumNoTag(gender); + } if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < unlockedBasicTypes.length(); i++) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(unlockedBasicTypes.array()[i]); + } + } + if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 122); output.writeMessageNoTag(basicTypeInfoList.get(i)); } } @@ -386,12 +473,15 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(gender); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(curBasicType); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(gender); + } if ((bitField0_ & 0x00000008) != 0) { + size += (1 * unlockedBasicTypes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedBasicTypes); + } + if ((bitField0_ & 0x00000010) != 0) { size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); } return size; @@ -404,43 +494,52 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 24) { break; } } - case 56: { - // gender - final int value = input.readInt32(); - if (GenderOuterClass.Gender.forNumber(value) != null) { - gender = value; - bitField0_ |= 0x00000002; - } - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 24: { // curBasicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { curBasicType = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 74) { + if (tag != 88) { break; } } - case 74: { + case 88: { + // gender + final int value = input.readInt32(); + if (GenderOuterClass.Gender.forNumber(value) != null) { + gender = value; + bitField0_ |= 0x00000004; + } + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { + // unlockedBasicTypes [packed=true] + input.readPackedUInt32(unlockedBasicTypes, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // basicTypeInfoList tag = input.readRepeatedMessage(basicTypeInfoList, tag); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -455,6 +554,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { tag = input.readTag(); break; } + case 64: { + // unlockedBasicTypes [packed=false] + tag = input.readRepeatedUInt32(unlockedBasicTypes, tag); + bitField0_ |= 0x00000008; + break; + } } } } @@ -466,12 +571,15 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.curBasicType, curBasicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeEnum(FieldNames.gender, gender, GenderOuterClass.Gender.converter()); + } if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.unlockedBasicTypes, unlockedBasicTypes); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); } output.endObject(); @@ -495,12 +603,13 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case -1249512767: { - if (input.isAtField(FieldNames.gender)) { + case -518506968: + case -979186678: { + if (input.isAtField(FieldNames.curBasicType)) { if (!input.trySkipNullValue()) { - final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); + final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); if (value != null) { - gender = value.getNumber(); + curBasicType = value.getNumber(); bitField0_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -511,13 +620,12 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } - case -518506968: - case -979186678: { - if (input.isAtField(FieldNames.curBasicType)) { + case -1249512767: { + if (input.isAtField(FieldNames.gender)) { if (!input.trySkipNullValue()) { - final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); + final GenderOuterClass.Gender value = input.readEnum(GenderOuterClass.Gender.converter()); if (value != null) { - curBasicType = value.getNumber(); + gender = value.getNumber(); bitField0_ |= 0x00000004; } else { input.skipUnknownEnumValue(); @@ -528,12 +636,24 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { } break; } + case 243664942: + case -212631092: { + if (input.isAtField(FieldNames.unlockedBasicTypes)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(unlockedBasicTypes); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } case -344592620: case -1315699973: { if (input.isAtField(FieldNames.basicTypeInfoList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(basicTypeInfoList); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -595,9 +715,11 @@ public final class GetHeroBasicTypeInfoScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); + static final FieldName gender = FieldName.forField("gender"); - static final FieldName curBasicType = FieldName.forField("curBasicType", "cur_basic_type"); + static final FieldName unlockedBasicTypes = FieldName.forField("unlockedBasicTypes", "unlocked_basic_types"); static final FieldName basicTypeInfoList = FieldName.forField("basicTypeInfoList", "basic_type_info_list"); } diff --git a/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetJukeboxDataScRspOuterClass.java index 5992e3b..645401a 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 = 3; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 playing_id = 7; + * optional uint32 playing_id = 12; */ private int playingId; /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_list = 2; */ private final RepeatedMessage musicList = RepeatedMessage.newEmptyInstance(UnlockedMusicOuterClass.UnlockedMusic.getFactory()); @@ -45,7 +45,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return this */ public GetJukeboxDataScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 retcode = 3; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 7; + * optional uint32 playing_id = 12; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -90,7 +90,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 7; + * optional uint32 playing_id = 12; * @return this */ public GetJukeboxDataScRsp clearPlayingId() { @@ -100,7 +100,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 7; + * optional uint32 playing_id = 12; * @return the playingId */ public int getPlayingId() { @@ -108,7 +108,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * optional uint32 playing_id = 7; + * optional uint32 playing_id = 12; * @param value the playingId to set * @return this */ @@ -119,7 +119,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_list = 2; * @return whether the musicList field is set */ public boolean hasMusicList() { @@ -127,7 +127,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_list = 2; * @return this */ public GetJukeboxDataScRsp clearMusicList() { @@ -137,7 +137,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_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 GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_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 GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_list = 2; * @param value the musicList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetJukeboxDataScRspOuterClass { } /** - * repeated .UnlockedMusic music_list = 11; + * repeated .UnlockedMusic music_list = 2; * @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) 24); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < musicList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 18); output.writeMessageNoTag(musicList.get(i)); } } @@ -296,25 +296,25 @@ public final class GetJukeboxDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 90) { + if (tag != 18) { break; } } - case 90: { + case 18: { // 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 4258f41..d54693a 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 = 1; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional uint32 start = 3; + * optional uint32 start = 13; */ private int start; /** - * optional uint32 total_num = 6; + * optional uint32 total_num = 14; */ private int totalNum; /** - * optional bool is_end = 10; + * optional bool is_end = 1; */ private boolean isEnd; /** - * repeated .ClientMail notice_mail_list = 2; - */ - private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); - - /** - * repeated .ClientMail mail_list = 13; + * repeated .ClientMail mail_list = 2; */ private final RepeatedMessage mailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + /** + * repeated .ClientMail notice_mail_list = 5; + */ + private final RepeatedMessage noticeMailList = RepeatedMessage.newEmptyInstance(ClientMailOuterClass.ClientMail.getFactory()); + private GetMailScRsp() { } @@ -60,7 +60,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -68,7 +68,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return this */ public GetMailScRsp clearRetcode() { @@ -78,7 +78,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -86,7 +86,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ @@ -97,7 +97,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 3; + * optional uint32 start = 13; * @return whether the start field is set */ public boolean hasStart() { @@ -105,7 +105,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 3; + * optional uint32 start = 13; * @return this */ public GetMailScRsp clearStart() { @@ -115,7 +115,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 3; + * optional uint32 start = 13; * @return the start */ public int getStart() { @@ -123,7 +123,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 start = 3; + * optional uint32 start = 13; * @param value the start to set * @return this */ @@ -134,7 +134,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 6; + * optional uint32 total_num = 14; * @return whether the totalNum field is set */ public boolean hasTotalNum() { @@ -142,7 +142,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 6; + * optional uint32 total_num = 14; * @return this */ public GetMailScRsp clearTotalNum() { @@ -152,7 +152,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 6; + * optional uint32 total_num = 14; * @return the totalNum */ public int getTotalNum() { @@ -160,7 +160,7 @@ public final class GetMailScRspOuterClass { } /** - * optional uint32 total_num = 6; + * optional uint32 total_num = 14; * @param value the totalNum to set * @return this */ @@ -171,7 +171,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 10; + * optional bool is_end = 1; * @return whether the isEnd field is set */ public boolean hasIsEnd() { @@ -179,7 +179,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 10; + * optional bool is_end = 1; * @return this */ public GetMailScRsp clearIsEnd() { @@ -189,7 +189,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 10; + * optional bool is_end = 1; * @return the isEnd */ public boolean getIsEnd() { @@ -197,7 +197,7 @@ public final class GetMailScRspOuterClass { } /** - * optional bool is_end = 10; + * optional bool is_end = 1; * @param value the isEnd to set * @return this */ @@ -208,93 +208,25 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail notice_mail_list = 2; - * @return whether the noticeMailList field is set + * repeated .ClientMail mail_list = 2; + * @return whether the mailList field is set */ - public boolean hasNoticeMailList() { + public boolean hasMailList() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .ClientMail notice_mail_list = 2; - * @return this - */ - public GetMailScRsp clearNoticeMailList() { - bitField0_ &= ~0x00000010; - noticeMailList.clear(); - return this; - } - - /** - * repeated .ClientMail notice_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 #getMutableNoticeMailList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getNoticeMailList() { - return noticeMailList; - } - - /** - * repeated .ClientMail notice_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 getMutableNoticeMailList() { - bitField0_ |= 0x00000010; - return noticeMailList; - } - - /** - * repeated .ClientMail notice_mail_list = 2; - * @param value the noticeMailList to add - * @return this - */ - public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) { - bitField0_ |= 0x00000010; - noticeMailList.add(value); - return this; - } - - /** - * repeated .ClientMail notice_mail_list = 2; - * @param values the noticeMailList to add - * @return this - */ - public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) { - bitField0_ |= 0x00000010; - noticeMailList.addAll(values); - return this; - } - - /** - * repeated .ClientMail mail_list = 13; - * @return whether the mailList field is set - */ - public boolean hasMailList() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * repeated .ClientMail mail_list = 13; + * repeated .ClientMail mail_list = 2; * @return this */ public GetMailScRsp clearMailList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; mailList.clear(); return this; } /** - * repeated .ClientMail mail_list = 13; + * 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. @@ -308,7 +240,7 @@ public final class GetMailScRspOuterClass { } /** - * repeated .ClientMail mail_list = 13; + * 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 @@ -317,32 +249,100 @@ public final class GetMailScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMailList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return mailList; } /** - * repeated .ClientMail mail_list = 13; + * repeated .ClientMail mail_list = 2; * @param value the mailList to add * @return this */ public GetMailScRsp addMailList(final ClientMailOuterClass.ClientMail value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; mailList.add(value); return this; } /** - * repeated .ClientMail mail_list = 13; + * repeated .ClientMail mail_list = 2; * @param values the mailList to add * @return this */ public GetMailScRsp addAllMailList(final ClientMailOuterClass.ClientMail... values) { - bitField0_ |= 0x00000020; + 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; + * @return this + */ + public GetMailScRsp clearNoticeMailList() { + bitField0_ &= ~0x00000020; + noticeMailList.clear(); + return this; + } + + /** + * repeated .ClientMail notice_mail_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 #getMutableNoticeMailList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getNoticeMailList() { + return noticeMailList; + } + + /** + * repeated .ClientMail notice_mail_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 getMutableNoticeMailList() { + bitField0_ |= 0x00000020; + return noticeMailList; + } + + /** + * repeated .ClientMail notice_mail_list = 5; + * @param value the noticeMailList to add + * @return this + */ + public GetMailScRsp addNoticeMailList(final ClientMailOuterClass.ClientMail value) { + bitField0_ |= 0x00000020; + noticeMailList.add(value); + return this; + } + + /** + * repeated .ClientMail notice_mail_list = 5; + * @param values the noticeMailList to add + * @return this + */ + public GetMailScRsp addAllNoticeMailList(final ClientMailOuterClass.ClientMail... values) { + bitField0_ |= 0x00000020; + noticeMailList.addAll(values); + return this; + } + @Override public GetMailScRsp copyFrom(final GetMailScRsp other) { cachedSize = other.cachedSize; @@ -352,8 +352,8 @@ public final class GetMailScRspOuterClass { start = other.start; totalNum = other.totalNum; isEnd = other.isEnd; - noticeMailList.copyFrom(other.noticeMailList); mailList.copyFrom(other.mailList); + noticeMailList.copyFrom(other.noticeMailList); } return this; } @@ -376,12 +376,12 @@ public final class GetMailScRspOuterClass { if (other.hasIsEnd()) { setIsEnd(other.isEnd); } - if (other.hasNoticeMailList()) { - getMutableNoticeMailList().addAll(other.noticeMailList); - } if (other.hasMailList()) { getMutableMailList().addAll(other.mailList); } + if (other.hasNoticeMailList()) { + getMutableNoticeMailList().addAll(other.noticeMailList); + } return this; } @@ -396,8 +396,8 @@ public final class GetMailScRspOuterClass { start = 0; totalNum = 0; isEnd = false; - noticeMailList.clear(); mailList.clear(); + noticeMailList.clear(); return this; } @@ -408,8 +408,8 @@ public final class GetMailScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - noticeMailList.clearQuick(); mailList.clearQuick(); + noticeMailList.clearQuick(); return this; } @@ -427,38 +427,38 @@ public final class GetMailScRspOuterClass { && (!hasStart() || start == other.start) && (!hasTotalNum() || totalNum == other.totalNum) && (!hasIsEnd() || isEnd == other.isEnd) - && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)) - && (!hasMailList() || mailList.equals(other.mailList)); + && (!hasMailList() || mailList.equals(other.mailList)) + && (!hasNoticeMailList() || noticeMailList.equals(other.noticeMailList)); } @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) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(start); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(totalNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isEnd); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < noticeMailList.length(); i++) { + for (int i = 0; i < mailList.length(); i++) { output.writeRawByte((byte) 18); - output.writeMessageNoTag(noticeMailList.get(i)); + output.writeMessageNoTag(mailList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mailList.length(); i++) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(mailList.get(i)); + for (int i = 0; i < noticeMailList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(noticeMailList.get(i)); } } } @@ -479,10 +479,10 @@ public final class GetMailScRspOuterClass { size += 2; } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); + size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mailList); + size += (1 * noticeMailList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(noticeMailList); } return size; } @@ -494,34 +494,34 @@ public final class GetMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 24: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { + case 104: { // start start = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // totalNum totalNum = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 8) { break; } } - case 80: { + case 8: { // isEnd isEnd = input.readBool(); bitField0_ |= 0x00000008; @@ -531,16 +531,16 @@ public final class GetMailScRspOuterClass { } } case 18: { - // noticeMailList - tag = input.readRepeatedMessage(noticeMailList, tag); + // mailList + tag = input.readRepeatedMessage(mailList, tag); bitField0_ |= 0x00000010; - if (tag != 106) { + if (tag != 42) { break; } } - case 106: { - // mailList - tag = input.readRepeatedMessage(mailList, tag); + case 42: { + // noticeMailList + tag = input.readRepeatedMessage(noticeMailList, tag); bitField0_ |= 0x00000020; if (tag != 0) { break; @@ -576,10 +576,10 @@ public final class GetMailScRspOuterClass { output.writeBool(FieldNames.isEnd, isEnd); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); + output.writeRepeatedMessage(FieldNames.mailList, mailList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mailList, mailList); + output.writeRepeatedMessage(FieldNames.noticeMailList, noticeMailList); } output.endObject(); } @@ -637,11 +637,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_ |= 0x00000010; } } else { @@ -649,11 +649,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_ |= 0x00000020; } } else { @@ -721,9 +721,9 @@ public final class GetMailScRspOuterClass { static final FieldName isEnd = FieldName.forField("isEnd", "is_end"); - static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list"); - static final FieldName mailList = FieldName.forField("mailList", "mail_list"); + + static final FieldName noticeMailList = FieldName.forField("noticeMailList", "notice_mail_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusCsReqOuterClass.java index 0a6495f..759a079 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 sub_mission_id_list = 6; - */ - private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 3; */ private final RepeatedInt missionEventIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_id_list = 4; */ private final RepeatedInt mainMissionIdList = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 sub_mission_id_list = 15; + */ + private final RepeatedInt subMissionIdList = RepeatedInt.newEmptyInstance(); + private GetMissionStatusCsReq() { } @@ -45,93 +45,25 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 sub_mission_id_list = 6; - * @return whether the subMissionIdList field is set + * repeated uint32 mission_event_id_list = 3; + * @return whether the missionEventIdList field is set */ - public boolean hasSubMissionIdList() { + public boolean hasMissionEventIdList() { return (bitField0_ & 0x00000001) != 0; } /** - * repeated uint32 sub_mission_id_list = 6; - * @return this - */ - public GetMissionStatusCsReq clearSubMissionIdList() { - bitField0_ &= ~0x00000001; - subMissionIdList.clear(); - return this; - } - - /** - * repeated uint32 sub_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. - * - * Use {@link #getMutableSubMissionIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getSubMissionIdList() { - return subMissionIdList; - } - - /** - * repeated uint32 sub_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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableSubMissionIdList() { - bitField0_ |= 0x00000001; - return subMissionIdList; - } - - /** - * repeated uint32 sub_mission_id_list = 6; - * @param value the subMissionIdList to add - * @return this - */ - public GetMissionStatusCsReq addSubMissionIdList(final int value) { - bitField0_ |= 0x00000001; - subMissionIdList.add(value); - return this; - } - - /** - * repeated uint32 sub_mission_id_list = 6; - * @param values the subMissionIdList to add - * @return this - */ - public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { - bitField0_ |= 0x00000001; - subMissionIdList.addAll(values); - return this; - } - - /** - * repeated uint32 mission_event_id_list = 9; - * @return whether the missionEventIdList field is set - */ - public boolean hasMissionEventIdList() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 3; * @return this */ public GetMissionStatusCsReq clearMissionEventIdList() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; missionEventIdList.clear(); return this; } /** - * repeated uint32 mission_event_id_list = 9; + * 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. @@ -145,7 +77,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 mission_event_id_list = 9; + * 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 @@ -154,52 +86,52 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMissionEventIdList() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return missionEventIdList; } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 3; * @param value the missionEventIdList to add * @return this */ public GetMissionStatusCsReq addMissionEventIdList(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; missionEventIdList.add(value); return this; } /** - * repeated uint32 mission_event_id_list = 9; + * repeated uint32 mission_event_id_list = 3; * @param values the missionEventIdList to add * @return this */ public GetMissionStatusCsReq addAllMissionEventIdList(final int... values) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; missionEventIdList.addAll(values); return this; } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_id_list = 4; * @return whether the mainMissionIdList field is set */ public boolean hasMainMissionIdList() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_id_list = 4; * @return this */ public GetMissionStatusCsReq clearMainMissionIdList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; mainMissionIdList.clear(); return this; } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_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. @@ -213,7 +145,7 @@ public final class GetMissionStatusCsReqOuterClass { } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_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 @@ -222,40 +154,108 @@ public final class GetMissionStatusCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableMainMissionIdList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return mainMissionIdList; } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_id_list = 4; * @param value the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addMainMissionIdList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; mainMissionIdList.add(value); return this; } /** - * repeated uint32 main_mission_id_list = 12; + * repeated uint32 main_mission_id_list = 4; * @param values the mainMissionIdList to add * @return this */ public GetMissionStatusCsReq addAllMainMissionIdList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; mainMissionIdList.addAll(values); return this; } + /** + * repeated uint32 sub_mission_id_list = 15; + * @return whether the subMissionIdList field is set + */ + public boolean hasSubMissionIdList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 sub_mission_id_list = 15; + * @return this + */ + public GetMissionStatusCsReq clearSubMissionIdList() { + bitField0_ &= ~0x00000004; + subMissionIdList.clear(); + return this; + } + + /** + * repeated uint32 sub_mission_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 #getMutableSubMissionIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getSubMissionIdList() { + return subMissionIdList; + } + + /** + * repeated uint32 sub_mission_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 getMutableSubMissionIdList() { + bitField0_ |= 0x00000004; + return subMissionIdList; + } + + /** + * repeated uint32 sub_mission_id_list = 15; + * @param value the subMissionIdList to add + * @return this + */ + public GetMissionStatusCsReq addSubMissionIdList(final int value) { + bitField0_ |= 0x00000004; + subMissionIdList.add(value); + return this; + } + + /** + * repeated uint32 sub_mission_id_list = 15; + * @param values the subMissionIdList to add + * @return this + */ + public GetMissionStatusCsReq addAllSubMissionIdList(final int... values) { + bitField0_ |= 0x00000004; + subMissionIdList.addAll(values); + return this; + } + @Override public GetMissionStatusCsReq copyFrom(final GetMissionStatusCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - subMissionIdList.copyFrom(other.subMissionIdList); missionEventIdList.copyFrom(other.missionEventIdList); mainMissionIdList.copyFrom(other.mainMissionIdList); + subMissionIdList.copyFrom(other.subMissionIdList); } return this; } @@ -266,15 +266,15 @@ public final class GetMissionStatusCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasSubMissionIdList()) { - getMutableSubMissionIdList().addAll(other.subMissionIdList); - } if (other.hasMissionEventIdList()) { getMutableMissionEventIdList().addAll(other.missionEventIdList); } if (other.hasMainMissionIdList()) { getMutableMainMissionIdList().addAll(other.mainMissionIdList); } + if (other.hasSubMissionIdList()) { + getMutableSubMissionIdList().addAll(other.subMissionIdList); + } return this; } @@ -285,9 +285,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - subMissionIdList.clear(); missionEventIdList.clear(); mainMissionIdList.clear(); + subMissionIdList.clear(); return this; } @@ -298,9 +298,9 @@ public final class GetMissionStatusCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - subMissionIdList.clear(); missionEventIdList.clear(); mainMissionIdList.clear(); + subMissionIdList.clear(); return this; } @@ -314,45 +314,45 @@ public final class GetMissionStatusCsReqOuterClass { } GetMissionStatusCsReq other = (GetMissionStatusCsReq) o; return bitField0_ == other.bitField0_ - && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)) && (!hasMissionEventIdList() || missionEventIdList.equals(other.missionEventIdList)) - && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)); + && (!hasMainMissionIdList() || mainMissionIdList.equals(other.mainMissionIdList)) + && (!hasSubMissionIdList() || subMissionIdList.equals(other.subMissionIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - for (int i = 0; i < subMissionIdList.length(); i++) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(subMissionIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < missionEventIdList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(missionEventIdList.array()[i]); } } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mainMissionIdList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(mainMissionIdList.array()[i]); } } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < subMissionIdList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(subMissionIdList.array()[i]); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); - } - if ((bitField0_ & 0x00000002) != 0) { size += (1 * missionEventIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(missionEventIdList); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += (1 * mainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mainMissionIdList); } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * subMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(subMissionIdList); + } return size; } @@ -363,27 +363,27 @@ public final class GetMissionStatusCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { - // subMissionIdList [packed=true] - input.readPackedUInt32(subMissionIdList, tag); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { + case 26: { // missionEventIdList [packed=true] input.readPackedUInt32(missionEventIdList, tag); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // mainMissionIdList [packed=true] input.readPackedUInt32(mainMissionIdList, tag); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // subMissionIdList [packed=true] + input.readPackedUInt32(subMissionIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -400,21 +400,21 @@ public final class GetMissionStatusCsReqOuterClass { tag = input.readTag(); break; } - case 48: { - // subMissionIdList [packed=false] - tag = input.readRepeatedUInt32(subMissionIdList, tag); + case 24: { + // missionEventIdList [packed=false] + tag = input.readRepeatedUInt32(missionEventIdList, tag); bitField0_ |= 0x00000001; break; } - case 72: { - // missionEventIdList [packed=false] - tag = input.readRepeatedUInt32(missionEventIdList, tag); + case 32: { + // mainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(mainMissionIdList, tag); bitField0_ |= 0x00000002; break; } - case 96: { - // mainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(mainMissionIdList, tag); + case 120: { + // subMissionIdList [packed=false] + tag = input.readRepeatedUInt32(subMissionIdList, 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.subMissionIdList, subMissionIdList); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.missionEventIdList, missionEventIdList); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRepeatedUInt32(FieldNames.mainMissionIdList, mainMissionIdList); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.subMissionIdList, subMissionIdList); + } output.endObject(); } @@ -444,24 +444,12 @@ public final class GetMissionStatusCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2039339685: - case -225917552: { - if (input.isAtField(FieldNames.subMissionIdList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(subMissionIdList); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 784770663: case -628890838: { if (input.isAtField(FieldNames.missionEventIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(missionEventIdList); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -473,6 +461,18 @@ public final class GetMissionStatusCsReqOuterClass { if (input.isAtField(FieldNames.mainMissionIdList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(mainMissionIdList); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2039339685: + case -225917552: { + if (input.isAtField(FieldNames.subMissionIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(subMissionIdList); bitField0_ |= 0x00000004; } } else { @@ -533,11 +533,11 @@ public final class GetMissionStatusCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName subMissionIdList = FieldName.forField("subMissionIdList", "sub_mission_id_list"); - 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetMissionStatusScRspOuterClass.java index 2cdaff5..c367835 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 = 8; + * optional uint32 retcode = 9; */ private int retcode; /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_id_list = 7; */ private final RepeatedInt finishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated uint32 disabled_main_mission_id_list = 10; - */ - private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * repeated uint32 unfinished_main_mission_id_list = 10; */ private final RepeatedInt unfinishedMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission mission_event_status_list = 1; + * repeated uint32 disabled_main_mission_id_list = 15; */ - private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private final RepeatedInt disabledMainMissionIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 4; */ private final RepeatedMessage subMissionStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + /** + * repeated .Mission mission_event_status_list = 12; + */ + private final RepeatedMessage missionEventStatusList = RepeatedMessage.newEmptyInstance(MissionOuterClass.Mission.getFactory()); + private GetMissionStatusScRsp() { } @@ -61,7 +61,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -69,7 +69,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @return this */ public GetMissionStatusScRsp clearRetcode() { @@ -79,7 +79,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -87,7 +87,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * optional uint32 retcode = 8; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -98,7 +98,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_id_list = 7; * @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 = 6; + * repeated uint32 finished_main_mission_id_list = 7; * @return this */ public GetMissionStatusScRsp clearFinishedMainMissionIdList() { @@ -116,7 +116,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_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. @@ -130,7 +130,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_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 @@ -144,7 +144,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_id_list = 7; * @param value the finishedMainMissionIdList to add * @return this */ @@ -155,7 +155,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 finished_main_mission_id_list = 6; + * repeated uint32 finished_main_mission_id_list = 7; * @param values the finishedMainMissionIdList to add * @return this */ @@ -166,93 +166,25 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 disabled_main_mission_id_list = 10; - * @return whether the disabledMainMissionIdList field is set + * repeated uint32 unfinished_main_mission_id_list = 10; + * @return whether the unfinishedMainMissionIdList field is set */ - public boolean hasDisabledMainMissionIdList() { + public boolean hasUnfinishedMainMissionIdList() { return (bitField0_ & 0x00000004) != 0; } /** - * repeated uint32 disabled_main_mission_id_list = 10; - * @return this - */ - public GetMissionStatusScRsp clearDisabledMainMissionIdList() { - bitField0_ &= ~0x00000004; - disabledMainMissionIdList.clear(); - return this; - } - - /** - * repeated uint32 disabled_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 #getMutableDisabledMainMissionIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getDisabledMainMissionIdList() { - return disabledMainMissionIdList; - } - - /** - * repeated uint32 disabled_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 getMutableDisabledMainMissionIdList() { - bitField0_ |= 0x00000004; - return disabledMainMissionIdList; - } - - /** - * repeated uint32 disabled_main_mission_id_list = 10; - * @param value the disabledMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) { - bitField0_ |= 0x00000004; - disabledMainMissionIdList.add(value); - return this; - } - - /** - * repeated uint32 disabled_main_mission_id_list = 10; - * @param values the disabledMainMissionIdList to add - * @return this - */ - public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) { - bitField0_ |= 0x00000004; - disabledMainMissionIdList.addAll(values); - return this; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; - * @return whether the unfinishedMainMissionIdList field is set - */ - public boolean hasUnfinishedMainMissionIdList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * repeated uint32 unfinished_main_mission_id_list = 10; * @return this */ public GetMissionStatusScRsp clearUnfinishedMainMissionIdList() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; unfinishedMainMissionIdList.clear(); return this; } /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * 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. @@ -266,7 +198,7 @@ public final class GetMissionStatusScRspOuterClass { } /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * 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 @@ -275,66 +207,66 @@ public final class GetMissionStatusScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableUnfinishedMainMissionIdList() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return unfinishedMainMissionIdList; } /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * repeated uint32 unfinished_main_mission_id_list = 10; * @param value the unfinishedMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addUnfinishedMainMissionIdList(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; unfinishedMainMissionIdList.add(value); return this; } /** - * repeated uint32 unfinished_main_mission_id_list = 12; + * repeated uint32 unfinished_main_mission_id_list = 10; * @param values the unfinishedMainMissionIdList to add * @return this */ public GetMissionStatusScRsp addAllUnfinishedMainMissionIdList(final int... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; unfinishedMainMissionIdList.addAll(values); return this; } /** - * repeated .Mission mission_event_status_list = 1; - * @return whether the missionEventStatusList field is set + * repeated uint32 disabled_main_mission_id_list = 15; + * @return whether the disabledMainMissionIdList field is set */ - public boolean hasMissionEventStatusList() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasDisabledMainMissionIdList() { + return (bitField0_ & 0x00000008) != 0; } /** - * repeated .Mission mission_event_status_list = 1; + * repeated uint32 disabled_main_mission_id_list = 15; * @return this */ - public GetMissionStatusScRsp clearMissionEventStatusList() { - bitField0_ &= ~0x00000010; - missionEventStatusList.clear(); + public GetMissionStatusScRsp clearDisabledMainMissionIdList() { + bitField0_ &= ~0x00000008; + disabledMainMissionIdList.clear(); return this; } /** - * repeated .Mission mission_event_status_list = 1; + * repeated uint32 disabled_main_mission_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 #getMutableMissionEventStatusList()} if you want to modify it. + * Use {@link #getMutableDisabledMainMissionIdList()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getMissionEventStatusList() { - return missionEventStatusList; + public RepeatedInt getDisabledMainMissionIdList() { + return disabledMainMissionIdList; } /** - * repeated .Mission mission_event_status_list = 1; + * repeated uint32 disabled_main_mission_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 @@ -342,54 +274,53 @@ public final class GetMissionStatusScRspOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableMissionEventStatusList() { - bitField0_ |= 0x00000010; - return missionEventStatusList; + public RepeatedInt getMutableDisabledMainMissionIdList() { + bitField0_ |= 0x00000008; + return disabledMainMissionIdList; } /** - * repeated .Mission mission_event_status_list = 1; - * @param value the missionEventStatusList to add + * repeated uint32 disabled_main_mission_id_list = 15; + * @param value the disabledMainMissionIdList to add * @return this */ - public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000010; - missionEventStatusList.add(value); + public GetMissionStatusScRsp addDisabledMainMissionIdList(final int value) { + bitField0_ |= 0x00000008; + disabledMainMissionIdList.add(value); return this; } /** - * repeated .Mission mission_event_status_list = 1; - * @param values the missionEventStatusList to add + * repeated uint32 disabled_main_mission_id_list = 15; + * @param values the disabledMainMissionIdList to add * @return this */ - public GetMissionStatusScRsp addAllMissionEventStatusList( - final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000010; - missionEventStatusList.addAll(values); + public GetMissionStatusScRsp addAllDisabledMainMissionIdList(final int... values) { + bitField0_ |= 0x00000008; + disabledMainMissionIdList.addAll(values); return this; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 4; * @return whether the subMissionStatusList field is set */ public boolean hasSubMissionStatusList() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 4; * @return this */ public GetMissionStatusScRsp clearSubMissionStatusList() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; subMissionStatusList.clear(); return this; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_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 sub_mission_status_list = 14; + * repeated .Mission sub_mission_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 getMutableSubMissionStatusList() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return subMissionStatusList; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 4; * @param value the subMissionStatusList to add * @return this */ public GetMissionStatusScRsp addSubMissionStatusList(final MissionOuterClass.Mission value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; subMissionStatusList.add(value); return this; } /** - * repeated .Mission sub_mission_status_list = 14; + * repeated .Mission sub_mission_status_list = 4; * @param values the subMissionStatusList to add * @return this */ public GetMissionStatusScRsp addAllSubMissionStatusList( final MissionOuterClass.Mission... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; subMissionStatusList.addAll(values); return this; } + /** + * repeated .Mission mission_event_status_list = 12; + * @return whether the missionEventStatusList field is set + */ + public boolean hasMissionEventStatusList() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * repeated .Mission mission_event_status_list = 12; + * @return this + */ + public GetMissionStatusScRsp clearMissionEventStatusList() { + bitField0_ &= ~0x00000020; + missionEventStatusList.clear(); + return this; + } + + /** + * repeated .Mission mission_event_status_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 #getMutableMissionEventStatusList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMissionEventStatusList() { + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_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 getMutableMissionEventStatusList() { + bitField0_ |= 0x00000020; + return missionEventStatusList; + } + + /** + * repeated .Mission mission_event_status_list = 12; + * @param value the missionEventStatusList to add + * @return this + */ + public GetMissionStatusScRsp addMissionEventStatusList(final MissionOuterClass.Mission value) { + bitField0_ |= 0x00000020; + missionEventStatusList.add(value); + return this; + } + + /** + * repeated .Mission mission_event_status_list = 12; + * @param values the missionEventStatusList to add + * @return this + */ + public GetMissionStatusScRsp addAllMissionEventStatusList( + final MissionOuterClass.Mission... values) { + bitField0_ |= 0x00000020; + missionEventStatusList.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); - disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); unfinishedMainMissionIdList.copyFrom(other.unfinishedMainMissionIdList); - missionEventStatusList.copyFrom(other.missionEventStatusList); + disabledMainMissionIdList.copyFrom(other.disabledMainMissionIdList); subMissionStatusList.copyFrom(other.subMissionStatusList); + missionEventStatusList.copyFrom(other.missionEventStatusList); } return this; } @@ -466,18 +466,18 @@ public final class GetMissionStatusScRspOuterClass { if (other.hasFinishedMainMissionIdList()) { getMutableFinishedMainMissionIdList().addAll(other.finishedMainMissionIdList); } - if (other.hasDisabledMainMissionIdList()) { - getMutableDisabledMainMissionIdList().addAll(other.disabledMainMissionIdList); - } if (other.hasUnfinishedMainMissionIdList()) { getMutableUnfinishedMainMissionIdList().addAll(other.unfinishedMainMissionIdList); } - if (other.hasMissionEventStatusList()) { - getMutableMissionEventStatusList().addAll(other.missionEventStatusList); + if (other.hasDisabledMainMissionIdList()) { + getMutableDisabledMainMissionIdList().addAll(other.disabledMainMissionIdList); } if (other.hasSubMissionStatusList()) { getMutableSubMissionStatusList().addAll(other.subMissionStatusList); } + if (other.hasMissionEventStatusList()) { + getMutableMissionEventStatusList().addAll(other.missionEventStatusList); + } return this; } @@ -490,10 +490,10 @@ public final class GetMissionStatusScRspOuterClass { bitField0_ = 0; retcode = 0; finishedMainMissionIdList.clear(); - disabledMainMissionIdList.clear(); unfinishedMainMissionIdList.clear(); - missionEventStatusList.clear(); + disabledMainMissionIdList.clear(); subMissionStatusList.clear(); + missionEventStatusList.clear(); return this; } @@ -505,10 +505,10 @@ public final class GetMissionStatusScRspOuterClass { cachedSize = -1; bitField0_ = 0; finishedMainMissionIdList.clear(); - disabledMainMissionIdList.clear(); unfinishedMainMissionIdList.clear(); - missionEventStatusList.clearQuick(); + disabledMainMissionIdList.clear(); subMissionStatusList.clearQuick(); + missionEventStatusList.clearQuick(); return this; } @@ -524,46 +524,46 @@ public final class GetMissionStatusScRspOuterClass { return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) && (!hasFinishedMainMissionIdList() || finishedMainMissionIdList.equals(other.finishedMainMissionIdList)) - && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) && (!hasUnfinishedMainMissionIdList() || unfinishedMainMissionIdList.equals(other.unfinishedMainMissionIdList)) - && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)) - && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)); + && (!hasDisabledMainMissionIdList() || disabledMainMissionIdList.equals(other.disabledMainMissionIdList)) + && (!hasSubMissionStatusList() || subMissionStatusList.equals(other.subMissionStatusList)) + && (!hasMissionEventStatusList() || missionEventStatusList.equals(other.missionEventStatusList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < finishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(finishedMainMissionIdList.array()[i]); } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < disabledMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); - } - } - if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < unfinishedMainMissionIdList.length(); i++) { - output.writeRawByte((byte) 96); + 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.writeUInt32NoTag(disabledMainMissionIdList.array()[i]); + } + } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < missionEventStatusList.length(); i++) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(missionEventStatusList.get(i)); + for (int i = 0; i < subMissionStatusList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(subMissionStatusList.get(i)); } } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < subMissionStatusList.length(); i++) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(subMissionStatusList.get(i)); + for (int i = 0; i < missionEventStatusList.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(missionEventStatusList.get(i)); } } } @@ -578,16 +578,16 @@ public final class GetMissionStatusScRspOuterClass { size += (1 * finishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(finishedMainMissionIdList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * disabledMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(disabledMainMissionIdList); - } - if ((bitField0_ & 0x00000008) != 0) { size += (1 * unfinishedMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unfinishedMainMissionIdList); } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * disabledMainMissionIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(disabledMainMissionIdList); + } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); + size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * subMissionStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subMissionStatusList); + size += (1 * missionEventStatusList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(missionEventStatusList); } return size; } @@ -599,16 +599,16 @@ public final class GetMissionStatusScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 58) { break; } } - case 50: { + case 58: { // finishedMainMissionIdList [packed=true] input.readPackedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000002; @@ -618,34 +618,34 @@ public final class GetMissionStatusScRspOuterClass { } } case 82: { - // disabledMainMissionIdList [packed=true] - input.readPackedUInt32(disabledMainMissionIdList, tag); + // unfinishedMainMissionIdList [packed=true] + input.readPackedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // disabledMainMissionIdList [packed=true] + input.readPackedUInt32(disabledMainMissionIdList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { + // subMissionStatusList + tag = input.readRepeatedMessage(subMissionStatusList, tag); + bitField0_ |= 0x00000010; if (tag != 98) { break; } } case 98: { - // unfinishedMainMissionIdList [packed=true] - input.readPackedUInt32(unfinishedMainMissionIdList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 10) { - break; - } - } - case 10: { // missionEventStatusList tag = input.readRepeatedMessage(missionEventStatusList, tag); - bitField0_ |= 0x00000010; - if (tag != 114) { - break; - } - } - 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 48: { + case 56: { // finishedMainMissionIdList [packed=false] tag = input.readRepeatedUInt32(finishedMainMissionIdList, tag); bitField0_ |= 0x00000002; break; } case 80: { - // disabledMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); + // unfinishedMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); bitField0_ |= 0x00000004; break; } - case 96: { - // unfinishedMainMissionIdList [packed=false] - tag = input.readRepeatedUInt32(unfinishedMainMissionIdList, tag); + case 120: { + // disabledMainMissionIdList [packed=false] + tag = input.readRepeatedUInt32(disabledMainMissionIdList, tag); bitField0_ |= 0x00000008; break; } @@ -693,16 +693,16 @@ public final class GetMissionStatusScRspOuterClass { output.writeRepeatedUInt32(FieldNames.finishedMainMissionIdList, finishedMainMissionIdList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.disabledMainMissionIdList, disabledMainMissionIdList); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.unfinishedMainMissionIdList, unfinishedMainMissionIdList); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.disabledMainMissionIdList, disabledMainMissionIdList); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); + output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.subMissionStatusList, subMissionStatusList); + output.writeRepeatedMessage(FieldNames.missionEventStatusList, missionEventStatusList); } output.endObject(); } @@ -737,11 +737,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_ |= 0x00000004; } } else { @@ -749,11 +749,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_ |= 0x00000008; } } else { @@ -761,23 +761,23 @@ public final class GetMissionStatusScRspOuterClass { } 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_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 582053566: + case 1494751923: { + if (input.isAtField(FieldNames.missionEventStatusList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(missionEventStatusList); 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 disabledMainMissionIdList = FieldName.forField("disabledMainMissionIdList", "disabled_main_mission_id_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 disabledMainMissionIdList = FieldName.forField("disabledMainMissionIdList", "disabled_main_mission_id_list"); static final FieldName subMissionStatusList = FieldName.forField("subMissionStatusList", "sub_mission_status_list"); + + static final FieldName missionEventStatusList = FieldName.forField("missionEventStatusList", "mission_event_status_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardCsReqOuterClass.java index 6d69f06..5261f33 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 = 5; + * optional uint32 npc_id = 14; */ private int npcId; @@ -34,7 +34,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 14; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -42,7 +42,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 14; * @return this */ public GetNpcTakenRewardCsReq clearNpcId() { @@ -52,7 +52,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 14; * @return the npcId */ public int getNpcId() { @@ -60,7 +60,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { } /** - * optional uint32 npc_id = 5; + * optional uint32 npc_id = 14; * @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) 40); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(npcId); } } @@ -150,7 +150,7 @@ public final class GetNpcTakenRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 112: { // 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 c3f6707..922ef77 100644 --- a/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetNpcTakenRewardScRspOuterClass.java @@ -19,15 +19,15 @@ public final class GetNpcTakenRewardScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 5; */ private int npcId; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + private GetNpcTakenRewardScRsp() { } @@ -39,62 +39,25 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 npc_id = 5; + * @return whether the npcId field is set */ - public boolean hasRetcode() { + public boolean hasNpcId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public GetNpcTakenRewardScRsp 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 GetNpcTakenRewardScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 npc_id = 8; - * @return whether the npcId field is set - */ - public boolean hasNpcId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 5; * @return this */ public GetNpcTakenRewardScRsp clearNpcId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; npcId = 0; return this; } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 5; * @return the npcId */ public int getNpcId() { @@ -102,23 +65,60 @@ public final class GetNpcTakenRewardScRspOuterClass { } /** - * optional uint32 npc_id = 8; + * optional uint32 npc_id = 5; * @param value the npcId to set * @return this */ public GetNpcTakenRewardScRsp setNpcId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; npcId = 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 GetNpcTakenRewardScRsp 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 GetNpcTakenRewardScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public GetNpcTakenRewardScRsp copyFrom(final GetNpcTakenRewardScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; npcId = other.npcId; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class GetNpcTakenRewardScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasNpcId()) { setNpcId(other.npcId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class GetNpcTakenRewardScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; npcId = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class GetNpcTakenRewardScRspOuterClass { } GetNpcTakenRewardScRsp other = (GetNpcTakenRewardScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasNpcId() || npcId == other.npcId); + && (!hasNpcId() || npcId == other.npcId) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(npcId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class GetNpcTakenRewardScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class GetNpcTakenRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // retcode - retcode = input.readUInt32(); + case 40: { + // npcId + npcId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 96) { break; } } - case 64: { - // npcId - npcId = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class GetNpcTakenRewardScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.npcId, npcId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.npcId, npcId); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class GetNpcTakenRewardScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 105021404: + case -1039282375: { + if (input.isAtField(FieldNames.npcId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + npcId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class GetNpcTakenRewardScRspOuterClass { } break; } - case 105021404: - case -1039282375: { - if (input.isAtField(FieldNames.npcId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - npcId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class GetNpcTakenRewardScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName npcId = FieldName.forField("npcId", "npc_id"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPhoneDataScRspOuterClass.java index 673d7e0..64fae07 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 = 4; + * optional uint32 cur_phone_theme = 1; */ private int curPhoneTheme; /** - * optional uint32 retcode = 10; - */ - private int retcode; - - /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 7; */ private int curChatBubble; /** - * repeated uint32 owned_chat_bubbles = 6; + * optional uint32 retcode = 12; */ - private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); + private int retcode; /** - * repeated uint32 owned_phone_themes = 7; + * repeated uint32 owned_phone_themes = 5; */ private final RepeatedInt ownedPhoneThemes = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 owned_chat_bubbles = 14; + */ + private final RepeatedInt ownedChatBubbles = RepeatedInt.newEmptyInstance(); + private GetPhoneDataScRsp() { } @@ -55,7 +55,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 4; + * optional uint32 cur_phone_theme = 1; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -63,7 +63,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 4; + * optional uint32 cur_phone_theme = 1; * @return this */ public GetPhoneDataScRsp clearCurPhoneTheme() { @@ -73,7 +73,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 4; + * optional uint32 cur_phone_theme = 1; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -81,7 +81,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 4; + * optional uint32 cur_phone_theme = 1; * @param value the curPhoneTheme to set * @return this */ @@ -92,62 +92,25 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set + * optional uint32 cur_chat_bubble = 7; + * @return whether the curChatBubble field is set */ - public boolean hasRetcode() { + public boolean hasCurChatBubble() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 10; - * @return this - */ - public GetPhoneDataScRsp 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 GetPhoneDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = 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; + * optional uint32 cur_chat_bubble = 7; * @return this */ public GetPhoneDataScRsp clearCurChatBubble() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curChatBubble = 0; return this; } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 7; * @return the curChatBubble */ public int getCurChatBubble() { @@ -155,104 +118,73 @@ public final class GetPhoneDataScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 15; + * optional uint32 cur_chat_bubble = 7; * @param value the curChatBubble to set * @return this */ public GetPhoneDataScRsp setCurChatBubble(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curChatBubble = value; return this; } /** - * repeated uint32 owned_chat_bubbles = 6; - * @return whether the ownedChatBubbles field is set + * optional uint32 retcode = 12; + * @return whether the retcode field is set */ - public boolean hasOwnedChatBubbles() { + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public GetPhoneDataScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + 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 GetPhoneDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * repeated uint32 owned_phone_themes = 5; + * @return whether the ownedPhoneThemes field is set + */ + public boolean hasOwnedPhoneThemes() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 owned_chat_bubbles = 6; - * @return this - */ - public GetPhoneDataScRsp clearOwnedChatBubbles() { - bitField0_ &= ~0x00000008; - ownedChatBubbles.clear(); - return this; - } - - /** - * repeated uint32 owned_chat_bubbles = 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 #getMutableOwnedChatBubbles()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getOwnedChatBubbles() { - return ownedChatBubbles; - } - - /** - * repeated uint32 owned_chat_bubbles = 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 RepeatedInt getMutableOwnedChatBubbles() { - bitField0_ |= 0x00000008; - return ownedChatBubbles; - } - - /** - * repeated uint32 owned_chat_bubbles = 6; - * @param value the ownedChatBubbles to add - * @return this - */ - public GetPhoneDataScRsp addOwnedChatBubbles(final int value) { - bitField0_ |= 0x00000008; - ownedChatBubbles.add(value); - return this; - } - - /** - * repeated uint32 owned_chat_bubbles = 6; - * @param values the ownedChatBubbles to add - * @return this - */ - public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { - bitField0_ |= 0x00000008; - ownedChatBubbles.addAll(values); - return this; - } - - /** - * repeated uint32 owned_phone_themes = 7; - * @return whether the ownedPhoneThemes field is set - */ - public boolean hasOwnedPhoneThemes() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 owned_phone_themes = 7; + * repeated uint32 owned_phone_themes = 5; * @return this */ public GetPhoneDataScRsp clearOwnedPhoneThemes() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; ownedPhoneThemes.clear(); return this; } /** - * repeated uint32 owned_phone_themes = 7; + * 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. @@ -266,7 +198,7 @@ public final class GetPhoneDataScRspOuterClass { } /** - * repeated uint32 owned_phone_themes = 7; + * 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 @@ -275,42 +207,110 @@ public final class GetPhoneDataScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableOwnedPhoneThemes() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return ownedPhoneThemes; } /** - * repeated uint32 owned_phone_themes = 7; + * repeated uint32 owned_phone_themes = 5; * @param value the ownedPhoneThemes to add * @return this */ public GetPhoneDataScRsp addOwnedPhoneThemes(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; ownedPhoneThemes.add(value); return this; } /** - * repeated uint32 owned_phone_themes = 7; + * repeated uint32 owned_phone_themes = 5; * @param values the ownedPhoneThemes to add * @return this */ public GetPhoneDataScRsp addAllOwnedPhoneThemes(final int... values) { - bitField0_ |= 0x00000010; + 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; + * @return this + */ + public GetPhoneDataScRsp clearOwnedChatBubbles() { + bitField0_ &= ~0x00000010; + ownedChatBubbles.clear(); + return this; + } + + /** + * repeated uint32 owned_chat_bubbles = 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 #getMutableOwnedChatBubbles()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getOwnedChatBubbles() { + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 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 RepeatedInt getMutableOwnedChatBubbles() { + bitField0_ |= 0x00000010; + return ownedChatBubbles; + } + + /** + * repeated uint32 owned_chat_bubbles = 14; + * @param value the ownedChatBubbles to add + * @return this + */ + public GetPhoneDataScRsp addOwnedChatBubbles(final int value) { + bitField0_ |= 0x00000010; + ownedChatBubbles.add(value); + return this; + } + + /** + * repeated uint32 owned_chat_bubbles = 14; + * @param values the ownedChatBubbles to add + * @return this + */ + public GetPhoneDataScRsp addAllOwnedChatBubbles(final int... values) { + bitField0_ |= 0x00000010; + ownedChatBubbles.addAll(values); + return this; + } + @Override public GetPhoneDataScRsp copyFrom(final GetPhoneDataScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; curPhoneTheme = other.curPhoneTheme; - retcode = other.retcode; curChatBubble = other.curChatBubble; - ownedChatBubbles.copyFrom(other.ownedChatBubbles); + retcode = other.retcode; ownedPhoneThemes.copyFrom(other.ownedPhoneThemes); + ownedChatBubbles.copyFrom(other.ownedChatBubbles); } return this; } @@ -324,18 +324,18 @@ public final class GetPhoneDataScRspOuterClass { if (other.hasCurPhoneTheme()) { setCurPhoneTheme(other.curPhoneTheme); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurChatBubble()) { setCurChatBubble(other.curChatBubble); } - if (other.hasOwnedChatBubbles()) { - getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasOwnedPhoneThemes()) { getMutableOwnedPhoneThemes().addAll(other.ownedPhoneThemes); } + if (other.hasOwnedChatBubbles()) { + getMutableOwnedChatBubbles().addAll(other.ownedChatBubbles); + } return this; } @@ -347,10 +347,10 @@ public final class GetPhoneDataScRspOuterClass { cachedSize = -1; bitField0_ = 0; curPhoneTheme = 0; - retcode = 0; curChatBubble = 0; - ownedChatBubbles.clear(); + retcode = 0; ownedPhoneThemes.clear(); + ownedChatBubbles.clear(); return this; } @@ -361,8 +361,8 @@ public final class GetPhoneDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - ownedChatBubbles.clear(); ownedPhoneThemes.clear(); + ownedChatBubbles.clear(); return this; } @@ -377,36 +377,36 @@ public final class GetPhoneDataScRspOuterClass { GetPhoneDataScRsp other = (GetPhoneDataScRsp) o; return bitField0_ == other.bitField0_ && (!hasCurPhoneTheme() || curPhoneTheme == other.curPhoneTheme) - && (!hasRetcode() || retcode == other.retcode) && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) - && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)) - && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)); + && (!hasRetcode() || retcode == other.retcode) + && (!hasOwnedPhoneThemes() || ownedPhoneThemes.equals(other.ownedPhoneThemes)) + && (!hasOwnedChatBubbles() || ownedChatBubbles.equals(other.ownedChatBubbles)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(curChatBubble); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < ownedChatBubbles.length(); i++) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(ownedChatBubbles.array()[i]); + for (int i = 0; i < ownedPhoneThemes.length(); i++) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); } } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < ownedPhoneThemes.length(); i++) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(ownedPhoneThemes.array()[i]); + for (int i = 0; i < ownedChatBubbles.length(); i++) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(ownedChatBubbles.array()[i]); } } } @@ -418,16 +418,16 @@ public final class GetPhoneDataScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); + size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * ownedPhoneThemes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedPhoneThemes); + size += (1 * ownedChatBubbles.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(ownedChatBubbles); } return size; } @@ -439,45 +439,45 @@ public final class GetPhoneDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 56) { break; } } - case 80: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 56: { // curChatBubble curChatBubble = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 42) { break; } } - case 50: { - // ownedChatBubbles [packed=true] - input.readPackedUInt32(ownedChatBubbles, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 58) { - break; - } - } - case 58: { + case 42: { // ownedPhoneThemes [packed=true] input.readPackedUInt32(ownedPhoneThemes, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // ownedChatBubbles [packed=true] + input.readPackedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -494,15 +494,15 @@ public final class GetPhoneDataScRspOuterClass { tag = input.readTag(); break; } - case 48: { - // ownedChatBubbles [packed=false] - tag = input.readRepeatedUInt32(ownedChatBubbles, tag); + case 40: { + // ownedPhoneThemes [packed=false] + tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); bitField0_ |= 0x00000008; break; } - case 56: { - // ownedPhoneThemes [packed=false] - tag = input.readRepeatedUInt32(ownedPhoneThemes, tag); + case 112: { + // ownedChatBubbles [packed=false] + tag = input.readRepeatedUInt32(ownedChatBubbles, tag); bitField0_ |= 0x00000010; break; } @@ -517,16 +517,16 @@ public final class GetPhoneDataScRspOuterClass { output.writeUInt32(FieldNames.curPhoneTheme, curPhoneTheme); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); + output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.ownedPhoneThemes, ownedPhoneThemes); + output.writeRepeatedUInt32(FieldNames.ownedChatBubbles, ownedChatBubbles); } output.endObject(); } @@ -550,10 +550,11 @@ public final class GetPhoneDataScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -561,11 +562,10 @@ public final class GetPhoneDataScRspOuterClass { } break; } - 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_ |= 0x00000004; } } else { @@ -573,23 +573,23 @@ public final class GetPhoneDataScRspOuterClass { } 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_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1579353334: + case -1491735846: { + if (input.isAtField(FieldNames.ownedChatBubbles)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(ownedChatBubbles); bitField0_ |= 0x00000010; } } else { @@ -652,13 +652,13 @@ public final class GetPhoneDataScRspOuterClass { static class FieldNames { static final FieldName curPhoneTheme = FieldName.forField("curPhoneTheme", "cur_phone_theme"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); - static final FieldName ownedChatBubbles = FieldName.forField("ownedChatBubbles", "owned_chat_bubbles"); + static final FieldName retcode = FieldName.forField("retcode"); 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 a9e0718..d9e1c6d 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 retcode = 8; - */ - private int retcode; - - /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 5; */ private int currentHeadIconId; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + /** * optional .DisplayAvatarVec display_avatar_vec = 15; */ private final DisplayAvatarVecOuterClass.DisplayAvatarVec displayAvatarVec = DisplayAvatarVecOuterClass.DisplayAvatarVec.newInstance(); /** - * optional string signature = 5; + * optional string signature = 1; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 13; */ private final RepeatedInt displaySupportAvatarVec = RepeatedInt.newEmptyInstance(); /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_list = 11; */ private final RepeatedMessage unlockedHeadIconList = RepeatedMessage.newEmptyInstance(HeadIconOuterClass.HeadIcon.getFactory()); @@ -62,62 +62,25 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 retcode = 8; - * @return whether the retcode field is set + * optional uint32 current_head_icon_id = 5; + * @return whether the currentHeadIconId field is set */ - public boolean hasRetcode() { + public boolean hasCurrentHeadIconId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 8; - * @return this - */ - public GetPlayerBoardDataScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - 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 GetPlayerBoardDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 current_head_icon_id = 11; - * @return whether the currentHeadIconId field is set - */ - public boolean hasCurrentHeadIconId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 5; * @return this */ public GetPlayerBoardDataScRsp clearCurrentHeadIconId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; currentHeadIconId = 0; return this; } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 5; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -125,16 +88,53 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 11; + * optional uint32 current_head_icon_id = 5; * @param value the currentHeadIconId to set * @return this */ public GetPlayerBoardDataScRsp setCurrentHeadIconId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; currentHeadIconId = 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 GetPlayerBoardDataScRsp 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 GetPlayerBoardDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + /** * optional .DisplayAvatarVec display_avatar_vec = 15; * @return whether the displayAvatarVec field is set @@ -194,7 +194,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @return whether the signature field is set */ public boolean hasSignature() { @@ -202,7 +202,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @return this */ public GetPlayerBoardDataScRsp clearSignature() { @@ -212,7 +212,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @return the signature */ public String getSignature() { @@ -220,7 +220,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -228,7 +228,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -237,7 +237,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @param value the signature to set * @return this */ @@ -248,7 +248,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * optional string signature = 5; + * optional string signature = 1; * @param value the signature to set * @return this */ @@ -259,7 +259,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 13; * @return whether the displaySupportAvatarVec field is set */ public boolean hasDisplaySupportAvatarVec() { @@ -267,7 +267,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 13; * @return this */ public GetPlayerBoardDataScRsp clearDisplaySupportAvatarVec() { @@ -277,7 +277,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 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. @@ -291,7 +291,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 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 @@ -305,7 +305,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 13; * @param value the displaySupportAvatarVec to add * @return this */ @@ -316,7 +316,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated uint32 display_support_avatar_vec = 3; + * repeated uint32 display_support_avatar_vec = 13; * @param values the displaySupportAvatarVec to add * @return this */ @@ -327,7 +327,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_list = 11; * @return whether the unlockedHeadIconList field is set */ public boolean hasUnlockedHeadIconList() { @@ -335,7 +335,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_list = 11; * @return this */ public GetPlayerBoardDataScRsp clearUnlockedHeadIconList() { @@ -345,7 +345,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_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. @@ -359,7 +359,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_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 @@ -373,7 +373,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_list = 11; * @param value the unlockedHeadIconList to add * @return this */ @@ -385,7 +385,7 @@ public final class GetPlayerBoardDataScRspOuterClass { } /** - * repeated .HeadIcon unlocked_head_icon_list = 2; + * repeated .HeadIcon unlocked_head_icon_list = 11; * @param values the unlockedHeadIconList to add * @return this */ @@ -401,8 +401,8 @@ public final class GetPlayerBoardDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; currentHeadIconId = other.currentHeadIconId; + retcode = other.retcode; displayAvatarVec.copyFrom(other.displayAvatarVec); signature.copyFrom(other.signature); displaySupportAvatarVec.copyFrom(other.displaySupportAvatarVec); @@ -417,12 +417,12 @@ public final class GetPlayerBoardDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurrentHeadIconId()) { setCurrentHeadIconId(other.currentHeadIconId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasDisplayAvatarVec()) { getMutableDisplayAvatarVec().mergeFrom(other.displayAvatarVec); } @@ -445,8 +445,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; currentHeadIconId = 0; + retcode = 0; displayAvatarVec.clear(); signature.clear(); displaySupportAvatarVec.clear(); @@ -478,8 +478,8 @@ public final class GetPlayerBoardDataScRspOuterClass { } GetPlayerBoardDataScRsp other = (GetPlayerBoardDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasCurrentHeadIconId() || currentHeadIconId == other.currentHeadIconId) + && (!hasRetcode() || retcode == other.retcode) && (!hasDisplayAvatarVec() || displayAvatarVec.equals(other.displayAvatarVec)) && (!hasSignature() || signature.equals(other.signature)) && (!hasDisplaySupportAvatarVec() || displaySupportAvatarVec.equals(other.displaySupportAvatarVec)) @@ -489,30 +489,30 @@ public final class GetPlayerBoardDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(currentHeadIconId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(currentHeadIconId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 122); output.writeMessageNoTag(displayAvatarVec); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 10); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < displaySupportAvatarVec.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(displaySupportAvatarVec.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < unlockedHeadIconList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 90); output.writeMessageNoTag(unlockedHeadIconList.get(i)); } } @@ -522,10 +522,10 @@ public final class GetPlayerBoardDataScRspOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(displayAvatarVec); @@ -549,18 +549,18 @@ public final class GetPlayerBoardDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // retcode - retcode = input.readUInt32(); + case 40: { + // currentHeadIconId + currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // currentHeadIconId - currentHeadIconId = input.readUInt32(); + case 96: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 122) { @@ -572,29 +572,29 @@ public final class GetPlayerBoardDataScRspOuterClass { input.readMessage(displayAvatarVec); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 42) { + if (tag != 10) { break; } } - case 42: { + case 10: { // signature input.readString(signature); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 106) { break; } } - case 26: { + case 106: { // displaySupportAvatarVec [packed=true] input.readPackedUInt32(displaySupportAvatarVec, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 90) { break; } } - case 18: { + case 90: { // unlockedHeadIconList tag = input.readRepeatedMessage(unlockedHeadIconList, tag); bitField0_ |= 0x00000020; @@ -612,7 +612,7 @@ public final class GetPlayerBoardDataScRspOuterClass { tag = input.readTag(); break; } - case 24: { + case 104: { // displaySupportAvatarVec [packed=false] tag = input.readRepeatedUInt32(displaySupportAvatarVec, tag); bitField0_ |= 0x00000010; @@ -626,10 +626,10 @@ public final class GetPlayerBoardDataScRspOuterClass { 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); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.displayAvatarVec, displayAvatarVec); @@ -653,10 +653,11 @@ public final class GetPlayerBoardDataScRspOuterClass { } 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 { @@ -664,11 +665,10 @@ public final class GetPlayerBoardDataScRspOuterClass { } 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 { @@ -776,10 +776,10 @@ public final class GetPlayerBoardDataScRspOuterClass { * 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"); + static final FieldName displayAvatarVec = FieldName.forField("displayAvatarVec", "display_avatar_vec"); static final FieldName signature = FieldName.forField("signature"); diff --git a/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPlayerDetailInfoCsReqOuterClass.java index a895645..13e425e 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 = 14; + * optional uint32 uid = 15; */ private int uid; @@ -34,7 +34,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return this */ public GetPlayerDetailInfoCsReq clearUid() { @@ -52,7 +52,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { } /** - * optional uint32 uid = 14; + * optional uint32 uid = 15; * @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) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class GetPlayerDetailInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // 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 97a9a84..4b03cc5 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 = 15; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 8; */ private final PlayerDetailInfoOuterClass.PlayerDetailInfo playerDetailInfo = PlayerDetailInfoOuterClass.PlayerDetailInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return this */ public GetPlayerDetailInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 8; * @return whether the playerDetailInfo field is set */ public boolean hasPlayerDetailInfo() { @@ -84,7 +84,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 8; * @return this */ public GetPlayerDetailInfoScRsp clearPlayerDetailInfo() { @@ -94,7 +94,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_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. @@ -108,7 +108,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_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 @@ -122,7 +122,7 @@ public final class GetPlayerDetailInfoScRspOuterClass { } /** - * optional .PlayerDetailInfo player_detail_info = 14; + * optional .PlayerDetailInfo player_detail_info = 8; * @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) 120); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 66); output.writeMessageNoTag(playerDetailInfo); } } @@ -227,16 +227,16 @@ public final class GetPlayerDetailInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 66) { break; } } - case 114: { + case 66: { // 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 6bcdf77..9b5249c 100644 --- a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryCsReqOuterClass.java @@ -19,12 +19,12 @@ public final class GetPrivateChatHistoryCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 to_uid = 5; + * optional uint32 to_uid = 10; */ private int toUid; /** - * optional uint32 sender_uid = 9; + * optional uint32 sender_uid = 13; */ private int senderUid; @@ -39,7 +39,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 5; + * optional uint32 to_uid = 10; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -47,7 +47,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 5; + * optional uint32 to_uid = 10; * @return this */ public GetPrivateChatHistoryCsReq clearToUid() { @@ -57,7 +57,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 5; + * optional uint32 to_uid = 10; * @return the toUid */ public int getToUid() { @@ -65,7 +65,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 to_uid = 5; + * optional uint32 to_uid = 10; * @param value the toUid to set * @return this */ @@ -76,7 +76,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 9; + * optional uint32 sender_uid = 13; * @return whether the senderUid field is set */ public boolean hasSenderUid() { @@ -84,7 +84,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 9; + * optional uint32 sender_uid = 13; * @return this */ public GetPrivateChatHistoryCsReq clearSenderUid() { @@ -94,7 +94,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 9; + * optional uint32 sender_uid = 13; * @return the senderUid */ public int getSenderUid() { @@ -102,7 +102,7 @@ public final class GetPrivateChatHistoryCsReqOuterClass { } /** - * optional uint32 sender_uid = 9; + * optional uint32 sender_uid = 13; * @param value the senderUid to set * @return this */ @@ -177,11 +177,11 @@ public final class GetPrivateChatHistoryCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(senderUid); } } @@ -205,16 +205,16 @@ public final class GetPrivateChatHistoryCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 80: { // toUid toUid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 104) { break; } } - case 72: { + case 104: { // senderUid senderUid = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetPrivateChatHistoryScRspOuterClass.java index a797333..d24a6a3 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 = 4; + * optional uint32 retcode = 6; */ private int retcode; + /** + * optional uint32 sender_uid = 7; + */ + private int senderUid; + /** * optional uint32 to_uid = 9; */ private int toUid; /** - * optional uint32 sender_uid = 13; - */ - private int senderUid; - - /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_list = 10; */ private final RepeatedMessage chatList = RepeatedMessage.newEmptyInstance(ChatOuterClass.Chat.getFactory()); @@ -50,7 +50,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -58,7 +58,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 6; * @return this */ public GetPrivateChatHistoryScRsp clearRetcode() { @@ -68,7 +68,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -76,7 +76,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -86,12 +86,49 @@ public final class GetPrivateChatHistoryScRspOuterClass { 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_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -99,7 +136,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { * @return this */ public GetPrivateChatHistoryScRsp clearToUid() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; toUid = 0; return this; } @@ -118,50 +155,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { * @return this */ public GetPrivateChatHistoryScRsp setToUid(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; toUid = value; return this; } /** - * optional uint32 sender_uid = 13; - * @return whether the senderUid field is set - */ - public boolean hasSenderUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 sender_uid = 13; - * @return this - */ - public GetPrivateChatHistoryScRsp clearSenderUid() { - bitField0_ &= ~0x00000004; - senderUid = 0; - return this; - } - - /** - * optional uint32 sender_uid = 13; - * @return the senderUid - */ - public int getSenderUid() { - return senderUid; - } - - /** - * optional uint32 sender_uid = 13; - * @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; + * repeated .Chat chat_list = 10; * @return whether the chatList field is set */ public boolean hasChatList() { @@ -169,7 +169,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_list = 10; * @return this */ public GetPrivateChatHistoryScRsp clearChatList() { @@ -179,7 +179,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_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. @@ -193,7 +193,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_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 @@ -207,7 +207,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_list = 10; * @param value the chatList to add * @return this */ @@ -218,7 +218,7 @@ public final class GetPrivateChatHistoryScRspOuterClass { } /** - * repeated .Chat chat_list = 8; + * repeated .Chat chat_list = 10; * @param values the chatList to add * @return this */ @@ -234,8 +234,8 @@ public final class GetPrivateChatHistoryScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - toUid = other.toUid; senderUid = other.senderUid; + toUid = other.toUid; chatList.copyFrom(other.chatList); } return this; @@ -250,12 +250,12 @@ public final class GetPrivateChatHistoryScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasToUid()) { - setToUid(other.toUid); - } if (other.hasSenderUid()) { setSenderUid(other.senderUid); } + if (other.hasToUid()) { + setToUid(other.toUid); + } if (other.hasChatList()) { getMutableChatList().addAll(other.chatList); } @@ -270,8 +270,8 @@ public final class GetPrivateChatHistoryScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - toUid = 0; senderUid = 0; + toUid = 0; chatList.clear(); return this; } @@ -298,28 +298,28 @@ public final class GetPrivateChatHistoryScRspOuterClass { GetPrivateChatHistoryScRsp other = (GetPrivateChatHistoryScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasToUid() || toUid == other.toUid) && (!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) 32); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(senderUid); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 72); output.writeUInt32NoTag(toUid); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(senderUid); - } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < chatList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 82); output.writeMessageNoTag(chatList.get(i)); } } @@ -332,10 +332,10 @@ public final class GetPrivateChatHistoryScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(senderUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(toUid); } if ((bitField0_ & 0x00000008) != 0) { size += (1 * chatList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chatList); @@ -350,11 +350,20 @@ public final class GetPrivateChatHistoryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + 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; } @@ -362,22 +371,13 @@ public final class GetPrivateChatHistoryScRspOuterClass { case 72: { // toUid toUid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // senderUid - senderUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // chatList tag = input.readRepeatedMessage(chatList, tag); bitField0_ |= 0x00000008; @@ -406,10 +406,10 @@ public final class GetPrivateChatHistoryScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.toUid, toUid); + output.writeUInt32(FieldNames.senderUid, senderUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.senderUid, senderUid); + output.writeUInt32(FieldNames.toUid, toUid); } if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedMessage(FieldNames.chatList, chatList); @@ -435,11 +435,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -447,11 +447,11 @@ public final class GetPrivateChatHistoryScRspOuterClass { } 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_ |= 0x00000004; } } else { @@ -526,10 +526,10 @@ public final class GetPrivateChatHistoryScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - 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"); + 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 2726c7b..b7795c8 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 total_achievement_exp = 6; - */ - private int totalAchievementExp; - - /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; */ private int retcode; /** - * repeated .Quest quest_list = 10; + * optional uint32 total_achievement_exp = 10; + */ + private int totalAchievementExp; + + /** + * repeated .Quest quest_list = 2; */ private final RepeatedMessage questList = RepeatedMessage.newEmptyInstance(QuestOuterClass.Quest.getFactory()); @@ -45,62 +45,25 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 total_achievement_exp = 6; - * @return whether the totalAchievementExp field is set + * optional uint32 retcode = 8; + * @return whether the retcode field is set */ - public boolean hasTotalAchievementExp() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 total_achievement_exp = 6; - * @return this - */ - public GetQuestDataScRsp clearTotalAchievementExp() { - bitField0_ &= ~0x00000001; - totalAchievementExp = 0; - return this; - } - - /** - * optional uint32 total_achievement_exp = 6; - * @return the totalAchievementExp - */ - public int getTotalAchievementExp() { - return totalAchievementExp; - } - - /** - * optional uint32 total_achievement_exp = 6; - * @param value the totalAchievementExp to set - * @return this - */ - public GetQuestDataScRsp setTotalAchievementExp(final int value) { - bitField0_ |= 0x00000001; - totalAchievementExp = 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; + * optional uint32 retcode = 8; * @return this */ public GetQuestDataScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class GetQuestDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ public GetQuestDataScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated .Quest quest_list = 10; + * optional uint32 total_achievement_exp = 10; + * @return whether the totalAchievementExp field is set + */ + public boolean hasTotalAchievementExp() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 total_achievement_exp = 10; + * @return this + */ + public GetQuestDataScRsp clearTotalAchievementExp() { + bitField0_ &= ~0x00000002; + totalAchievementExp = 0; + return this; + } + + /** + * optional uint32 total_achievement_exp = 10; + * @return the totalAchievementExp + */ + public int getTotalAchievementExp() { + return totalAchievementExp; + } + + /** + * optional uint32 total_achievement_exp = 10; + * @param value the totalAchievementExp to set + * @return this + */ + public GetQuestDataScRsp setTotalAchievementExp(final int value) { + bitField0_ |= 0x00000002; + totalAchievementExp = value; + return this; + } + + /** + * repeated .Quest quest_list = 2; * @return whether the questList field is set */ public boolean hasQuestList() { @@ -127,7 +127,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 2; * @return this */ public GetQuestDataScRsp clearQuestList() { @@ -137,7 +137,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_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 GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 2; * @param value the questList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetQuestDataScRspOuterClass { } /** - * repeated .Quest quest_list = 10; + * repeated .Quest quest_list = 2; * @param values the questList to add * @return this */ @@ -191,8 +191,8 @@ public final class GetQuestDataScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - totalAchievementExp = other.totalAchievementExp; retcode = other.retcode; + totalAchievementExp = other.totalAchievementExp; questList.copyFrom(other.questList); } return this; @@ -204,12 +204,12 @@ public final class GetQuestDataScRspOuterClass { return this; } cachedSize = -1; - if (other.hasTotalAchievementExp()) { - setTotalAchievementExp(other.totalAchievementExp); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasTotalAchievementExp()) { + setTotalAchievementExp(other.totalAchievementExp); + } if (other.hasQuestList()) { getMutableQuestList().addAll(other.questList); } @@ -223,8 +223,8 @@ public final class GetQuestDataScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - totalAchievementExp = 0; retcode = 0; + totalAchievementExp = 0; questList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetQuestDataScRspOuterClass { } GetQuestDataScRsp other = (GetQuestDataScRsp) o; return bitField0_ == other.bitField0_ - && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) && (!hasRetcode() || retcode == other.retcode) + && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) && (!hasQuestList() || questList.equals(other.questList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(totalAchievementExp); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < questList.length(); i++) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 18); output.writeMessageNoTag(questList.get(i)); } } @@ -277,10 +277,10 @@ public final class GetQuestDataScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * questList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(questList); @@ -295,25 +295,25 @@ public final class GetQuestDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // totalAchievementExp - totalAchievementExp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 64: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 80) { break; } } - case 82: { + case 80: { + // totalAchievementExp + totalAchievementExp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // questList tag = input.readRepeatedMessage(questList, tag); bitField0_ |= 0x00000004; @@ -339,10 +339,10 @@ public final class GetQuestDataScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.questList, questList); @@ -357,11 +357,10 @@ public final class GetQuestDataScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 255336658: - case -1295039982: { - if (input.isAtField(FieldNames.totalAchievementExp)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - totalAchievementExp = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -369,10 +368,11 @@ public final class GetQuestDataScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 255336658: + case -1295039982: { + if (input.isAtField(FieldNames.totalAchievementExp)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetQuestDataScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); + static final FieldName questList = FieldName.forField("questList", "quest_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRogueBuffEnhanceInfoScRspOuterClass.java index b2a5f5b..07372f5 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 = 10; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_info = 1; */ private final RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo shopInfo = RogueBuffEnhanceShopInfoOuterClass.RogueBuffEnhanceShopInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 14; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_info = 1; * @return whether the shopInfo field is set */ public boolean hasShopInfo() { @@ -84,7 +84,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_info = 1; * @return this */ public GetRogueBuffEnhanceInfoScRsp clearShopInfo() { @@ -94,7 +94,7 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_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 GetRogueBuffEnhanceInfoScRspOuterClass { } /** - * optional .RogueBuffEnhanceShopInfo shop_info = 6; + * optional .RogueBuffEnhanceShopInfo shop_info = 1; * @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) 80); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(shopInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueBuffEnhanceInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 10) { break; } } - case 50: { + case 10: { // 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 a7a7c2e..cb2242f 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 = 11; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_info = 15; */ private final RogueHandbookDataOuterClass.RogueHandbookData handbookInfo = RogueHandbookDataOuterClass.RogueHandbookData.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 12; * @return this */ public GetRogueHandbookDataScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_info = 15; * @return whether the handbookInfo field is set */ public boolean hasHandbookInfo() { @@ -84,7 +84,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_info = 15; * @return this */ public GetRogueHandbookDataScRsp clearHandbookInfo() { @@ -94,7 +94,7 @@ public final class GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_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 GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_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 GetRogueHandbookDataScRspOuterClass { } /** - * optional .RogueHandbookData handbook_info = 12; + * optional .RogueHandbookData handbook_info = 15; * @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) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(handbookInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueHandbookDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // 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 697c665..a86e773 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 = 5; + * optional uint32 retcode = 12; */ private int retcode; /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_info = 8; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 12; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 12; * @return this */ public GetRogueInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 12; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 12; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_info = 8; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -84,7 +84,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_info = 8; * @return this */ public GetRogueInfoScRsp clearRogueInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_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. @@ -108,7 +108,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_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 @@ -122,7 +122,7 @@ public final class GetRogueInfoScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 9; + * optional .RogueInfo rogue_info = 8; * @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) 40); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 66); output.writeMessageNoTag(rogueInfo); } } @@ -226,16 +226,16 @@ public final class GetRogueInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 96: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 66) { break; } } - case 74: { + case 66: { // 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 6402ed8..0258a1e 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 = 11; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 4; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo rogueScoreInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 9; * @return this */ public GetRogueInitialScoreScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 4; * @return whether the rogueScoreInfo field is set */ public boolean hasRogueScoreInfo() { @@ -84,7 +84,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 4; * @return this */ public GetRogueInitialScoreScRsp clearRogueScoreInfo() { @@ -94,7 +94,7 @@ public final class GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_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 GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_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 GetRogueInitialScoreScRspOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 9; + * optional .RogueScoreRewardInfo rogue_score_info = 4; * @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) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rogueScoreInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueInitialScoreScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // 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 478d46d..24b0bea 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 = 6; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_info = 1; */ private final RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo scoreRewardInfo = RogueScoreRewardInfoOuterClass.RogueScoreRewardInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return this */ public GetRogueScoreRewardInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_info = 1; * @return whether the scoreRewardInfo field is set */ public boolean hasScoreRewardInfo() { @@ -84,7 +84,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_info = 1; * @return this */ public GetRogueScoreRewardInfoScRsp clearScoreRewardInfo() { @@ -94,7 +94,7 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_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 GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_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 GetRogueScoreRewardInfoScRspOuterClass { } /** - * optional .RogueScoreRewardInfo score_reward_info = 7; + * optional .RogueScoreRewardInfo score_reward_info = 1; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 10); output.writeMessageNoTag(scoreRewardInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueScoreRewardInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 10) { break; } } - case 58: { + case 10: { // 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 65496a1..f59c621 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 = 1; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 6; */ private final RogueTalentInfoOuterClass.RogueTalentInfo talentInfo = RogueTalentInfoOuterClass.RogueTalentInfo.newInstance(); @@ -39,7 +39,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return this */ public GetRogueTalentInfoScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 6; * @return whether the talentInfo field is set */ public boolean hasTalentInfo() { @@ -84,7 +84,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 6; * @return this */ public GetRogueTalentInfoScRsp clearTalentInfo() { @@ -94,7 +94,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_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. @@ -108,7 +108,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_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 @@ -122,7 +122,7 @@ public final class GetRogueTalentInfoScRspOuterClass { } /** - * optional .RogueTalentInfo talent_info = 10; + * optional .RogueTalentInfo talent_info = 6; * @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) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(talentInfo); } } @@ -227,16 +227,16 @@ public final class GetRogueTalentInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 50) { break; } } - case 82: { + case 50: { // talentInfo input.readMessage(talentInfo); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java index 942a933..ef08765 100644 --- a/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetRollShopInfoScRspOuterClass.java @@ -20,7 +20,7 @@ public final class GetRollShopInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 roll_shop_id = 9; + * optional uint32 roll_shop_id = 4; */ private int rollShopId; @@ -29,17 +29,17 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 13; + * optional uint32 BBJIJINJAFK = 9; */ private int bBJIJINJAFK; /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 5; */ private final RepeatedInt dLPBJMPECFC = RepeatedInt.newEmptyInstance(); @@ -54,7 +54,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 roll_shop_id = 9; + * optional uint32 roll_shop_id = 4; * @return whether the rollShopId field is set */ public boolean hasRollShopId() { @@ -62,7 +62,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 roll_shop_id = 9; + * optional uint32 roll_shop_id = 4; * @return this */ public GetRollShopInfoScRsp clearRollShopId() { @@ -72,7 +72,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 roll_shop_id = 9; + * optional uint32 roll_shop_id = 4; * @return the rollShopId */ public int getRollShopId() { @@ -80,7 +80,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 roll_shop_id = 9; + * optional uint32 roll_shop_id = 4; * @param value the rollShopId to set * @return this */ @@ -95,7 +95,7 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 13; + * optional uint32 BBJIJINJAFK = 9; * @return whether the bBJIJINJAFK field is set */ public boolean hasBBJIJINJAFK() { @@ -107,7 +107,7 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 13; + * optional uint32 BBJIJINJAFK = 9; * @return this */ public GetRollShopInfoScRsp clearBBJIJINJAFK() { @@ -121,7 +121,7 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 13; + * optional uint32 BBJIJINJAFK = 9; * @return the bBJIJINJAFK */ public int getBBJIJINJAFK() { @@ -133,7 +133,7 @@ public final class GetRollShopInfoScRspOuterClass { * gacha_random * * - * optional uint32 BBJIJINJAFK = 13; + * optional uint32 BBJIJINJAFK = 9; * @param value the bBJIJINJAFK to set * @return this */ @@ -144,7 +144,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -152,7 +152,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return this */ public GetRollShopInfoScRsp clearRetcode() { @@ -162,7 +162,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -170,7 +170,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -181,7 +181,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 5; * @return whether the dLPBJMPECFC field is set */ public boolean hasDLPBJMPECFC() { @@ -189,7 +189,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 5; * @return this */ public GetRollShopInfoScRsp clearDLPBJMPECFC() { @@ -199,7 +199,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 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. @@ -213,7 +213,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 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 @@ -227,7 +227,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 5; * @param value the dLPBJMPECFC to add * @return this */ @@ -238,7 +238,7 @@ public final class GetRollShopInfoScRspOuterClass { } /** - * repeated uint32 DLPBJMPECFC = 8; + * repeated uint32 DLPBJMPECFC = 5; * @param values the dLPBJMPECFC to add * @return this */ @@ -326,20 +326,20 @@ public final class GetRollShopInfoScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(rollShopId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(bBJIJINJAFK); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < dLPBJMPECFC.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(dLPBJMPECFC.array()[i]); } } @@ -370,34 +370,34 @@ public final class GetRollShopInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // rollShopId rollShopId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 72) { + break; + } + } + case 72: { + // bBJIJINJAFK + bBJIJINJAFK = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // bBJIJINJAFK - bBJIJINJAFK = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { // dLPBJMPECFC [packed=true] input.readPackedUInt32(dLPBJMPECFC, tag); bitField0_ |= 0x00000008; @@ -416,7 +416,7 @@ public final class GetRollShopInfoScRspOuterClass { tag = input.readTag(); break; } - case 64: { + case 40: { // dLPBJMPECFC [packed=false] tag = input.readRepeatedUInt32(dLPBJMPECFC, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java index a07cdd6..0937d27 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoCsReqOuterClass.java @@ -20,12 +20,12 @@ public final class GetSceneMapInfoCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 9; */ private int entryId; /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 2; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 9; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -48,7 +48,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 9; * @return this */ public GetSceneMapInfoCsReq clearEntryId() { @@ -58,7 +58,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 9; * @return the entryId */ public int getEntryId() { @@ -66,7 +66,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * optional uint32 entry_id = 11; + * optional uint32 entry_id = 9; * @param value the entryId to set * @return this */ @@ -77,7 +77,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 2; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -85,7 +85,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 2; * @return this */ public GetSceneMapInfoCsReq clearEntryIdList() { @@ -95,7 +95,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_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. @@ -109,7 +109,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_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 @@ -123,7 +123,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 2; * @param value the entryIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetSceneMapInfoCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 2; * @param values the entryIdList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetSceneMapInfoCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entryIdList.length(); i++) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetSceneMapInfoCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 72: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 18) { break; } } - case 10: { + case 18: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetSceneMapInfoCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 16: { // entryIdList [packed=false] tag = input.readRepeatedUInt32(entryIdList, tag); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java index c724881..cc6ed9f 100644 --- a/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetSceneMapInfoScRspOuterClass.java @@ -21,50 +21,50 @@ public final class GetSceneMapInfoScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; - */ - private int retcode; - - /** - * optional uint32 entry_id = 6; - */ - private int entryId; - - /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 cur_map_entry_id = 8; */ private int curMapEntryId; /** - * repeated uint32 unlocked_teleport_list = 3; + * optional uint32 retcode = 10; */ - private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); + private int retcode; /** - * repeated uint32 lighten_section_list = 9; + * optional uint32 entry_id = 11; + */ + private int entryId; + + /** + * repeated uint32 lighten_section_list = 1; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeMapData map_list = 2; + * repeated uint32 unlocked_teleport_list = 15; + */ + private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .MazeMapData map_list = 4; */ private final RepeatedMessage mapList = RepeatedMessage.newEmptyInstance(MazeMapDataOuterClass.MazeMapData.getFactory()); /** - * repeated .MazeProp maze_prop_list = 8; + * 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 = 13; + * repeated .MazeGroup maze_group_list = 14; */ private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); - /** - * repeated .MazeChest unlocked_chest_list = 14; - */ - private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); - private GetSceneMapInfoScRsp() { } @@ -76,99 +76,25 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 retcode = 1; - * @return whether the retcode field is set + * optional uint32 cur_map_entry_id = 8; + * @return whether the curMapEntryId field is set */ - public boolean hasRetcode() { + public boolean hasCurMapEntryId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 1; - * @return this - */ - public GetSceneMapInfoScRsp 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 GetSceneMapInfoScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 entry_id = 6; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 6; - * @return this - */ - public GetSceneMapInfoScRsp clearEntryId() { - bitField0_ &= ~0x00000002; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 6; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 6; - * @param value the entryId to set - * @return this - */ - public GetSceneMapInfoScRsp setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 10; - * @return whether the curMapEntryId field is set - */ - public boolean hasCurMapEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 cur_map_entry_id = 8; * @return this */ public GetSceneMapInfoScRsp clearCurMapEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; curMapEntryId = 0; return this; } /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 cur_map_entry_id = 8; * @return the curMapEntryId */ public int getCurMapEntryId() { @@ -176,104 +102,110 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * optional uint32 cur_map_entry_id = 10; + * optional uint32 cur_map_entry_id = 8; * @param value the curMapEntryId to set * @return this */ public GetSceneMapInfoScRsp setCurMapEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; curMapEntryId = value; return this; } /** - * repeated uint32 unlocked_teleport_list = 3; - * @return whether the unlockedTeleportList field is set + * optional uint32 retcode = 10; + * @return whether the retcode field is set */ - public boolean hasUnlockedTeleportList() { + public boolean hasRetcode() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 retcode = 10; + * @return this + */ + public GetSceneMapInfoScRsp 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 GetSceneMapInfoScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + 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 unlocked_teleport_list = 3; - * @return this - */ - public GetSceneMapInfoScRsp clearUnlockedTeleportList() { - bitField0_ &= ~0x00000008; - unlockedTeleportList.clear(); - return this; - } - - /** - * repeated uint32 unlocked_teleport_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 #getMutableUnlockedTeleportList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getUnlockedTeleportList() { - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_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 getMutableUnlockedTeleportList() { - bitField0_ |= 0x00000008; - return unlockedTeleportList; - } - - /** - * repeated uint32 unlocked_teleport_list = 3; - * @param value the unlockedTeleportList to add - * @return this - */ - public GetSceneMapInfoScRsp addUnlockedTeleportList(final int value) { - bitField0_ |= 0x00000008; - unlockedTeleportList.add(value); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 3; - * @param values the unlockedTeleportList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllUnlockedTeleportList(final int... values) { - bitField0_ |= 0x00000008; - unlockedTeleportList.addAll(values); - return this; - } - - /** - * repeated uint32 lighten_section_list = 9; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 1; * @return this */ public GetSceneMapInfoScRsp clearLightenSectionList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; lightenSectionList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 9; + * 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. @@ -287,7 +219,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated uint32 lighten_section_list = 9; + * 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 @@ -296,34 +228,102 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return lightenSectionList; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 1; * @param value the lightenSectionList to add * @return this */ public GetSceneMapInfoScRsp addLightenSectionList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 1; * @param values the lightenSectionList to add * @return this */ public GetSceneMapInfoScRsp addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; lightenSectionList.addAll(values); return this; } /** - * repeated .MazeMapData map_list = 2; + * 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; * @return whether the mapList field is set */ public boolean hasMapList() { @@ -331,7 +331,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 2; + * repeated .MazeMapData map_list = 4; * @return this */ public GetSceneMapInfoScRsp clearMapList() { @@ -341,7 +341,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 2; + * repeated .MazeMapData map_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. @@ -355,7 +355,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 2; + * repeated .MazeMapData map_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 @@ -369,7 +369,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 2; + * repeated .MazeMapData map_list = 4; * @param value the mapList to add * @return this */ @@ -380,7 +380,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeMapData map_list = 2; + * repeated .MazeMapData map_list = 4; * @param values the mapList to add * @return this */ @@ -391,161 +391,25 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeProp maze_prop_list = 8; - * @return whether the mazePropList field is set + * repeated .MazeChest unlocked_chest_list = 5; + * @return whether the unlockedChestList field is set */ - public boolean hasMazePropList() { + public boolean hasUnlockedChestList() { return (bitField0_ & 0x00000040) != 0; } /** - * repeated .MazeProp maze_prop_list = 8; - * @return this - */ - public GetSceneMapInfoScRsp clearMazePropList() { - bitField0_ &= ~0x00000040; - mazePropList.clear(); - return this; - } - - /** - * repeated .MazeProp maze_prop_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 #getMutableMazePropList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazePropList() { - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_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 RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000040; - return mazePropList; - } - - /** - * repeated .MazeProp maze_prop_list = 8; - * @param value the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000040; - mazePropList.add(value); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 8; - * @param values the mazePropList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000040; - mazePropList.addAll(values); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 13; - * @return whether the mazeGroupList field is set - */ - public boolean hasMazeGroupList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeGroup maze_group_list = 13; - * @return this - */ - public GetSceneMapInfoScRsp clearMazeGroupList() { - bitField0_ &= ~0x00000080; - mazeGroupList.clear(); - return this; - } - - /** - * repeated .MazeGroup maze_group_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 #getMutableMazeGroupList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_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 getMutableMazeGroupList() { - bitField0_ |= 0x00000080; - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 13; - * @param value the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000080; - mazeGroupList.add(value); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 13; - * @param values the mazeGroupList to add - * @return this - */ - public GetSceneMapInfoScRsp addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000080; - mazeGroupList.addAll(values); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 14; - * @return whether the unlockedChestList field is set - */ - public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .MazeChest unlocked_chest_list = 14; + * repeated .MazeChest unlocked_chest_list = 5; * @return this */ public GetSceneMapInfoScRsp clearUnlockedChestList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000040; unlockedChestList.clear(); return this; } /** - * repeated .MazeChest unlocked_chest_list = 14; + * 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. @@ -559,7 +423,7 @@ public final class GetSceneMapInfoScRspOuterClass { } /** - * repeated .MazeChest unlocked_chest_list = 14; + * 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 @@ -568,47 +432,183 @@ public final class GetSceneMapInfoScRspOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableUnlockedChestList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; return unlockedChestList; } /** - * repeated .MazeChest unlocked_chest_list = 14; + * repeated .MazeChest unlocked_chest_list = 5; * @param value the unlockedChestList to add * @return this */ public GetSceneMapInfoScRsp addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000040; unlockedChestList.add(value); return this; } /** - * repeated .MazeChest unlocked_chest_list = 14; + * repeated .MazeChest unlocked_chest_list = 5; * @param values the unlockedChestList to add * @return this */ public GetSceneMapInfoScRsp addAllUnlockedChestList( final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000100; + 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; - curMapEntryId = other.curMapEntryId; - unlockedTeleportList.copyFrom(other.unlockedTeleportList); lightenSectionList.copyFrom(other.lightenSectionList); + unlockedTeleportList.copyFrom(other.unlockedTeleportList); mapList.copyFrom(other.mapList); + unlockedChestList.copyFrom(other.unlockedChestList); mazePropList.copyFrom(other.mazePropList); mazeGroupList.copyFrom(other.mazeGroupList); - unlockedChestList.copyFrom(other.unlockedChestList); } return this; } @@ -619,33 +619,33 @@ 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.hasCurMapEntryId()) { - setCurMapEntryId(other.curMapEntryId); + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); } if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } - if (other.hasLightenSectionList()) { - getMutableLightenSectionList().addAll(other.lightenSectionList); - } 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); } - if (other.hasUnlockedChestList()) { - getMutableUnlockedChestList().addAll(other.unlockedChestList); - } return this; } @@ -656,15 +656,15 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + curMapEntryId = 0; retcode = 0; entryId = 0; - curMapEntryId = 0; - unlockedTeleportList.clear(); lightenSectionList.clear(); + unlockedTeleportList.clear(); mapList.clear(); + unlockedChestList.clear(); mazePropList.clear(); mazeGroupList.clear(); - unlockedChestList.clear(); return this; } @@ -675,12 +675,12 @@ public final class GetSceneMapInfoScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - unlockedTeleportList.clear(); lightenSectionList.clear(); + unlockedTeleportList.clear(); mapList.clearQuick(); + unlockedChestList.clearQuick(); mazePropList.clearQuick(); mazeGroupList.clearQuick(); - unlockedChestList.clearQuick(); return this; } @@ -694,65 +694,65 @@ public final class GetSceneMapInfoScRspOuterClass { } GetSceneMapInfoScRsp other = (GetSceneMapInfoScRsp) o; return bitField0_ == other.bitField0_ + && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) && (!hasRetcode() || retcode == other.retcode) && (!hasEntryId() || entryId == other.entryId) - && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) - && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) && (!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)) - && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)); + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @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) 48); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(curMapEntryId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(entryId); + } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(unlockedTeleportList.array()[i]); + 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 < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(lightenSectionList.array()[i]); + for (int i = 0; i < unlockedTeleportList.length(); i++) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < mapList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 34); output.writeMessageNoTag(mapList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(mazePropList.get(i)); + 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 < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(mazeGroupList.get(i)); + 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 < unlockedChestList.length(); i++) { + for (int i = 0; i < mazeGroupList.length(); i++) { output.writeRawByte((byte) 114); - output.writeMessageNoTag(unlockedChestList.get(i)); + output.writeMessageNoTag(mazeGroupList.get(i)); } } } @@ -761,31 +761,31 @@ public final class GetSceneMapInfoScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 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 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { size += (1 * mapList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mapList); } if ((bitField0_ & 0x00000040) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } return size; } @@ -797,78 +797,78 @@ public final class GetSceneMapInfoScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // retcode - retcode = input.readUInt32(); + case 64: { + // curMapEntryId + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 80) { break; } } case 80: { - // curMapEntryId - curMapEntryId = input.readUInt32(); + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { - // unlockedTeleportList [packed=true] - input.readPackedUInt32(unlockedTeleportList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { + case 10: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + 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 != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { + // unlockedChestList + tag = input.readRepeatedMessage(unlockedChestList, tag); + bitField0_ |= 0x00000040; + if (tag != 58) { + break; + } + } + case 58: { // mazePropList tag = input.readRepeatedMessage(mazePropList, tag); - bitField0_ |= 0x00000040; - if (tag != 106) { - break; - } - } - case 106: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000080; if (tag != 114) { break; } } case 114: { - // unlockedChestList - tag = input.readRepeatedMessage(unlockedChestList, tag); + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000100; if (tag != 0) { break; @@ -884,15 +884,15 @@ public final class GetSceneMapInfoScRspOuterClass { tag = input.readTag(); break; } - case 24: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + case 8: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000008; break; } - case 72: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 120: { + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000010; break; } @@ -904,31 +904,31 @@ public final class GetSceneMapInfoScRspOuterClass { 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.entryId, entryId); - } - if ((bitField0_ & 0x00000004) != 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.unlockedTeleportList, unlockedTeleportList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } if ((bitField0_ & 0x00000020) != 0) { output.writeRepeatedMessage(FieldNames.mapList, mapList); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } output.endObject(); } @@ -940,11 +940,23 @@ 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_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -956,18 +968,6 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { - if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -975,23 +975,23 @@ public final class GetSceneMapInfoScRspOuterClass { } break; } - case 856936684: - case -10753834: { - if (input.isAtField(FieldNames.unlockedTeleportList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(unlockedTeleportList); - bitField0_ |= 0x00000008; - } - } 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; } } else { @@ -1011,12 +1011,24 @@ public final class GetSceneMapInfoScRspOuterClass { } 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_ |= 0x00000040; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -1028,18 +1040,6 @@ public final class GetSceneMapInfoScRspOuterClass { if (input.isAtField(FieldNames.mazeGroupList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(mazeGroupList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case -337762404: - case 231688696: { - if (input.isAtField(FieldNames.unlockedChestList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(unlockedChestList); bitField0_ |= 0x00000100; } } else { @@ -1100,23 +1100,23 @@ 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 curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_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 lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_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"); - - static final FieldName unlockedChestList = FieldName.forField("unlockedChestList", "unlocked_chest_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/GetShopListCsReqOuterClass.java index 7c0bae1..963630a 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 = 5; + * optional uint32 shop_type = 2; */ private int shopType; @@ -34,7 +34,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 5; + * optional uint32 shop_type = 2; * @return whether the shopType field is set */ public boolean hasShopType() { @@ -42,7 +42,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 5; + * optional uint32 shop_type = 2; * @return this */ public GetShopListCsReq clearShopType() { @@ -52,7 +52,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 5; + * optional uint32 shop_type = 2; * @return the shopType */ public int getShopType() { @@ -60,7 +60,7 @@ public final class GetShopListCsReqOuterClass { } /** - * optional uint32 shop_type = 5; + * optional uint32 shop_type = 2; * @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) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(shopType); } } @@ -150,7 +150,7 @@ public final class GetShopListCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 16: { // 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 f608209..0aa2e39 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 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 6; */ private int shopType; /** - * repeated .Shop shop_list = 8; + * optional uint32 retcode = 8; + */ + private int retcode; + + /** + * repeated .Shop shop_list = 7; */ private final RepeatedMessage shopList = RepeatedMessage.newEmptyInstance(ShopOuterClass.Shop.getFactory()); @@ -45,62 +45,25 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 shop_type = 6; + * @return whether the shopType field is set */ - public boolean hasRetcode() { + public boolean hasShopType() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public GetShopListScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - 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 GetShopListScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 shop_type = 7; - * @return whether the shopType field is set - */ - public boolean hasShopType() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 6; * @return this */ public GetShopListScRsp clearShopType() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; shopType = 0; return this; } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 6; * @return the shopType */ public int getShopType() { @@ -108,18 +71,55 @@ public final class GetShopListScRspOuterClass { } /** - * optional uint32 shop_type = 7; + * optional uint32 shop_type = 6; * @param value the shopType to set * @return this */ public GetShopListScRsp setShopType(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; shopType = value; return this; } /** - * repeated .Shop shop_list = 8; + * 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 GetShopListScRsp 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 GetShopListScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * repeated .Shop shop_list = 7; * @return whether the shopList field is set */ public boolean hasShopList() { @@ -127,7 +127,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @return this */ public GetShopListScRsp clearShopList() { @@ -137,7 +137,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_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 GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_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 GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @param value the shopList to add * @return this */ @@ -176,7 +176,7 @@ public final class GetShopListScRspOuterClass { } /** - * repeated .Shop shop_list = 8; + * repeated .Shop shop_list = 7; * @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_; - retcode = other.retcode; shopType = other.shopType; + retcode = other.retcode; shopList.copyFrom(other.shopList); } return this; @@ -204,12 +204,12 @@ public final class GetShopListScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasShopType()) { setShopType(other.shopType); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasShopList()) { getMutableShopList().addAll(other.shopList); } @@ -223,8 +223,8 @@ public final class GetShopListScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; shopType = 0; + retcode = 0; shopList.clear(); return this; } @@ -250,24 +250,24 @@ public final class GetShopListScRspOuterClass { } GetShopListScRsp other = (GetShopListScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasShopType() || shopType == other.shopType) + && (!hasRetcode() || retcode == other.retcode) && (!hasShopList() || shopList.equals(other.shopList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(shopType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(shopType); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < shopList.length(); i++) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 58); 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(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } 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 40: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { + case 48: { // shopType shopType = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 64) { break; } } - case 66: { + case 64: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { // 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.retcode, retcode); + output.writeUInt32(FieldNames.shopType, shopType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.shopType, shopType); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedMessage(FieldNames.shopList, shopList); @@ -357,10 +357,11 @@ public final class GetShopListScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -368,11 +369,10 @@ public final class GetShopListScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -445,10 +445,10 @@ public final class GetShopListScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName shopType = FieldName.forField("shopType", "shop_type"); + static final FieldName retcode = FieldName.forField("retcode"); + 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 bfa4941..20ffeb9 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 = 1; + * repeated uint32 entry_id_list = 4; */ private final RepeatedInt entryIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 4; * @return whether the entryIdList field is set */ public boolean hasEntryIdList() { @@ -43,7 +43,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 4; * @return this */ public GetUnlockTeleportCsReq clearEntryIdList() { @@ -53,7 +53,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_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. @@ -67,7 +67,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_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 @@ -81,7 +81,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 4; * @param value the entryIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class GetUnlockTeleportCsReqOuterClass { } /** - * repeated uint32 entry_id_list = 1; + * repeated uint32 entry_id_list = 4; * @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) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(entryIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class GetUnlockTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 34: { // entryIdList [packed=true] input.readPackedUInt32(entryIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class GetUnlockTeleportCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 32: { // 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 e416237..45f5e9d 100644 --- a/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GetUnlockTeleportScRspOuterClass.java @@ -20,12 +20,12 @@ public final class GetUnlockTeleportScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 15; */ private int retcode; /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_list = 1; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 15; * @return this */ public GetUnlockTeleportScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_list = 1; * @return whether the unlockedTeleportList field is set */ public boolean hasUnlockedTeleportList() { @@ -85,7 +85,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_list = 1; * @return this */ public GetUnlockTeleportScRsp clearUnlockedTeleportList() { @@ -95,7 +95,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_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. @@ -109,7 +109,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_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 @@ -123,7 +123,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_list = 1; * @param value the unlockedTeleportList to add * @return this */ @@ -134,7 +134,7 @@ public final class GetUnlockTeleportScRspOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 8; + * repeated uint32 unlocked_teleport_list = 1; * @param values the unlockedTeleportList to add * @return this */ @@ -210,12 +210,12 @@ public final class GetUnlockTeleportScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } @@ -240,16 +240,16 @@ public final class GetUnlockTeleportScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 10) { break; } } - case 66: { + case 10: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class GetUnlockTeleportScRspOuterClass { tag = input.readTag(); break; } - case 64: { + case 8: { // 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 08d5e7f..8a581ec 100644 --- a/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GoodsOuterClass.java @@ -19,27 +19,27 @@ public final class GoodsOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 2; + * optional int64 begin_time = 14; */ private long beginTime; /** - * optional int64 end_time = 3; + * optional int64 end_time = 15; */ private long endTime; /** - * optional uint32 item_id = 6; - */ - private int itemId; - - /** - * optional uint32 goods_id = 13; + * optional uint32 goods_id = 10; */ private int goodsId; /** - * optional uint32 buy_times = 14; + * optional uint32 item_id = 11; + */ + private int itemId; + + /** + * optional uint32 buy_times = 13; */ private int buyTimes; @@ -54,7 +54,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 2; + * optional int64 begin_time = 14; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -62,7 +62,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 2; + * optional int64 begin_time = 14; * @return this */ public Goods clearBeginTime() { @@ -72,7 +72,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 2; + * optional int64 begin_time = 14; * @return the beginTime */ public long getBeginTime() { @@ -80,7 +80,7 @@ public final class GoodsOuterClass { } /** - * optional int64 begin_time = 2; + * optional int64 begin_time = 14; * @param value the beginTime to set * @return this */ @@ -91,7 +91,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 15; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -99,7 +99,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 15; * @return this */ public Goods clearEndTime() { @@ -109,7 +109,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 15; * @return the endTime */ public long getEndTime() { @@ -117,7 +117,7 @@ public final class GoodsOuterClass { } /** - * optional int64 end_time = 3; + * optional int64 end_time = 15; * @param value the endTime to set * @return this */ @@ -128,62 +128,25 @@ public final class GoodsOuterClass { } /** - * optional uint32 item_id = 6; - * @return whether the itemId field is set + * optional uint32 goods_id = 10; + * @return whether the goodsId field is set */ - public boolean hasItemId() { + public boolean hasGoodsId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 item_id = 6; - * @return this - */ - public Goods clearItemId() { - bitField0_ &= ~0x00000004; - itemId = 0; - return this; - } - - /** - * optional uint32 item_id = 6; - * @return the itemId - */ - public int getItemId() { - return itemId; - } - - /** - * optional uint32 item_id = 6; - * @param value the itemId to set - * @return this - */ - public Goods setItemId(final int value) { - bitField0_ |= 0x00000004; - itemId = value; - return this; - } - - /** - * optional uint32 goods_id = 13; - * @return whether the goodsId field is set - */ - public boolean hasGoodsId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 goods_id = 13; + * optional uint32 goods_id = 10; * @return this */ public Goods clearGoodsId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; goodsId = 0; return this; } /** - * optional uint32 goods_id = 13; + * optional uint32 goods_id = 10; * @return the goodsId */ public int getGoodsId() { @@ -191,18 +154,55 @@ public final class GoodsOuterClass { } /** - * optional uint32 goods_id = 13; + * optional uint32 goods_id = 10; * @param value the goodsId to set * @return this */ public Goods setGoodsId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; goodsId = value; return this; } /** - * optional uint32 buy_times = 14; + * 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() { @@ -210,7 +210,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 13; * @return this */ public Goods clearBuyTimes() { @@ -220,7 +220,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 13; * @return the buyTimes */ public int getBuyTimes() { @@ -228,7 +228,7 @@ public final class GoodsOuterClass { } /** - * optional uint32 buy_times = 14; + * optional uint32 buy_times = 13; * @param value the buyTimes to set * @return this */ @@ -245,8 +245,8 @@ public final class GoodsOuterClass { bitField0_ = other.bitField0_; beginTime = other.beginTime; endTime = other.endTime; - itemId = other.itemId; goodsId = other.goodsId; + itemId = other.itemId; buyTimes = other.buyTimes; } return this; @@ -264,12 +264,12 @@ public final class GoodsOuterClass { if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasItemId()) { - setItemId(other.itemId); - } if (other.hasGoodsId()) { setGoodsId(other.goodsId); } + if (other.hasItemId()) { + setItemId(other.itemId); + } if (other.hasBuyTimes()) { setBuyTimes(other.buyTimes); } @@ -285,8 +285,8 @@ public final class GoodsOuterClass { bitField0_ = 0; beginTime = 0L; endTime = 0L; - itemId = 0; goodsId = 0; + itemId = 0; buyTimes = 0; return this; } @@ -313,31 +313,31 @@ public final class GoodsOuterClass { return bitField0_ == other.bitField0_ && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) - && (!hasItemId() || itemId == other.itemId) && (!hasGoodsId() || goodsId == other.goodsId) + && (!hasItemId() || itemId == other.itemId) && (!hasBuyTimes() || buyTimes == other.buyTimes); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 120); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(itemId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(goodsId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(itemId); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(buyTimes); } } @@ -352,10 +352,10 @@ public final class GoodsOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(goodsId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(buyTimes); @@ -370,43 +370,43 @@ public final class GoodsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 112: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 120) { break; } } - case 24: { + case 120: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { + case 80: { + // goodsId + goodsId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // itemId itemId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // goodsId - goodsId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // buyTimes buyTimes = input.readUInt32(); bitField0_ |= 0x00000010; @@ -439,10 +439,10 @@ public final class GoodsOuterClass { output.writeInt64(FieldNames.endTime, endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.goodsId, goodsId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.goodsId, goodsId); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.buyTimes, buyTimes); @@ -481,11 +481,11 @@ public final class GoodsOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 207037201: + case 2123207332: { + if (input.isAtField(FieldNames.goodsId)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + goodsId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -493,11 +493,11 @@ public final class GoodsOuterClass { } break; } - case 207037201: - case 2123207332: { - if (input.isAtField(FieldNames.goodsId)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - goodsId = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -573,10 +573,10 @@ public final class GoodsOuterClass { static final FieldName endTime = FieldName.forField("endTime", "end_time"); - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - 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 152f823..da34353 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeCsReqOuterClass.java @@ -19,9 +19,9 @@ public final class GroupStateChangeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_info = 13; */ - private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); + private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); private GroupStateChangeCsReq() { } @@ -34,39 +34,39 @@ public final class GroupStateChangeCsReqOuterClass { } /** - * optional .GroupStateInfo group_state_info = 8; - * @return whether the groupStateInfo field is set + * optional .GroupStateInfo group_info = 13; + * @return whether the groupInfo field is set */ - public boolean hasGroupStateInfo() { + public boolean hasGroupInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_info = 13; * @return this */ - public GroupStateChangeCsReq clearGroupStateInfo() { + public GroupStateChangeCsReq clearGroupInfo() { bitField0_ &= ~0x00000001; - groupStateInfo.clear(); + groupInfo.clear(); return this; } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_info = 13; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. * - * Use {@link #getMutableGroupStateInfo()} if you want to modify it. + * Use {@link #getMutableGroupInfo()} if you want to modify it. * * @return internal storage object for reading */ - public GroupStateInfoOuterClass.GroupStateInfo getGroupStateInfo() { - return groupStateInfo; + public GroupStateInfoOuterClass.GroupStateInfo getGroupInfo() { + return groupInfo; } /** - * optional .GroupStateInfo group_state_info = 8; + * optional .GroupStateInfo group_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 @@ -74,20 +74,19 @@ public final class GroupStateChangeCsReqOuterClass { * * @return internal storage object for modifications */ - public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupStateInfo() { + public GroupStateInfoOuterClass.GroupStateInfo getMutableGroupInfo() { bitField0_ |= 0x00000001; - return groupStateInfo; + return groupInfo; } /** - * optional .GroupStateInfo group_state_info = 8; - * @param value the groupStateInfo to set + * optional .GroupStateInfo group_info = 13; + * @param value the groupInfo to set * @return this */ - public GroupStateChangeCsReq setGroupStateInfo( - final GroupStateInfoOuterClass.GroupStateInfo value) { + public GroupStateChangeCsReq setGroupInfo(final GroupStateInfoOuterClass.GroupStateInfo value) { bitField0_ |= 0x00000001; - groupStateInfo.copyFrom(value); + groupInfo.copyFrom(value); return this; } @@ -96,7 +95,7 @@ public final class GroupStateChangeCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - groupStateInfo.copyFrom(other.groupStateInfo); + groupInfo.copyFrom(other.groupInfo); } return this; } @@ -107,8 +106,8 @@ public final class GroupStateChangeCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasGroupStateInfo()) { - getMutableGroupStateInfo().mergeFrom(other.groupStateInfo); + if (other.hasGroupInfo()) { + getMutableGroupInfo().mergeFrom(other.groupInfo); } return this; } @@ -120,7 +119,7 @@ public final class GroupStateChangeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - groupStateInfo.clear(); + groupInfo.clear(); return this; } @@ -131,7 +130,7 @@ public final class GroupStateChangeCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - groupStateInfo.clearQuick(); + groupInfo.clearQuick(); return this; } @@ -145,14 +144,14 @@ public final class GroupStateChangeCsReqOuterClass { } GroupStateChangeCsReq other = (GroupStateChangeCsReq) o; return bitField0_ == other.bitField0_ - && (!hasGroupStateInfo() || groupStateInfo.equals(other.groupStateInfo)); + && (!hasGroupInfo() || groupInfo.equals(other.groupInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 66); - output.writeMessageNoTag(groupStateInfo); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(groupInfo); } } @@ -160,7 +159,7 @@ public final class GroupStateChangeCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(groupStateInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(groupInfo); } return size; } @@ -172,9 +171,9 @@ public final class GroupStateChangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { - // groupStateInfo - input.readMessage(groupStateInfo); + case 106: { + // groupInfo + input.readMessage(groupInfo); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { @@ -199,7 +198,7 @@ public final class GroupStateChangeCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.groupStateInfo, groupStateInfo); + output.writeMessage(FieldNames.groupInfo, groupInfo); } output.endObject(); } @@ -211,11 +210,11 @@ public final class GroupStateChangeCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1415312672: - case 1198732636: { - if (input.isAtField(FieldNames.groupStateInfo)) { + case -1483311155: + case 1282170478: { + if (input.isAtField(FieldNames.groupInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(groupStateInfo); + input.readMessage(groupInfo); bitField0_ |= 0x00000001; } } else { @@ -276,7 +275,7 @@ public final class GroupStateChangeCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName groupStateInfo = FieldName.forField("groupStateInfo", "group_state_info"); + static final FieldName groupInfo = FieldName.forField("groupInfo", "group_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScNotifyOuterClass.java index be254ee..be8a373 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 = 7; + * optional .GroupStateInfo group_state_info = 3; */ private final GroupStateInfoOuterClass.GroupStateInfo groupStateInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -34,7 +34,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 7; + * optional .GroupStateInfo group_state_info = 3; * @return whether the groupStateInfo field is set */ public boolean hasGroupStateInfo() { @@ -42,7 +42,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 7; + * optional .GroupStateInfo group_state_info = 3; * @return this */ public GroupStateChangeScNotify clearGroupStateInfo() { @@ -52,7 +52,7 @@ public final class GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 7; + * optional .GroupStateInfo group_state_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 GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 7; + * optional .GroupStateInfo group_state_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 GroupStateChangeScNotifyOuterClass { } /** - * optional .GroupStateInfo group_state_info = 7; + * optional .GroupStateInfo group_state_info = 3; * @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) 58); + output.writeRawByte((byte) 26); output.writeMessageNoTag(groupStateInfo); } } @@ -172,7 +172,7 @@ public final class GroupStateChangeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 26: { // 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 97c1f97..a82220d 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateChangeScRspOuterClass.java @@ -24,7 +24,7 @@ public final class GroupStateChangeScRspOuterClass { private int retcode; /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_info = 2; */ private final GroupStateInfoOuterClass.GroupStateInfo groupInfo = GroupStateInfoOuterClass.GroupStateInfo.newInstance(); @@ -76,7 +76,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_info = 2; * @return whether the groupInfo field is set */ public boolean hasGroupInfo() { @@ -84,7 +84,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_info = 2; * @return this */ public GroupStateChangeScRsp clearGroupInfo() { @@ -94,7 +94,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_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. @@ -108,7 +108,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_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 @@ -122,7 +122,7 @@ public final class GroupStateChangeScRspOuterClass { } /** - * optional .GroupStateInfo group_info = 8; + * optional .GroupStateInfo group_info = 2; * @param value the groupInfo to set * @return this */ @@ -202,7 +202,7 @@ public final class GroupStateChangeScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 18); output.writeMessageNoTag(groupInfo); } } @@ -231,11 +231,11 @@ public final class GroupStateChangeScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 66) { + if (tag != 18) { break; } } - case 66: { + case 18: { // 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 e9f76ad..348b828 100644 --- a/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/GroupStateInfoOuterClass.java @@ -19,33 +19,25 @@ public final class GroupStateInfoOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  OEKBJNJEEDF
-     *
- * - * optional uint32 player_uid = 2; - */ - private int playerUid; - - /** - * 
-     *  EMFPPBJCLGP
-     *
- * - * optional uint32 group_state = 3; + * optional uint32 group_state = 2; */ private int groupState; - /** - * optional uint32 entry_id = 4; - */ - private int entryId; - /** * optional uint32 group_id = 5; */ private int groupId; + /** + * optional uint32 entry_id = 7; + */ + private int entryId; + + /** + * optional uint32 player_uid = 14; + */ + private int playerUid; + private GroupStateInfo() { } @@ -57,90 +49,25 @@ public final class GroupStateInfoOuterClass { } /** - * 
-     *  OEKBJNJEEDF
-     *
- * - * optional uint32 player_uid = 2; - * @return whether the playerUid field is set + * optional uint32 group_state = 2; + * @return whether the groupState field is set */ - public boolean hasPlayerUid() { + public boolean hasGroupState() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     *  OEKBJNJEEDF
-     *
- * - * optional uint32 player_uid = 2; - * @return this - */ - public GroupStateInfo clearPlayerUid() { - bitField0_ &= ~0x00000001; - playerUid = 0; - return this; - } - - /** - * 
-     *  OEKBJNJEEDF
-     *
- * - * optional uint32 player_uid = 2; - * @return the playerUid - */ - public int getPlayerUid() { - return playerUid; - } - - /** - * 
-     *  OEKBJNJEEDF
-     *
- * - * optional uint32 player_uid = 2; - * @param value the playerUid to set - * @return this - */ - public GroupStateInfo setPlayerUid(final int value) { - bitField0_ |= 0x00000001; - playerUid = value; - return this; - } - - /** - * 
-     *  EMFPPBJCLGP
-     *
- * - * optional uint32 group_state = 3; - * @return whether the groupState field is set - */ - public boolean hasGroupState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  EMFPPBJCLGP
-     *
- * - * optional uint32 group_state = 3; + * optional uint32 group_state = 2; * @return this */ public GroupStateInfo clearGroupState() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupState = 0; return this; } /** - * 
-     *  EMFPPBJCLGP
-     *
- * - * optional uint32 group_state = 3; + * optional uint32 group_state = 2; * @return the groupState */ public int getGroupState() { @@ -148,63 +75,22 @@ public final class GroupStateInfoOuterClass { } /** - * 
-     *  EMFPPBJCLGP
-     *
- * - * optional uint32 group_state = 3; + * optional uint32 group_state = 2; * @param value the groupState to set * @return this */ public GroupStateInfo setGroupState(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupState = value; return this; } - /** - * optional uint32 entry_id = 4; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entry_id = 4; - * @return this - */ - public GroupStateInfo clearEntryId() { - bitField0_ &= ~0x00000004; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 4; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 4; - * @param value the entryId to set - * @return this - */ - public GroupStateInfo setEntryId(final int value) { - bitField0_ |= 0x00000004; - entryId = value; - return this; - } - /** * optional uint32 group_id = 5; * @return whether the groupId field is set */ public boolean hasGroupId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -212,7 +98,7 @@ public final class GroupStateInfoOuterClass { * @return this */ public GroupStateInfo clearGroupId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; groupId = 0; return this; } @@ -231,20 +117,94 @@ public final class GroupStateInfoOuterClass { * @return this */ public GroupStateInfo setGroupId(final int value) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public GroupStateInfo clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 7; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 7; + * @param value the entryId to set + * @return this + */ + public GroupStateInfo setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = value; + return this; + } + + /** + * optional uint32 player_uid = 14; + * @return whether the playerUid field is set + */ + public boolean hasPlayerUid() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 player_uid = 14; + * @return this + */ + public GroupStateInfo clearPlayerUid() { + bitField0_ &= ~0x00000008; + playerUid = 0; + return this; + } + + /** + * optional uint32 player_uid = 14; + * @return the playerUid + */ + public int getPlayerUid() { + return playerUid; + } + + /** + * optional uint32 player_uid = 14; + * @param value the playerUid to set + * @return this + */ + public GroupStateInfo setPlayerUid(final int value) { + bitField0_ |= 0x00000008; + playerUid = value; + return this; + } + @Override public GroupStateInfo copyFrom(final GroupStateInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - playerUid = other.playerUid; groupState = other.groupState; - entryId = other.entryId; groupId = other.groupId; + entryId = other.entryId; + playerUid = other.playerUid; } return this; } @@ -255,17 +215,17 @@ public final class GroupStateInfoOuterClass { return this; } cachedSize = -1; - if (other.hasPlayerUid()) { - setPlayerUid(other.playerUid); - } if (other.hasGroupState()) { setGroupState(other.groupState); } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasGroupId()) { - setGroupId(other.groupId); + if (other.hasPlayerUid()) { + setPlayerUid(other.playerUid); } return this; } @@ -277,10 +237,10 @@ public final class GroupStateInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - playerUid = 0; groupState = 0; - entryId = 0; groupId = 0; + entryId = 0; + playerUid = 0; return this; } @@ -304,29 +264,29 @@ public final class GroupStateInfoOuterClass { } GroupStateInfo other = (GroupStateInfo) o; return bitField0_ == other.bitField0_ - && (!hasPlayerUid() || playerUid == other.playerUid) && (!hasGroupState() || groupState == other.groupState) + && (!hasGroupId() || groupId == other.groupId) && (!hasEntryId() || entryId == other.entryId) - && (!hasGroupId() || groupId == other.groupId); + && (!hasPlayerUid() || playerUid == other.playerUid); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(playerUid); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); output.writeUInt32NoTag(groupState); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(groupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(groupId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(playerUid); } } @@ -334,16 +294,16 @@ public final class GroupStateInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playerUid); } return size; } @@ -356,27 +316,9 @@ public final class GroupStateInfoOuterClass { while (true) { switch (tag) { case 16: { - // playerUid - playerUid = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { // groupState groupState = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 40) { break; @@ -385,6 +327,24 @@ public final class GroupStateInfoOuterClass { case 40: { // groupId groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // playerUid + playerUid = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -409,16 +369,16 @@ public final class GroupStateInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.playerUid, playerUid); + output.writeUInt32(FieldNames.groupState, groupState); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupState, groupState); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.playerUid, playerUid); } output.endObject(); } @@ -430,11 +390,11 @@ public final class GroupStateInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1872053841: - case 2096182770: { - if (input.isAtField(FieldNames.playerUid)) { + case 1271403858: + case 1101988561: { + if (input.isAtField(FieldNames.groupState)) { if (!input.trySkipNullValue()) { - playerUid = input.readUInt32(); + groupState = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -442,11 +402,11 @@ public final class GroupStateInfoOuterClass { } break; } - case 1271403858: - case 1101988561: { - if (input.isAtField(FieldNames.groupState)) { + case 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { if (!input.trySkipNullValue()) { - groupState = input.readUInt32(); + groupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -466,11 +426,11 @@ public final class GroupStateInfoOuterClass { } break; } - case 293428218: - case 506361563: { - if (input.isAtField(FieldNames.groupId)) { + case -1872053841: + case 2096182770: { + if (input.isAtField(FieldNames.playerUid)) { if (!input.trySkipNullValue()) { - groupId = input.readUInt32(); + playerUid = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -531,13 +491,13 @@ public final class GroupStateInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName playerUid = FieldName.forField("playerUid", "player_uid"); - 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 groupId = FieldName.forField("groupId", "group_id"); + static final FieldName playerUid = FieldName.forField("playerUid", "player_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/HandleFriendCsReqOuterClass.java index a6887dd..c2b00a5 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 = 13; + * optional uint32 uid = 4; */ private int uid; /** - * optional bool handle_result = 3; + * optional bool handle_result = 12; */ private boolean handleResult; @@ -39,7 +39,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 4; * @return whether the uid field is set */ public boolean hasUid() { @@ -47,7 +47,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 4; * @return this */ public HandleFriendCsReq clearUid() { @@ -57,7 +57,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -65,7 +65,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional uint32 uid = 13; + * optional uint32 uid = 4; * @param value the uid to set * @return this */ @@ -76,7 +76,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 3; + * optional bool handle_result = 12; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -84,7 +84,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 3; + * optional bool handle_result = 12; * @return this */ public HandleFriendCsReq clearHandleResult() { @@ -94,7 +94,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 3; + * optional bool handle_result = 12; * @return the handleResult */ public boolean getHandleResult() { @@ -102,7 +102,7 @@ public final class HandleFriendCsReqOuterClass { } /** - * optional bool handle_result = 3; + * optional bool handle_result = 12; * @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) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeBoolNoTag(handleResult); } } @@ -205,16 +205,16 @@ public final class HandleFriendCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 32: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // 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 76b8457..e1900c1 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 = 4; + * optional uint32 uid = 5; */ private int uid; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional bool handle_result = 15; + * optional bool handle_result = 2; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_info = 10; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -49,7 +49,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 5; * @return whether the uid field is set */ public boolean hasUid() { @@ -57,7 +57,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 5; * @return this */ public HandleFriendScRsp clearUid() { @@ -67,7 +67,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -75,7 +75,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ @@ -86,7 +86,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -94,7 +94,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return this */ public HandleFriendScRsp clearRetcode() { @@ -104,7 +104,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -112,7 +112,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -123,7 +123,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 15; + * optional bool handle_result = 2; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -131,7 +131,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 15; + * optional bool handle_result = 2; * @return this */ public HandleFriendScRsp clearHandleResult() { @@ -141,7 +141,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 15; + * optional bool handle_result = 2; * @return the handleResult */ public boolean getHandleResult() { @@ -149,7 +149,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional bool handle_result = 15; + * optional bool handle_result = 2; * @param value the handleResult to set * @return this */ @@ -160,7 +160,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_info = 10; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -168,7 +168,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_info = 10; * @return this */ public HandleFriendScRsp clearHandleFriendInfo() { @@ -178,7 +178,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_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. @@ -192,7 +192,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_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 @@ -206,7 +206,7 @@ public final class HandleFriendScRspOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 9; + * optional .FriendListInfo handle_friend_info = 10; * @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) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 82); output.writeMessageNoTag(handleFriendInfo); } } @@ -337,34 +337,34 @@ public final class HandleFriendScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 40: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 120) { break; } } case 120: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 74) { + if (tag != 82) { break; } } - case 74: { + case 82: { // handleFriendInfo input.readMessage(handleFriendInfo); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeadIconOuterClass.java index e1277db..7b7c041 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 = 8; + * optional uint32 id = 14; */ private int id; @@ -34,7 +34,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 14; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 14; * @return this */ public HeadIcon clearId() { @@ -52,7 +52,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 14; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class HeadIconOuterClass { } /** - * optional uint32 id = 8; + * optional uint32 id = 14; * @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) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class HeadIconOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java index efe4320..2aa259c 100644 --- a/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/HeroBasicTypeInfoOuterClass.java @@ -20,17 +20,17 @@ public final class HeroBasicTypeInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rank = 6; + * optional uint32 rank = 14; */ private int rank; /** - * optional .HeroBasicType basic_type = 14; + * optional .HeroBasicType basic_type = 4; */ private int basicType; /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 6; */ private final RepeatedMessage skillTreeList = RepeatedMessage.newEmptyInstance(AvatarSkillTreeOuterClass.AvatarSkillTree.getFactory()); @@ -45,7 +45,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 14; * @return whether the rank field is set */ public boolean hasRank() { @@ -53,7 +53,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 14; * @return this */ public HeroBasicTypeInfo clearRank() { @@ -63,7 +63,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 14; * @return the rank */ public int getRank() { @@ -71,7 +71,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional uint32 rank = 6; + * optional uint32 rank = 14; * @param value the rank to set * @return this */ @@ -82,7 +82,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional .HeroBasicType basic_type = 14; + * optional .HeroBasicType basic_type = 4; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -90,7 +90,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional .HeroBasicType basic_type = 14; + * optional .HeroBasicType basic_type = 4; * @return this */ public HeroBasicTypeInfo clearBasicType() { @@ -100,7 +100,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional .HeroBasicType basic_type = 14; + * optional .HeroBasicType basic_type = 4; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -133,7 +133,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * optional .HeroBasicType basic_type = 14; + * optional .HeroBasicType basic_type = 4; * @param value the basicType to set * @return this */ @@ -144,7 +144,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 6; * @return whether the skillTreeList field is set */ public boolean hasSkillTreeList() { @@ -152,7 +152,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 6; * @return this */ public HeroBasicTypeInfo clearSkillTreeList() { @@ -162,7 +162,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_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. @@ -176,7 +176,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_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 @@ -190,7 +190,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 6; * @param value the skillTreeList to add * @return this */ @@ -202,7 +202,7 @@ public final class HeroBasicTypeInfoOuterClass { } /** - * repeated .AvatarSkillTree skill_tree_list = 12; + * repeated .AvatarSkillTree skill_tree_list = 6; * @param values the skillTreeList to add * @return this */ @@ -285,16 +285,16 @@ public final class HeroBasicTypeInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeEnumNoTag(basicType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < skillTreeList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(skillTreeList.get(i)); } } @@ -322,16 +322,16 @@ public final class HeroBasicTypeInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 112: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 32) { break; } } - case 112: { + case 32: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { @@ -339,11 +339,11 @@ public final class HeroBasicTypeInfoOuterClass { bitField0_ |= 0x00000002; } tag = input.readTag(); - if (tag != 98) { + if (tag != 50) { break; } } - case 98: { + case 50: { // skillTreeList tag = input.readRepeatedMessage(skillTreeList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java index 2b2d7d5..0fbc4a2 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class InteractChargerCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_info = 2; */ private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); @@ -34,7 +34,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_info = 2; * @return whether the chargerInfo field is set */ public boolean hasChargerInfo() { @@ -42,7 +42,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_info = 2; * @return this */ public InteractChargerCsReq clearChargerInfo() { @@ -52,7 +52,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_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. @@ -66,7 +66,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_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 @@ -80,7 +80,7 @@ public final class InteractChargerCsReqOuterClass { } /** - * optional .ChargerInfo charger_info = 7; + * optional .ChargerInfo charger_info = 2; * @param value the chargerInfo to set * @return this */ @@ -150,7 +150,7 @@ public final class InteractChargerCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeMessageNoTag(chargerInfo); } } @@ -171,7 +171,7 @@ public final class InteractChargerCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 18: { // chargerInfo input.readMessage(chargerInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java index aadc02f..e0c88ac 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractChargerScRspOuterClass.java @@ -19,20 +19,20 @@ public final class InteractChargerScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RotatorEnergyInfo energy_info = 5; - */ - private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); - - /** - * optional .ChargerInfo charger_info = 11; + * optional .ChargerInfo charger_info = 6; */ private final ChargerInfoOuterClass.ChargerInfo chargerInfo = ChargerInfoOuterClass.ChargerInfo.newInstance(); + /** + * optional .RotatorEnergyInfo energy_info = 12; + */ + private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); + private InteractChargerScRsp() { } @@ -44,7 +44,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return this */ public InteractChargerScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -81,83 +81,25 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 5; - * @return whether the energyInfo field is set + * optional .ChargerInfo charger_info = 6; + * @return whether the chargerInfo field is set */ - public boolean hasEnergyInfo() { + public boolean hasChargerInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RotatorEnergyInfo energy_info = 5; - * @return this - */ - public InteractChargerScRsp clearEnergyInfo() { - bitField0_ &= ~0x00000002; - energyInfo.clear(); - return this; - } - - /** - * optional .RotatorEnergyInfo energy_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 #getMutableEnergyInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() { - return energyInfo; - } - - /** - * optional .RotatorEnergyInfo energy_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 RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { - bitField0_ |= 0x00000002; - return energyInfo; - } - - /** - * optional .RotatorEnergyInfo energy_info = 5; - * @param value the energyInfo to set - * @return this - */ - public InteractChargerScRsp setEnergyInfo( - final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { - bitField0_ |= 0x00000002; - energyInfo.copyFrom(value); - return this; - } - - /** - * optional .ChargerInfo charger_info = 11; - * @return whether the chargerInfo field is set - */ - public boolean hasChargerInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .ChargerInfo charger_info = 11; + * optional .ChargerInfo charger_info = 6; * @return this */ public InteractChargerScRsp clearChargerInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; chargerInfo.clear(); return this; } /** - * optional .ChargerInfo charger_info = 11; + * optional .ChargerInfo charger_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. @@ -171,7 +113,7 @@ public final class InteractChargerScRspOuterClass { } /** - * optional .ChargerInfo charger_info = 11; + * optional .ChargerInfo charger_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 @@ -180,29 +122,87 @@ public final class InteractChargerScRspOuterClass { * @return internal storage object for modifications */ public ChargerInfoOuterClass.ChargerInfo getMutableChargerInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return chargerInfo; } /** - * optional .ChargerInfo charger_info = 11; + * optional .ChargerInfo charger_info = 6; * @param value the chargerInfo to set * @return this */ public InteractChargerScRsp setChargerInfo(final ChargerInfoOuterClass.ChargerInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; chargerInfo.copyFrom(value); return this; } + /** + * optional .RotatorEnergyInfo energy_info = 12; + * @return whether the energyInfo field is set + */ + public boolean hasEnergyInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RotatorEnergyInfo energy_info = 12; + * @return this + */ + public InteractChargerScRsp clearEnergyInfo() { + bitField0_ &= ~0x00000004; + energyInfo.clear(); + return this; + } + + /** + * optional .RotatorEnergyInfo energy_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 #getMutableEnergyInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() { + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_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 RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { + bitField0_ |= 0x00000004; + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_info = 12; + * @param value the energyInfo to set + * @return this + */ + public InteractChargerScRsp setEnergyInfo( + final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { + bitField0_ |= 0x00000004; + energyInfo.copyFrom(value); + return this; + } + @Override public InteractChargerScRsp copyFrom(final InteractChargerScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - energyInfo.copyFrom(other.energyInfo); chargerInfo.copyFrom(other.chargerInfo); + energyInfo.copyFrom(other.energyInfo); } return this; } @@ -216,12 +216,12 @@ public final class InteractChargerScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEnergyInfo()) { - getMutableEnergyInfo().mergeFrom(other.energyInfo); - } if (other.hasChargerInfo()) { getMutableChargerInfo().mergeFrom(other.chargerInfo); } + if (other.hasEnergyInfo()) { + getMutableEnergyInfo().mergeFrom(other.energyInfo); + } return this; } @@ -233,8 +233,8 @@ public final class InteractChargerScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - energyInfo.clear(); chargerInfo.clear(); + energyInfo.clear(); return this; } @@ -245,8 +245,8 @@ public final class InteractChargerScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - energyInfo.clearQuick(); chargerInfo.clearQuick(); + energyInfo.clearQuick(); return this; } @@ -261,23 +261,23 @@ public final class InteractChargerScRspOuterClass { InteractChargerScRsp other = (InteractChargerScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)) - && (!hasChargerInfo() || chargerInfo.equals(other.chargerInfo)); + && (!hasChargerInfo() || chargerInfo.equals(other.chargerInfo)) + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); - output.writeMessageNoTag(energyInfo); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(chargerInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 90); - output.writeMessageNoTag(chargerInfo); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(energyInfo); } } @@ -288,10 +288,10 @@ public final class InteractChargerScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(chargerInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(chargerInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); } return size; } @@ -303,27 +303,27 @@ public final class InteractChargerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 50) { break; } } - case 42: { - // energyInfo - input.readMessage(energyInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 90) { - break; - } - } - case 90: { + case 50: { // chargerInfo input.readMessage(chargerInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // energyInfo + input.readMessage(energyInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -351,10 +351,10 @@ public final class InteractChargerScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.energyInfo, energyInfo); + output.writeMessage(FieldNames.chargerInfo, chargerInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.chargerInfo, chargerInfo); + output.writeMessage(FieldNames.energyInfo, energyInfo); } output.endObject(); } @@ -377,11 +377,11 @@ public final class InteractChargerScRspOuterClass { } break; } - case 1464698710: - case -1818804219: { - if (input.isAtField(FieldNames.energyInfo)) { + case 1038073356: + case 2135678991: { + if (input.isAtField(FieldNames.chargerInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(energyInfo); + input.readMessage(chargerInfo); bitField0_ |= 0x00000002; } } else { @@ -389,11 +389,11 @@ public final class InteractChargerScRspOuterClass { } break; } - case 1038073356: - case 2135678991: { - if (input.isAtField(FieldNames.chargerInfo)) { + case 1464698710: + case -1818804219: { + if (input.isAtField(FieldNames.energyInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(chargerInfo); + input.readMessage(energyInfo); bitField0_ |= 0x00000004; } } else { @@ -456,9 +456,9 @@ public final class InteractChargerScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); - static final FieldName chargerInfo = FieldName.forField("chargerInfo", "charger_info"); + + static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java index 7bde3e0..bf8a992 100644 --- a/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/InteractPropCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class InteractPropCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 interact_id = 10; - */ - private int interactId; - - /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 9; */ private int propEntityId; + /** + * optional uint32 interact_id = 13; + */ + private int interactId; + private InteractPropCsReq() { } @@ -39,62 +39,25 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 interact_id = 10; - * @return whether the interactId field is set + * optional uint32 prop_entity_id = 9; + * @return whether the propEntityId field is set */ - public boolean hasInteractId() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 interact_id = 10; - * @return this - */ - public InteractPropCsReq clearInteractId() { - bitField0_ &= ~0x00000001; - interactId = 0; - return this; - } - - /** - * optional uint32 interact_id = 10; - * @return the interactId - */ - public int getInteractId() { - return interactId; - } - - /** - * optional uint32 interact_id = 10; - * @param value the interactId to set - * @return this - */ - public InteractPropCsReq setInteractId(final int value) { - bitField0_ |= 0x00000001; - interactId = value; - return this; - } - - /** - * optional uint32 prop_entity_id = 11; - * @return whether the propEntityId field is set - */ - public boolean hasPropEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 9; * @return this */ public InteractPropCsReq clearPropEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 9; * @return the propEntityId */ public int getPropEntityId() { @@ -102,23 +65,60 @@ public final class InteractPropCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 9; * @param value the propEntityId to set * @return this */ public InteractPropCsReq setPropEntityId(final int value) { - bitField0_ |= 0x00000002; + 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; + } + + /** + * optional uint32 interact_id = 13; + * @return this + */ + public InteractPropCsReq clearInteractId() { + bitField0_ &= ~0x00000002; + interactId = 0; + return this; + } + + /** + * optional uint32 interact_id = 13; + * @return the interactId + */ + public int getInteractId() { + return interactId; + } + + /** + * optional uint32 interact_id = 13; + * @param value the interactId to set + * @return this + */ + public InteractPropCsReq setInteractId(final int value) { + bitField0_ |= 0x00000002; + interactId = value; + return this; + } + @Override public InteractPropCsReq copyFrom(final InteractPropCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - interactId = other.interactId; propEntityId = other.propEntityId; + interactId = other.interactId; } return this; } @@ -129,12 +129,12 @@ public final class InteractPropCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasInteractId()) { - setInteractId(other.interactId); - } if (other.hasPropEntityId()) { setPropEntityId(other.propEntityId); } + if (other.hasInteractId()) { + setInteractId(other.interactId); + } return this; } @@ -145,8 +145,8 @@ public final class InteractPropCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - interactId = 0; propEntityId = 0; + interactId = 0; return this; } @@ -170,19 +170,19 @@ public final class InteractPropCsReqOuterClass { } InteractPropCsReq other = (InteractPropCsReq) o; return bitField0_ == other.bitField0_ - && (!hasInteractId() || interactId == other.interactId) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasPropEntityId() || propEntityId == other.propEntityId) + && (!hasInteractId() || interactId == other.interactId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(interactId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(interactId); } } @@ -190,10 +190,10 @@ public final class InteractPropCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(interactId); } return size; } @@ -205,18 +205,18 @@ public final class InteractPropCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // interactId - interactId = input.readUInt32(); + case 72: { + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { - // propEntityId - propEntityId = input.readUInt32(); + case 104: { + // interactId + interactId = 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.interactId, interactId); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.interactId, interactId); } output.endObject(); } @@ -256,11 +256,11 @@ public final class InteractPropCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class InteractPropCsReqOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class InteractPropCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName interactId = FieldName.forField("interactId", "interact_id"); - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + + static final FieldName interactId = FieldName.forField("interactId", "interact_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/InteractPropScRspOuterClass.java index 145a23d..3198879 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 retcode = 5; + * optional uint32 prop_entity_id = 8; + */ + private int propEntityId; + + /** + * optional uint32 retcode = 10; */ private int retcode; /** - * optional uint32 prop_state = 7; + * optional uint32 prop_state = 12; */ private int propState; - /** - * optional uint32 prop_entity_id = 11; - */ - private int propEntityId; - private InteractPropScRsp() { } @@ -44,99 +44,25 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 prop_entity_id = 8; + * @return whether the propEntityId field is set */ - public boolean hasRetcode() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public InteractPropScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - 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 InteractPropScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 prop_state = 7; - * @return whether the propState field is set - */ - public boolean hasPropState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 prop_state = 7; - * @return this - */ - public InteractPropScRsp clearPropState() { - bitField0_ &= ~0x00000002; - propState = 0; - return this; - } - - /** - * optional uint32 prop_state = 7; - * @return the propState - */ - public int getPropState() { - return propState; - } - - /** - * optional uint32 prop_state = 7; - * @param value the propState to set - * @return this - */ - public InteractPropScRsp setPropState(final int value) { - bitField0_ |= 0x00000002; - propState = 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; + * optional uint32 prop_entity_id = 8; * @return this */ public InteractPropScRsp clearPropEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; propEntityId = 0; return this; } /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 8; * @return the propEntityId */ public int getPropEntityId() { @@ -144,24 +70,98 @@ public final class InteractPropScRspOuterClass { } /** - * optional uint32 prop_entity_id = 11; + * optional uint32 prop_entity_id = 8; * @param value the propEntityId to set * @return this */ public InteractPropScRsp setPropEntityId(final int value) { - bitField0_ |= 0x00000004; + 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; + * @return this + */ + public InteractPropScRsp clearPropState() { + bitField0_ &= ~0x00000004; + propState = 0; + return this; + } + + /** + * optional uint32 prop_state = 12; + * @return the propState + */ + public int getPropState() { + return propState; + } + + /** + * optional uint32 prop_state = 12; + * @param value the propState to set + * @return this + */ + public InteractPropScRsp setPropState(final int value) { + bitField0_ |= 0x00000004; + propState = value; + return this; + } + @Override public InteractPropScRsp copyFrom(final InteractPropScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + propEntityId = other.propEntityId; retcode = other.retcode; propState = other.propState; - propEntityId = other.propEntityId; } return this; } @@ -172,15 +172,15 @@ public final class InteractPropScRspOuterClass { return this; } cachedSize = -1; + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasRetcode()) { setRetcode(other.retcode); } if (other.hasPropState()) { setPropState(other.propState); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); - } return this; } @@ -191,9 +191,9 @@ public final class InteractPropScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + propEntityId = 0; retcode = 0; propState = 0; - propEntityId = 0; return this; } @@ -217,24 +217,24 @@ public final class InteractPropScRspOuterClass { } InteractPropScRsp other = (InteractPropScRsp) o; return bitField0_ == other.bitField0_ + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasRetcode() || retcode == other.retcode) - && (!hasPropState() || propState == other.propState) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasPropState() || propState == other.propState); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(propState); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(propState); } } @@ -242,13 +242,13 @@ public final class InteractPropScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propState); } return size; } @@ -260,27 +260,27 @@ public final class InteractPropScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // propState - propState = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 64: { // propEntityId propEntityId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // propState + propState = 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.retcode, retcode); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.propState, propState); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.propState, propState); } output.endObject(); } @@ -323,11 +323,23 @@ public final class InteractPropScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { + if (!input.trySkipNullValue()) { + propEntityId = 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(); @@ -339,18 +351,6 @@ public final class InteractPropScRspOuterClass { if (input.isAtField(FieldNames.propState)) { if (!input.trySkipNullValue()) { propState = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { - if (!input.trySkipNullValue()) { - propEntityId = 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 propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName propState = FieldName.forField("propState", "prop_state"); - - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java b/src/generated/main/emu/lunarcore/proto/ItemCostListOuterClass.java index 7fd5846..7ec5185 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 = 14; + * repeated .ItemCost item_list = 4; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -35,7 +35,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 4; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 4; * @return this */ public ItemCostList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * 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. @@ -67,7 +67,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * 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 @@ -81,7 +81,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 4; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemCostListOuterClass { } /** - * repeated .ItemCost item_list = 14; + * repeated .ItemCost item_list = 4; * @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) 114); + output.writeRawByte((byte) 34); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemCostListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 34: { // 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 98d3bcd..79b2d1e 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 = 4; + * optional uint32 equipment_unique_id = 7; */ private int equipmentUniqueId; /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 11; */ private int relicUniqueId; /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 6; */ private final PileItemOuterClass.PileItem pileItem = PileItemOuterClass.PileItem.newInstance(); @@ -44,7 +44,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -52,7 +52,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return this */ public ItemCost clearEquipmentUniqueId() { @@ -62,7 +62,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -70,7 +70,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 equipment_unique_id = 4; + * optional uint32 equipment_unique_id = 7; * @param value the equipmentUniqueId to set * @return this */ @@ -81,7 +81,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 11; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -89,7 +89,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 11; * @return this */ public ItemCost clearRelicUniqueId() { @@ -99,7 +99,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 11; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -107,7 +107,7 @@ public final class ItemCostOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 11; * @param value the relicUniqueId to set * @return this */ @@ -118,7 +118,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 6; * @return whether the pileItem field is set */ public boolean hasPileItem() { @@ -126,7 +126,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 6; * @return this */ public ItemCost clearPileItem() { @@ -136,7 +136,7 @@ public final class ItemCostOuterClass { } /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 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 ItemCostOuterClass { } /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 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 ItemCostOuterClass { } /** - * optional .PileItem pile_item = 14; + * optional .PileItem pile_item = 6; * @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) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(pileItem); } } @@ -281,25 +281,25 @@ public final class ItemCostOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 56: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 50) { break; } } - case 114: { + case 50: { // 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 eb69713..b51d417 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 = 4; + * repeated .Item item_list = 2; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemOuterClass.Item.getFactory()); @@ -35,7 +35,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item item_list = 2; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -43,7 +43,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item item_list = 2; * @return this */ public ItemList clearItemList() { @@ -53,7 +53,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item 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. @@ -67,7 +67,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item 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 @@ -81,7 +81,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item item_list = 2; * @param value the itemList to add * @return this */ @@ -92,7 +92,7 @@ public final class ItemListOuterClass { } /** - * repeated .Item item_list = 4; + * repeated .Item item_list = 2; * @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) 34); + output.writeRawByte((byte) 18); output.writeMessageNoTag(itemList.get(i)); } } @@ -185,7 +185,7 @@ public final class ItemListOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 18: { // 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 b8bb66e..72b81b4 100644 --- a/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ItemOuterClass.java @@ -19,19 +19,14 @@ public final class ItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unique_id = 2; - */ - private int uniqueId; - - /** - * optional uint32 main_affix_id = 3; + * optional uint32 main_affix_id = 1; */ private int mainAffixId; /** - * optional uint32 promotion = 4; + * optional uint32 level = 3; */ - private int promotion; + private int level; /** * optional uint32 item_id = 6; @@ -39,19 +34,24 @@ public final class ItemOuterClass { private int itemId; /** - * optional uint32 rank = 7; + * optional uint32 num = 7; + */ + private int num; + + /** + * optional uint32 rank = 9; */ private int rank; /** - * optional uint32 level = 10; + * optional uint32 promotion = 12; */ - private int level; + private int promotion; /** - * optional uint32 num = 12; + * optional uint32 unique_id = 14; */ - private int num; + private int uniqueId; private Item() { } @@ -64,62 +64,25 @@ public final class ItemOuterClass { } /** - * optional uint32 unique_id = 2; - * @return whether the uniqueId field is set + * optional uint32 main_affix_id = 1; + * @return whether the mainAffixId field is set */ - public boolean hasUniqueId() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unique_id = 2; - * @return this - */ - public Item clearUniqueId() { - bitField0_ &= ~0x00000001; - uniqueId = 0; - return this; - } - - /** - * optional uint32 unique_id = 2; - * @return the uniqueId - */ - public int getUniqueId() { - return uniqueId; - } - - /** - * optional uint32 unique_id = 2; - * @param value the uniqueId to set - * @return this - */ - public Item setUniqueId(final int value) { - bitField0_ |= 0x00000001; - uniqueId = 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; + * optional uint32 main_affix_id = 1; * @return this */ public Item clearMainAffixId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; mainAffixId = 0; return this; } /** - * optional uint32 main_affix_id = 3; + * optional uint32 main_affix_id = 1; * @return the mainAffixId */ public int getMainAffixId() { @@ -127,50 +90,50 @@ public final class ItemOuterClass { } /** - * optional uint32 main_affix_id = 3; + * optional uint32 main_affix_id = 1; * @param value the mainAffixId to set * @return this */ public Item setMainAffixId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; mainAffixId = value; return this; } /** - * optional uint32 promotion = 4; - * @return whether the promotion field is set + * optional uint32 level = 3; + * @return whether the level field is set */ - public boolean hasPromotion() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasLevel() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 promotion = 4; + * optional uint32 level = 3; * @return this */ - public Item clearPromotion() { - bitField0_ &= ~0x00000004; - promotion = 0; + public Item clearLevel() { + bitField0_ &= ~0x00000002; + level = 0; return this; } /** - * optional uint32 promotion = 4; - * @return the promotion + * optional uint32 level = 3; + * @return the level */ - public int getPromotion() { - return promotion; + public int getLevel() { + return level; } /** - * optional uint32 promotion = 4; - * @param value the promotion to set + * optional uint32 level = 3; + * @param value the level to set * @return this */ - public Item setPromotion(final int value) { - bitField0_ |= 0x00000004; - promotion = value; + public Item setLevel(final int value) { + bitField0_ |= 0x00000002; + level = value; return this; } @@ -179,7 +142,7 @@ public final class ItemOuterClass { * @return whether the itemId field is set */ public boolean hasItemId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -187,7 +150,7 @@ public final class ItemOuterClass { * @return this */ public Item clearItemId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; itemId = 0; return this; } @@ -206,13 +169,50 @@ public final class ItemOuterClass { * @return this */ public Item setItemId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; itemId = value; return this; } /** - * optional uint32 rank = 7; + * optional uint32 num = 7; + * @return whether the num 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() { @@ -220,7 +220,7 @@ public final class ItemOuterClass { } /** - * optional uint32 rank = 7; + * optional uint32 rank = 9; * @return this */ public Item clearRank() { @@ -230,7 +230,7 @@ public final class ItemOuterClass { } /** - * optional uint32 rank = 7; + * optional uint32 rank = 9; * @return the rank */ public int getRank() { @@ -238,7 +238,7 @@ public final class ItemOuterClass { } /** - * optional uint32 rank = 7; + * optional uint32 rank = 9; * @param value the rank to set * @return this */ @@ -249,76 +249,76 @@ public final class ItemOuterClass { } /** - * optional uint32 level = 10; - * @return whether the level field is set + * optional uint32 promotion = 12; + * @return whether the promotion field is set */ - public boolean hasLevel() { + public boolean hasPromotion() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 level = 10; + * optional uint32 promotion = 12; * @return this */ - public Item clearLevel() { + public Item clearPromotion() { bitField0_ &= ~0x00000020; - level = 0; + promotion = 0; return this; } /** - * optional uint32 level = 10; - * @return the level + * optional uint32 promotion = 12; + * @return the promotion */ - public int getLevel() { - return level; + public int getPromotion() { + return promotion; } /** - * optional uint32 level = 10; - * @param value the level to set + * optional uint32 promotion = 12; + * @param value the promotion to set * @return this */ - public Item setLevel(final int value) { + public Item setPromotion(final int value) { bitField0_ |= 0x00000020; - level = value; + promotion = value; return this; } /** - * optional uint32 num = 12; - * @return whether the num field is set + * optional uint32 unique_id = 14; + * @return whether the uniqueId field is set */ - public boolean hasNum() { + public boolean hasUniqueId() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 num = 12; + * optional uint32 unique_id = 14; * @return this */ - public Item clearNum() { + public Item clearUniqueId() { bitField0_ &= ~0x00000040; - num = 0; + uniqueId = 0; return this; } /** - * optional uint32 num = 12; - * @return the num + * optional uint32 unique_id = 14; + * @return the uniqueId */ - public int getNum() { - return num; + public int getUniqueId() { + return uniqueId; } /** - * optional uint32 num = 12; - * @param value the num to set + * optional uint32 unique_id = 14; + * @param value the uniqueId to set * @return this */ - public Item setNum(final int value) { + public Item setUniqueId(final int value) { bitField0_ |= 0x00000040; - num = value; + uniqueId = value; return this; } @@ -327,13 +327,13 @@ public final class ItemOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - uniqueId = other.uniqueId; mainAffixId = other.mainAffixId; - promotion = other.promotion; - itemId = other.itemId; - rank = other.rank; level = other.level; + itemId = other.itemId; num = other.num; + rank = other.rank; + promotion = other.promotion; + uniqueId = other.uniqueId; } return this; } @@ -344,27 +344,27 @@ public final class ItemOuterClass { return this; } cachedSize = -1; - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } if (other.hasMainAffixId()) { setMainAffixId(other.mainAffixId); } - if (other.hasPromotion()) { - setPromotion(other.promotion); - } - if (other.hasItemId()) { - setItemId(other.itemId); - } - if (other.hasRank()) { - setRank(other.rank); - } if (other.hasLevel()) { setLevel(other.level); } + 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.hasUniqueId()) { + setUniqueId(other.uniqueId); + } return this; } @@ -375,13 +375,13 @@ public final class ItemOuterClass { } cachedSize = -1; bitField0_ = 0; - uniqueId = 0; mainAffixId = 0; - promotion = 0; - itemId = 0; - rank = 0; level = 0; + itemId = 0; num = 0; + rank = 0; + promotion = 0; + uniqueId = 0; return this; } @@ -405,44 +405,44 @@ public final class ItemOuterClass { } Item other = (Item) o; return bitField0_ == other.bitField0_ - && (!hasUniqueId() || uniqueId == other.uniqueId) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) - && (!hasPromotion() || promotion == other.promotion) - && (!hasItemId() || itemId == other.itemId) - && (!hasRank() || rank == other.rank) && (!hasLevel() || level == other.level) - && (!hasNum() || num == other.num); + && (!hasItemId() || itemId == other.itemId) + && (!hasNum() || num == other.num) + && (!hasRank() || rank == other.rank) + && (!hasPromotion() || promotion == other.promotion) + && (!hasUniqueId() || uniqueId == other.uniqueId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(mainAffixId); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(promotion); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 48); output.writeUInt32NoTag(itemId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 56); + output.writeUInt32NoTag(num); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 72); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(level); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(num); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(uniqueId); } } @@ -450,25 +450,25 @@ public final class ItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(num); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(num); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); } return size; } @@ -480,9 +480,9 @@ public final class ItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // uniqueId - uniqueId = input.readUInt32(); + case 8: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 24) { @@ -490,19 +490,10 @@ public final class ItemOuterClass { } } case 24: { - // mainAffixId - mainAffixId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // promotion - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 48) { break; } @@ -510,33 +501,42 @@ public final class ItemOuterClass { case 48: { // itemId itemId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 56) { break; } } case 56: { - // rank - rank = input.readUInt32(); - bitField0_ |= 0x00000010; + // num + num = input.readUInt32(); + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000020; + case 72: { + // rank + rank = input.readUInt32(); + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // num - num = input.readUInt32(); + // promotion + promotion = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // uniqueId + uniqueId = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { @@ -561,25 +561,25 @@ public final class ItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.level, level); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.num, num); } if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.rank, rank); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.level, level); + output.writeUInt32(FieldNames.promotion, promotion); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.num, num); + output.writeUInt32(FieldNames.uniqueId, uniqueId); } output.endObject(); } @@ -591,11 +591,11 @@ public final class ItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -603,11 +603,10 @@ public final class ItemOuterClass { } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { + case 102865796: { + if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); + level = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -615,22 +614,22 @@ public final class ItemOuterClass { } break; } - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { - if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -1178662002: case 2116204999: { 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 { @@ -649,10 +648,10 @@ public final class ItemOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -660,10 +659,11 @@ public final class ItemOuterClass { } break; } - case 109446: { - if (input.isAtField(FieldNames.num)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - num = input.readUInt32(); + uniqueId = 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 uniqueId = FieldName.forField("uniqueId", "unique_id"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); - static final FieldName promotion = FieldName.forField("promotion"); - - static final FieldName itemId = FieldName.forField("itemId", "item_id"); - - static final FieldName rank = FieldName.forField("rank"); - 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 uniqueId = FieldName.forField("uniqueId", "unique_id"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/JoinLineupCsReqOuterClass.java index 7f82a07..98b5eb9 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 index = 4; - */ - private int index; - - /** - * optional uint32 base_avatar_id = 6; - */ - private int baseAvatarId; - - /** - * optional uint32 plane_id = 11; - */ - private int planeId; - - /** - * optional uint32 slot = 14; + * optional uint32 slot = 4; */ private int slot; /** - * optional .ExtraLineupType extra_lineup_type = 9; + * optional uint32 index = 5; */ - private int extraLineupType; + private int index; /** - * optional .AvatarType avatar_type = 15; + * optional uint32 plane_id = 7; + */ + private int planeId; + + /** + * optional uint32 base_avatar_id = 15; + */ + private int baseAvatarId; + + /** + * optional .AvatarType avatar_type = 2; */ private int avatarType; /** - * optional bool is_virtual = 3; + * optional .ExtraLineupType extra_lineup_type = 12; + */ + private int extraLineupType; + + /** + * optional bool is_virtual = 1; */ private boolean isVirtual; @@ -64,25 +64,62 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 index = 4; - * @return whether the index field is set + * optional uint32 slot = 4; + * @return whether the slot field is set */ - public boolean hasIndex() { + public boolean hasSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 4; + * 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_ &= ~0x00000001; + bitField0_ &= ~0x00000002; index = 0; return this; } /** - * optional uint32 index = 4; + * optional uint32 index = 5; * @return the index */ public int getIndex() { @@ -90,55 +127,18 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 index = 4; + * optional uint32 index = 5; * @param value the index to set * @return this */ public JoinLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; index = value; return this; } /** - * optional uint32 base_avatar_id = 6; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 6; - * @return this - */ - public JoinLineupCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 6; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 6; - * @param value the baseAvatarId to set - * @return this - */ - public JoinLineupCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 plane_id = 11; + * optional uint32 plane_id = 7; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -146,7 +146,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 11; + * optional uint32 plane_id = 7; * @return this */ public JoinLineupCsReq clearPlaneId() { @@ -156,7 +156,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 11; + * optional uint32 plane_id = 7; * @return the planeId */ public int getPlaneId() { @@ -164,7 +164,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 11; + * optional uint32 plane_id = 7; * @param value the planeId to set * @return this */ @@ -175,125 +175,62 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional uint32 slot = 14; - * @return whether the slot field is set + * optional uint32 base_avatar_id = 15; + * @return whether the baseAvatarId field is set */ - public boolean hasSlot() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 slot = 14; + * optional uint32 base_avatar_id = 15; * @return this */ - public JoinLineupCsReq clearSlot() { + public JoinLineupCsReq clearBaseAvatarId() { bitField0_ &= ~0x00000008; - slot = 0; + baseAvatarId = 0; return this; } /** - * optional uint32 slot = 14; - * @return the slot + * optional uint32 base_avatar_id = 15; + * @return the baseAvatarId */ - public int getSlot() { - return slot; + public int getBaseAvatarId() { + return baseAvatarId; } /** - * optional uint32 slot = 14; - * @param value the slot to set + * optional uint32 base_avatar_id = 15; + * @param value the baseAvatarId to set * @return this */ - public JoinLineupCsReq setSlot(final int value) { + public JoinLineupCsReq setBaseAvatarId(final int value) { bitField0_ |= 0x00000008; - slot = value; + baseAvatarId = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 9; - * @return whether the extraLineupType field is set + * optional .AvatarType avatar_type = 2; + * @return whether the avatarType field is set */ - public boolean hasExtraLineupType() { + public boolean hasAvatarType() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .ExtraLineupType extra_lineup_type = 9; - * @return this - */ - public JoinLineupCsReq clearExtraLineupType() { - bitField0_ &= ~0x00000010; - extraLineupType = 0; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 9; - * @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 JoinLineupCsReq#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 JoinLineupCsReq#getExtraLineupType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public JoinLineupCsReq setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000010; - extraLineupType = value; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 9; - * @param value the extraLineupType to set - * @return this - */ - public JoinLineupCsReq setExtraLineupType( - final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000010; - extraLineupType = value.getNumber(); - return this; - } - - /** - * optional .AvatarType avatar_type = 15; - * @return whether the avatarType field is set - */ - public boolean hasAvatarType() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 2; * @return this */ public JoinLineupCsReq clearAvatarType() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; avatarType = 0; return this; } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 2; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -320,24 +257,87 @@ public final class JoinLineupCsReqOuterClass { * @return this */ public JoinLineupCsReq setAvatarTypeValue(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; avatarType = value; return this; } /** - * optional .AvatarType avatar_type = 15; + * optional .AvatarType avatar_type = 2; * @param value the avatarType to set * @return this */ public JoinLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; avatarType = value.getNumber(); return this; } /** - * optional bool is_virtual = 3; + * optional .ExtraLineupType extra_lineup_type = 12; + * @return whether the extraLineupType field is set + */ + public boolean hasExtraLineupType() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 12; + * @return this + */ + public JoinLineupCsReq clearExtraLineupType() { + bitField0_ &= ~0x00000020; + extraLineupType = 0; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 12; + * @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 JoinLineupCsReq#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 JoinLineupCsReq#getExtraLineupType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public JoinLineupCsReq setExtraLineupTypeValue(final int value) { + bitField0_ |= 0x00000020; + extraLineupType = value; + return this; + } + + /** + * optional .ExtraLineupType extra_lineup_type = 12; + * @param value the extraLineupType to set + * @return this + */ + public JoinLineupCsReq setExtraLineupType( + final ExtraLineupTypeOuterClass.ExtraLineupType value) { + bitField0_ |= 0x00000020; + extraLineupType = value.getNumber(); + return this; + } + + /** + * optional bool is_virtual = 1; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -345,7 +345,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 3; + * optional bool is_virtual = 1; * @return this */ public JoinLineupCsReq clearIsVirtual() { @@ -355,7 +355,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 3; + * optional bool is_virtual = 1; * @return the isVirtual */ public boolean getIsVirtual() { @@ -363,7 +363,7 @@ public final class JoinLineupCsReqOuterClass { } /** - * optional bool is_virtual = 3; + * optional bool is_virtual = 1; * @param value the isVirtual to set * @return this */ @@ -378,12 +378,12 @@ public final class JoinLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; - baseAvatarId = other.baseAvatarId; - planeId = other.planeId; slot = other.slot; - extraLineupType = other.extraLineupType; + index = other.index; + planeId = other.planeId; + baseAvatarId = other.baseAvatarId; avatarType = other.avatarType; + extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } return this; @@ -395,24 +395,24 @@ public final class JoinLineupCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasSlot()) { + setSlot(other.slot); + } if (other.hasIndex()) { setIndex(other.index); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasSlot()) { - setSlot(other.slot); - } - if (other.hasExtraLineupType()) { - setExtraLineupTypeValue(other.extraLineupType); + if (other.hasBaseAvatarId()) { + setBaseAvatarId(other.baseAvatarId); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } + if (other.hasExtraLineupType()) { + setExtraLineupTypeValue(other.extraLineupType); + } if (other.hasIsVirtual()) { setIsVirtual(other.isVirtual); } @@ -426,12 +426,12 @@ public final class JoinLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; - baseAvatarId = 0; - planeId = 0; slot = 0; - extraLineupType = 0; + index = 0; + planeId = 0; + baseAvatarId = 0; avatarType = 0; + extraLineupType = 0; isVirtual = false; return this; } @@ -456,12 +456,12 @@ public final class JoinLineupCsReqOuterClass { } JoinLineupCsReq other = (JoinLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasPlaneId() || planeId == other.planeId) && (!hasSlot() || slot == other.slot) - && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasIndex() || index == other.index) + && (!hasPlaneId() || planeId == other.planeId) + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasAvatarType() || avatarType == other.avatarType) + && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @@ -469,30 +469,30 @@ public final class JoinLineupCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(index); + output.writeUInt32NoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(slot); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); - output.writeEnumNoTag(extraLineupType); - } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeEnumNoTag(avatarType); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 96); + output.writeEnumNoTag(extraLineupType); + } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isVirtual); } } @@ -501,22 +501,22 @@ public final class JoinLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { size += 2; @@ -532,66 +532,66 @@ public final class JoinLineupCsReqOuterClass { while (true) { switch (tag) { case 32: { - // index - index = input.readUInt32(); + // slot + slot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 40: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 56) { break; } } - case 88: { + case 56: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // slot - slot = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // extraLineupType - final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; - bitField0_ |= 0x00000010; - } - 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) { avatarType = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { + // extraLineupType + final int value = input.readInt32(); + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; + bitField0_ |= 0x00000020; + } + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; @@ -618,22 +618,22 @@ public final class JoinLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } 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.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000040) != 0) { output.writeBool(FieldNames.isVirtual, isVirtual); @@ -648,10 +648,10 @@ public final class JoinLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 3533310: { + if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + slot = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -659,11 +659,10 @@ public final class JoinLineupCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -683,10 +682,11 @@ public final class JoinLineupCsReqOuterClass { } break; } - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -694,23 +694,6 @@ public final class JoinLineupCsReqOuterClass { } break; } - case -468135527: - case -1144475077: { - if (input.isAtField(FieldNames.extraLineupType)) { - if (!input.trySkipNullValue()) { - 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 -403148749: case 397309536: { if (input.isAtField(FieldNames.avatarType)) { @@ -718,6 +701,23 @@ public final class JoinLineupCsReqOuterClass { final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); if (value != null) { avatarType = value.getNumber(); + bitField0_ |= 0x00000010; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -468135527: + case -1144475077: { + if (input.isAtField(FieldNames.extraLineupType)) { + if (!input.trySkipNullValue()) { + final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + if (value != null) { + extraLineupType = value.getNumber(); bitField0_ |= 0x00000020; } else { input.skipUnknownEnumValue(); @@ -793,18 +793,18 @@ public final class JoinLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName index = FieldName.forField("index"); + static final FieldName slot = FieldName.forField("slot"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName index = FieldName.forField("index"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName slot = FieldName.forField("slot"); - - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); + 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/LeaveRogueScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java index 37d6cb8..ff8b71c 100644 --- a/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LeaveRogueScRspOuterClass.java @@ -19,24 +19,24 @@ public final class LeaveRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .RogueInfo rogue_info = 1; + * optional .SceneInfo scene = 6; */ - private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 10; + * optional .LineupInfo lineup = 7; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * optional .SceneInfo scene = 15; + * optional .RogueInfo rogue_info = 13; */ - private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); private LeaveRogueScRsp() { } @@ -49,7 +49,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +57,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return this */ public LeaveRogueScRsp clearRetcode() { @@ -67,7 +67,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -75,7 +75,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -86,139 +86,25 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .RogueInfo rogue_info = 1; - * @return whether the rogueInfo field is set + * optional .SceneInfo scene = 6; + * @return whether the scene field is set */ - public boolean hasRogueInfo() { + public boolean hasScene() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueInfo rogue_info = 1; - * @return this - */ - public LeaveRogueScRsp clearRogueInfo() { - bitField0_ &= ~0x00000002; - rogueInfo.clear(); - return this; - } - - /** - * optional .RogueInfo rogue_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. - * - * 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 = 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 RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000002; - return rogueInfo; - } - - /** - * optional .RogueInfo rogue_info = 1; - * @param value the rogueInfo to set - * @return this - */ - public LeaveRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000002; - rogueInfo.copyFrom(value); - return this; - } - - /** - * optional .LineupInfo lineup = 10; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 10; - * @return this - */ - public LeaveRogueScRsp clearLineup() { - bitField0_ &= ~0x00000004; - lineup.clear(); - return this; - } - - /** - * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. - * - * @return internal storage object for reading - */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; - } - - /** - * optional .LineupInfo lineup = 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 LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; - return lineup; - } - - /** - * optional .LineupInfo lineup = 10; - * @param value the lineup to set - * @return this - */ - public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; - lineup.copyFrom(value); - return this; - } - - /** - * optional .SceneInfo scene = 15; - * @return whether the scene field is set - */ - public boolean hasScene() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * @return this */ public LeaveRogueScRsp clearScene() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; scene.clear(); return this; } /** - * optional .SceneInfo scene = 15; + * 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. @@ -232,7 +118,7 @@ public final class LeaveRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 15; + * 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 @@ -241,30 +127,144 @@ public final class LeaveRogueScRspOuterClass { * @return internal storage object for modifications */ public SceneInfoOuterClass.SceneInfo getMutableScene() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return scene; } /** - * optional .SceneInfo scene = 15; + * optional .SceneInfo scene = 6; * @param value the scene to set * @return this */ public LeaveRogueScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public LeaveRogueScRsp clearLineup() { + bitField0_ &= ~0x00000004; + lineup.clear(); + return this; + } + + /** + * 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. + * + * Use {@link #getMutableLineup()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; + } + + /** + * 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 + * 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 = 7; + * @param value the lineup to set + * @return this + */ + public LeaveRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000004; + lineup.copyFrom(value); + return this; + } + + /** + * optional .RogueInfo rogue_info = 13; + * @return whether the rogueInfo field is set + */ + public boolean hasRogueInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .RogueInfo rogue_info = 13; + * @return this + */ + public LeaveRogueScRsp clearRogueInfo() { + bitField0_ &= ~0x00000008; + rogueInfo.clear(); + return this; + } + + /** + * optional .RogueInfo rogue_info = 13; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRogueInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueInfoOuterClass.RogueInfo getRogueInfo() { + return rogueInfo; + } + + /** + * optional .RogueInfo rogue_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 + * 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 = 13; + * @param value the rogueInfo to set + * @return this + */ + public LeaveRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { + bitField0_ |= 0x00000008; + rogueInfo.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; - rogueInfo.copyFrom(other.rogueInfo); - lineup.copyFrom(other.lineup); scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); + rogueInfo.copyFrom(other.rogueInfo); } return this; } @@ -278,14 +278,14 @@ public final class LeaveRogueScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasRogueInfo()) { - getMutableRogueInfo().mergeFrom(other.rogueInfo); + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); } if (other.hasLineup()) { getMutableLineup().mergeFrom(other.lineup); } - if (other.hasScene()) { - getMutableScene().mergeFrom(other.scene); + if (other.hasRogueInfo()) { + getMutableRogueInfo().mergeFrom(other.rogueInfo); } return this; } @@ -298,9 +298,9 @@ public final class LeaveRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - rogueInfo.clear(); - lineup.clear(); scene.clear(); + lineup.clear(); + rogueInfo.clear(); return this; } @@ -311,9 +311,9 @@ public final class LeaveRogueScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueInfo.clearQuick(); - lineup.clearQuick(); scene.clearQuick(); + lineup.clearQuick(); + rogueInfo.clearQuick(); return this; } @@ -328,28 +328,28 @@ public final class LeaveRogueScRspOuterClass { LeaveRogueScRsp other = (LeaveRogueScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)) + && (!hasScene() || scene.equals(other.scene)) && (!hasLineup() || lineup.equals(other.lineup)) - && (!hasScene() || scene.equals(other.scene)); + && (!hasRogueInfo() || rogueInfo.equals(other.rogueInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(rogueInfo); + output.writeRawByte((byte) 50); + output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 58); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(scene); + output.writeRawByte((byte) 106); + output.writeMessageNoTag(rogueInfo); } } @@ -360,13 +360,13 @@ public final class LeaveRogueScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(scene); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } return size; } @@ -378,36 +378,36 @@ public final class LeaveRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 50) { break; } } - case 10: { - // rogueInfo - input.readMessage(rogueInfo); + case 50: { + // scene + input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 58) { break; } } - case 82: { + case 58: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 122) { + if (tag != 106) { break; } } - case 122: { - // scene - input.readMessage(scene); + case 106: { + // rogueInfo + input.readMessage(rogueInfo); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -435,13 +435,13 @@ public final class LeaveRogueScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueInfo, rogueInfo); + output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.lineup, lineup); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.scene, scene); + output.writeMessage(FieldNames.rogueInfo, rogueInfo); } output.endObject(); } @@ -464,11 +464,10 @@ public final class LeaveRogueScRspOuterClass { } break; } - case 655808936: - case -1124583437: { - if (input.isAtField(FieldNames.rogueInfo)) { + case 109254796: { + if (input.isAtField(FieldNames.scene)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueInfo); + input.readMessage(scene); bitField0_ |= 0x00000002; } } else { @@ -487,10 +486,11 @@ public final class LeaveRogueScRspOuterClass { } break; } - case 109254796: { - if (input.isAtField(FieldNames.scene)) { + case 655808936: + case -1124583437: { + if (input.isAtField(FieldNames.rogueInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(scene); + input.readMessage(rogueInfo); bitField0_ |= 0x00000008; } } else { @@ -553,11 +553,11 @@ public final class LeaveRogueScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); + static final FieldName scene = FieldName.forField("scene"); static final FieldName lineup = FieldName.forField("lineup"); - static final FieldName scene = FieldName.forField("scene"); + static final FieldName rogueInfo = FieldName.forField("rogueInfo", "rogue_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java index e314ce6..6047cea 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupAvatarOuterClass.java @@ -19,17 +19,12 @@ public final class LineupAvatarOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 id = 2; - */ - private int id; - - /** - * optional uint32 hp = 6; + * optional uint32 hp = 5; */ private int hp; /** - * optional uint32 satiety = 12; + * optional uint32 satiety = 8; */ private int satiety; @@ -39,12 +34,17 @@ public final class LineupAvatarOuterClass { private int slot; /** - * optional .AvatarType avatar_type = 8; + * optional uint32 id = 15; + */ + private int id; + + /** + * optional .AvatarType avatar_type = 12; */ private int avatarType; /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 11; */ private final SpBarInfoOuterClass.SpBarInfo spBar = SpBarInfoOuterClass.SpBarInfo.newInstance(); @@ -59,62 +59,25 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 id = 2; - * @return whether the id field is set + * optional uint32 hp = 5; + * @return whether the hp field is set */ - public boolean hasId() { + public boolean hasHp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 id = 2; - * @return this - */ - public LineupAvatar clearId() { - bitField0_ &= ~0x00000001; - id = 0; - return this; - } - - /** - * optional uint32 id = 2; - * @return the id - */ - public int getId() { - return id; - } - - /** - * optional uint32 id = 2; - * @param value the id to set - * @return this - */ - public LineupAvatar setId(final int value) { - bitField0_ |= 0x00000001; - id = value; - return this; - } - - /** - * optional uint32 hp = 6; - * @return whether the hp field is set - */ - public boolean hasHp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 hp = 6; + * optional uint32 hp = 5; * @return this */ public LineupAvatar clearHp() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; hp = 0; return this; } /** - * optional uint32 hp = 6; + * optional uint32 hp = 5; * @return the hp */ public int getHp() { @@ -122,36 +85,36 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 hp = 6; + * optional uint32 hp = 5; * @param value the hp to set * @return this */ public LineupAvatar setHp(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; hp = value; return this; } /** - * optional uint32 satiety = 12; + * optional uint32 satiety = 8; * @return whether the satiety field is set */ public boolean hasSatiety() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 satiety = 12; + * optional uint32 satiety = 8; * @return this */ public LineupAvatar clearSatiety() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; satiety = 0; return this; } /** - * optional uint32 satiety = 12; + * optional uint32 satiety = 8; * @return the satiety */ public int getSatiety() { @@ -159,12 +122,12 @@ public final class LineupAvatarOuterClass { } /** - * optional uint32 satiety = 12; + * optional uint32 satiety = 8; * @param value the satiety to set * @return this */ public LineupAvatar setSatiety(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; satiety = value; return this; } @@ -174,7 +137,7 @@ public final class LineupAvatarOuterClass { * @return whether the slot field is set */ public boolean hasSlot() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -182,7 +145,7 @@ public final class LineupAvatarOuterClass { * @return this */ public LineupAvatar clearSlot() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; slot = 0; return this; } @@ -201,13 +164,50 @@ public final class LineupAvatarOuterClass { * @return this */ public LineupAvatar setSlot(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; slot = value; return this; } /** - * optional .AvatarType avatar_type = 8; + * 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; + return this; + } + + /** + * optional .AvatarType avatar_type = 12; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -215,7 +215,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 12; * @return this */ public LineupAvatar clearAvatarType() { @@ -225,7 +225,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 12; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -258,7 +258,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 12; * @param value the avatarType to set * @return this */ @@ -269,7 +269,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 11; * @return whether the spBar field is set */ public boolean hasSpBar() { @@ -277,7 +277,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 11; * @return this */ public LineupAvatar clearSpBar() { @@ -287,7 +287,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 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. @@ -301,7 +301,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 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 @@ -315,7 +315,7 @@ public final class LineupAvatarOuterClass { } /** - * optional .SpBarInfo sp_bar = 14; + * optional .SpBarInfo sp_bar = 11; * @param value the spBar to set * @return this */ @@ -330,10 +330,10 @@ public final class LineupAvatarOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - id = other.id; hp = other.hp; satiety = other.satiety; slot = other.slot; + id = other.id; avatarType = other.avatarType; spBar.copyFrom(other.spBar); } @@ -346,9 +346,6 @@ public final class LineupAvatarOuterClass { return this; } cachedSize = -1; - if (other.hasId()) { - setId(other.id); - } if (other.hasHp()) { setHp(other.hp); } @@ -358,6 +355,9 @@ public final class LineupAvatarOuterClass { if (other.hasSlot()) { setSlot(other.slot); } + if (other.hasId()) { + setId(other.id); + } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -374,10 +374,10 @@ public final class LineupAvatarOuterClass { } cachedSize = -1; bitField0_ = 0; - id = 0; hp = 0; satiety = 0; slot = 0; + id = 0; avatarType = 0; spBar.clear(); return this; @@ -404,10 +404,10 @@ public final class LineupAvatarOuterClass { } LineupAvatar other = (LineupAvatar) o; return bitField0_ == other.bitField0_ - && (!hasId() || id == other.id) && (!hasHp() || hp == other.hp) && (!hasSatiety() || satiety == other.satiety) && (!hasSlot() || slot == other.slot) + && (!hasId() || id == other.id) && (!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) 16); - output.writeUInt32NoTag(id); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(hp); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(satiety); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(slot); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(id); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeEnumNoTag(avatarType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 90); output.writeMessageNoTag(spBar); } } @@ -444,17 +444,17 @@ public final class LineupAvatarOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(hp); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(satiety); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } @@ -471,28 +471,19 @@ public final class LineupAvatarOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // id - id = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { + case 40: { // hp hp = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 64) { break; } } - case 96: { + case 64: { // satiety satiety = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 104) { break; @@ -501,13 +492,22 @@ public final class LineupAvatarOuterClass { case 104: { // slot slot = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 120) { break; } } - case 64: { + case 120: { + // id + id = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -515,11 +515,11 @@ public final class LineupAvatarOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { + case 90: { // spBar input.readMessage(spBar); bitField0_ |= 0x00000020; @@ -546,17 +546,17 @@ public final class LineupAvatarOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.id, id); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.hp, hp); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.satiety, satiety); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.slot, slot); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.id, id); + } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); } @@ -573,22 +573,11 @@ public final class LineupAvatarOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3355: { - if (input.isAtField(FieldNames.id)) { - if (!input.trySkipNullValue()) { - id = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 3336: { if (input.isAtField(FieldNames.hp)) { if (!input.trySkipNullValue()) { hp = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -599,7 +588,7 @@ public final class LineupAvatarOuterClass { if (input.isAtField(FieldNames.satiety)) { if (!input.trySkipNullValue()) { satiety = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -610,6 +599,17 @@ public final class LineupAvatarOuterClass { if (input.isAtField(FieldNames.slot)) { if (!input.trySkipNullValue()) { slot = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 3355: { + if (input.isAtField(FieldNames.id)) { + if (!input.trySkipNullValue()) { + id = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -698,14 +698,14 @@ public final class LineupAvatarOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName id = FieldName.forField("id"); - static final FieldName hp = FieldName.forField("hp"); static final FieldName satiety = FieldName.forField("satiety"); static final FieldName slot = FieldName.forField("slot"); + static final FieldName id = FieldName.forField("id"); + 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 de41a0f..006a024 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupInfoOuterClass.java @@ -21,47 +21,47 @@ public final class LineupInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 4; - */ - private int index; - - /** - * optional uint32 max_mp = 6; - */ - private int maxMp; - - /** - * optional uint32 leader_slot = 7; - */ - private int leaderSlot; - - /** - * optional uint32 mp = 9; - */ - private int mp; - - /** - * optional uint32 plane_id = 11; + * optional uint32 plane_id = 3; */ private int planeId; /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional uint32 max_mp = 9; + */ + private int maxMp; + + /** + * optional uint32 mp = 11; + */ + private int mp; + + /** + * optional uint32 leader_slot = 12; + */ + private int leaderSlot; + + /** + * optional uint32 index = 13; + */ + private int index; + + /** + * optional .ExtraLineupType extra_lineup_type = 10; */ private int extraLineupType; /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; */ private boolean isVirtual; /** - * optional string name = 1; + * optional string name = 5; */ private final Utf8String name = Utf8String.newEmptyInstance(); /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 7; */ private final RepeatedMessage avatarList = RepeatedMessage.newEmptyInstance(LineupAvatarOuterClass.LineupAvatar.getFactory()); @@ -76,44 +76,44 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 index = 4; - * @return whether the index field is set + * optional uint32 plane_id = 3; + * @return whether the planeId field is set */ - public boolean hasIndex() { + public boolean hasPlaneId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 4; + * optional uint32 plane_id = 3; * @return this */ - public LineupInfo clearIndex() { + public LineupInfo clearPlaneId() { bitField0_ &= ~0x00000001; - index = 0; + planeId = 0; return this; } /** - * optional uint32 index = 4; - * @return the index + * optional uint32 plane_id = 3; + * @return the planeId */ - public int getIndex() { - return index; + public int getPlaneId() { + return planeId; } /** - * optional uint32 index = 4; - * @param value the index to set + * optional uint32 plane_id = 3; + * @param value the planeId to set * @return this */ - public LineupInfo setIndex(final int value) { + public LineupInfo setPlaneId(final int value) { bitField0_ |= 0x00000001; - index = value; + planeId = value; return this; } /** - * optional uint32 max_mp = 6; + * optional uint32 max_mp = 9; * @return whether the maxMp field is set */ public boolean hasMaxMp() { @@ -121,7 +121,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 max_mp = 6; + * optional uint32 max_mp = 9; * @return this */ public LineupInfo clearMaxMp() { @@ -131,7 +131,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 max_mp = 6; + * optional uint32 max_mp = 9; * @return the maxMp */ public int getMaxMp() { @@ -139,7 +139,7 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 max_mp = 6; + * optional uint32 max_mp = 9; * @param value the maxMp to set * @return this */ @@ -150,62 +150,25 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 leader_slot = 7; - * @return whether the leaderSlot field is set + * optional uint32 mp = 11; + * @return whether the mp field is set */ - public boolean hasLeaderSlot() { + public boolean hasMp() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 leader_slot = 7; - * @return this - */ - public LineupInfo 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 LineupInfo setLeaderSlot(final int value) { - bitField0_ |= 0x00000004; - leaderSlot = value; - return this; - } - - /** - * optional uint32 mp = 9; - * @return whether the mp field is set - */ - public boolean hasMp() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 mp = 9; + * optional uint32 mp = 11; * @return this */ public LineupInfo clearMp() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; mp = 0; return this; } /** - * optional uint32 mp = 9; + * optional uint32 mp = 11; * @return the mp */ public int getMp() { @@ -213,55 +176,92 @@ public final class LineupInfoOuterClass { } /** - * optional uint32 mp = 9; + * optional uint32 mp = 11; * @param value the mp to set * @return this */ public LineupInfo setMp(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; mp = value; return this; } /** - * optional uint32 plane_id = 11; - * @return whether the planeId field is set + * optional uint32 leader_slot = 12; + * @return whether the leaderSlot field is set */ - public boolean hasPlaneId() { + public boolean hasLeaderSlot() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 leader_slot = 12; + * @return this + */ + public LineupInfo clearLeaderSlot() { + bitField0_ &= ~0x00000008; + 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 LineupInfo setLeaderSlot(final int value) { + bitField0_ |= 0x00000008; + leaderSlot = value; + return this; + } + + /** + * optional uint32 index = 13; + * @return whether the index field is set + */ + public boolean hasIndex() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 plane_id = 11; + * optional uint32 index = 13; * @return this */ - public LineupInfo clearPlaneId() { + public LineupInfo clearIndex() { bitField0_ &= ~0x00000010; - planeId = 0; + index = 0; return this; } /** - * optional uint32 plane_id = 11; - * @return the planeId + * optional uint32 index = 13; + * @return the index */ - public int getPlaneId() { - return planeId; + public int getIndex() { + return index; } /** - * optional uint32 plane_id = 11; - * @param value the planeId to set + * optional uint32 index = 13; + * @param value the index to set * @return this */ - public LineupInfo setPlaneId(final int value) { + public LineupInfo setIndex(final int value) { bitField0_ |= 0x00000010; - planeId = value; + index = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 10; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -269,7 +269,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 10; * @return this */ public LineupInfo clearExtraLineupType() { @@ -279,7 +279,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 10; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -312,7 +312,7 @@ public final class LineupInfoOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 13; + * optional .ExtraLineupType extra_lineup_type = 10; * @param value the extraLineupType to set * @return this */ @@ -323,7 +323,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -331,7 +331,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return this */ public LineupInfo clearIsVirtual() { @@ -341,7 +341,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @return the isVirtual */ public boolean getIsVirtual() { @@ -349,7 +349,7 @@ public final class LineupInfoOuterClass { } /** - * optional bool is_virtual = 8; + * optional bool is_virtual = 2; * @param value the isVirtual to set * @return this */ @@ -360,7 +360,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @return whether the name field is set */ public boolean hasName() { @@ -368,7 +368,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @return this */ public LineupInfo clearName() { @@ -378,7 +378,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @return the name */ public String getName() { @@ -386,7 +386,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -394,7 +394,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -403,7 +403,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @param value the name to set * @return this */ @@ -414,7 +414,7 @@ public final class LineupInfoOuterClass { } /** - * optional string name = 1; + * optional string name = 5; * @param value the name to set * @return this */ @@ -425,7 +425,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 7; * @return whether the avatarList field is set */ public boolean hasAvatarList() { @@ -433,7 +433,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 7; * @return this */ public LineupInfo clearAvatarList() { @@ -443,7 +443,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar 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. @@ -457,7 +457,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar 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 @@ -471,7 +471,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 7; * @param value the avatarList to add * @return this */ @@ -482,7 +482,7 @@ public final class LineupInfoOuterClass { } /** - * repeated .LineupAvatar avatar_list = 15; + * repeated .LineupAvatar avatar_list = 7; * @param values the avatarList to add * @return this */ @@ -497,11 +497,11 @@ public final class LineupInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; - maxMp = other.maxMp; - leaderSlot = other.leaderSlot; - mp = other.mp; planeId = other.planeId; + maxMp = other.maxMp; + mp = other.mp; + leaderSlot = other.leaderSlot; + index = other.index; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; name.copyFrom(other.name); @@ -516,20 +516,20 @@ public final class LineupInfoOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasMaxMp()) { setMaxMp(other.maxMp); } - if (other.hasLeaderSlot()) { - setLeaderSlot(other.leaderSlot); - } if (other.hasMp()) { setMp(other.mp); } - if (other.hasPlaneId()) { - setPlaneId(other.planeId); + if (other.hasLeaderSlot()) { + setLeaderSlot(other.leaderSlot); + } + if (other.hasIndex()) { + setIndex(other.index); } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); @@ -553,11 +553,11 @@ public final class LineupInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; - maxMp = 0; - leaderSlot = 0; - mp = 0; planeId = 0; + maxMp = 0; + mp = 0; + leaderSlot = 0; + index = 0; extraLineupType = 0; isVirtual = false; name.clear(); @@ -587,11 +587,11 @@ public final class LineupInfoOuterClass { } LineupInfo other = (LineupInfo) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasMaxMp() || maxMp == other.maxMp) - && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) - && (!hasMp() || mp == other.mp) && (!hasPlaneId() || planeId == other.planeId) + && (!hasMaxMp() || maxMp == other.maxMp) + && (!hasMp() || mp == other.mp) + && (!hasLeaderSlot() || leaderSlot == other.leaderSlot) + && (!hasIndex() || index == other.index) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual) && (!hasName() || name.equals(other.name)) @@ -601,40 +601,40 @@ public final class LineupInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(maxMp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(leaderSlot); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(mp); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(leaderSlot); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(planeId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 10); + output.writeRawByte((byte) 42); output.writeStringNoTag(name); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < avatarList.length(); i++) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 58); output.writeMessageNoTag(avatarList.get(i)); } } @@ -644,19 +644,19 @@ public final class LineupInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(maxMp); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mp); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -680,52 +680,52 @@ public final class LineupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // index - index = input.readUInt32(); + case 24: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // maxMp - maxMp = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 56) { - break; - } - } - case 56: { - // leaderSlot - leaderSlot = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // mp - mp = input.readUInt32(); - bitField0_ |= 0x00000008; + // maxMp + maxMp = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000010; + // 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) { break; } } case 104: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // 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 != 64) { + if (tag != 16) { break; } } - case 64: { + case 16: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 10) { + if (tag != 42) { break; } } - case 10: { + case 42: { // name input.readString(name); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 122) { + if (tag != 58) { break; } } - case 122: { + case 58: { // avatarList tag = input.readRepeatedMessage(avatarList, tag); bitField0_ |= 0x00000100; @@ -781,19 +781,19 @@ public final class LineupInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.maxMp, maxMp); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.mp, mp); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -817,10 +817,11 @@ public final class LineupInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + planeId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -840,11 +841,10 @@ public final class LineupInfoOuterClass { } break; } - case 1191442087: - case -1708713100: { - if (input.isAtField(FieldNames.leaderSlot)) { + case 3491: { + if (input.isAtField(FieldNames.mp)) { if (!input.trySkipNullValue()) { - leaderSlot = input.readUInt32(); + mp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -852,10 +852,11 @@ public final class LineupInfoOuterClass { } break; } - case 3491: { - if (input.isAtField(FieldNames.mp)) { + case 1191442087: + case -1708713100: { + if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { - mp = input.readUInt32(); + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -863,11 +864,10 @@ public final class LineupInfoOuterClass { } break; } - case -493896553: - case 1869097438: { - if (input.isAtField(FieldNames.planeId)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - planeId = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -979,15 +979,15 @@ public final class LineupInfoOuterClass { * 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 maxMp = FieldName.forField("maxMp", "max_mp"); - static final FieldName leaderSlot = FieldName.forField("leaderSlot", "leader_slot"); - static final FieldName mp = FieldName.forField("mp"); - 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"); diff --git a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java index 6110aa5..d2d3b81 100644 --- a/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LineupSlotDataOuterClass.java @@ -19,17 +19,17 @@ public final class LineupSlotDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 slot = 11; - */ - private int slot; - - /** - * optional uint32 id = 15; + * optional uint32 id = 3; */ private int id; /** - * optional .AvatarType avatar_type = 14; + * optional uint32 slot = 14; + */ + private int slot; + + /** + * optional .AvatarType avatar_type = 12; */ private int avatarType; @@ -44,62 +44,25 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 slot = 11; - * @return whether the slot field is set + * optional uint32 id = 3; + * @return whether the id field is set */ - public boolean hasSlot() { + public boolean hasId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 slot = 11; - * @return this - */ - public LineupSlotData clearSlot() { - bitField0_ &= ~0x00000001; - slot = 0; - return this; - } - - /** - * optional uint32 slot = 11; - * @return the slot - */ - public int getSlot() { - return slot; - } - - /** - * optional uint32 slot = 11; - * @param value the slot to set - * @return this - */ - public LineupSlotData setSlot(final int value) { - bitField0_ |= 0x00000001; - slot = value; - return this; - } - - /** - * optional uint32 id = 15; - * @return whether the id field is set - */ - public boolean hasId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 id = 15; + * optional uint32 id = 3; * @return this */ public LineupSlotData clearId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; id = 0; return this; } /** - * optional uint32 id = 15; + * optional uint32 id = 3; * @return the id */ public int getId() { @@ -107,18 +70,55 @@ public final class LineupSlotDataOuterClass { } /** - * optional uint32 id = 15; + * optional uint32 id = 3; * @param value the id to set * @return this */ public LineupSlotData setId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; id = value; return this; } /** - * optional .AvatarType avatar_type = 14; + * optional uint32 slot = 14; + * @return whether the slot field is set + */ + public boolean hasSlot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 slot = 14; + * @return this + */ + public LineupSlotData clearSlot() { + bitField0_ &= ~0x00000002; + slot = 0; + return this; + } + + /** + * optional uint32 slot = 14; + * @return the slot + */ + public int getSlot() { + return slot; + } + + /** + * optional uint32 slot = 14; + * @param value the slot to set + * @return this + */ + public LineupSlotData setSlot(final int value) { + bitField0_ |= 0x00000002; + slot = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 12; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -126,7 +126,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 12; * @return this */ public LineupSlotData clearAvatarType() { @@ -136,7 +136,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 12; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -169,7 +169,7 @@ public final class LineupSlotDataOuterClass { } /** - * optional .AvatarType avatar_type = 14; + * optional .AvatarType avatar_type = 12; * @param value the avatarType to set * @return this */ @@ -184,8 +184,8 @@ public final class LineupSlotDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - slot = other.slot; id = other.id; + slot = other.slot; avatarType = other.avatarType; } return this; @@ -197,12 +197,12 @@ public final class LineupSlotDataOuterClass { return this; } cachedSize = -1; - if (other.hasSlot()) { - setSlot(other.slot); - } if (other.hasId()) { setId(other.id); } + if (other.hasSlot()) { + setSlot(other.slot); + } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } @@ -216,8 +216,8 @@ public final class LineupSlotDataOuterClass { } cachedSize = -1; bitField0_ = 0; - slot = 0; id = 0; + slot = 0; avatarType = 0; return this; } @@ -242,23 +242,23 @@ public final class LineupSlotDataOuterClass { } LineupSlotData other = (LineupSlotData) o; return bitField0_ == other.bitField0_ - && (!hasSlot() || slot == other.slot) && (!hasId() || id == other.id) + && (!hasSlot() || slot == other.slot) && (!hasAvatarType() || avatarType == other.avatarType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(slot); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(id); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); + output.writeUInt32NoTag(slot); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); output.writeEnumNoTag(avatarType); } } @@ -267,10 +267,10 @@ public final class LineupSlotDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(slot); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); @@ -285,25 +285,25 @@ public final class LineupSlotDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // slot - slot = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 24: { // id id = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { break; } } case 112: { + // slot + slot = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -333,10 +333,10 @@ public final class LineupSlotDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.slot, slot); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.slot, slot); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); @@ -351,10 +351,10 @@ public final class LineupSlotDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 3533310: { - if (input.isAtField(FieldNames.slot)) { + case 3355: { + if (input.isAtField(FieldNames.id)) { if (!input.trySkipNullValue()) { - slot = input.readUInt32(); + id = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -362,10 +362,10 @@ public final class LineupSlotDataOuterClass { } 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_ |= 0x00000002; } } else { @@ -443,10 +443,10 @@ public final class LineupSlotDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName slot = FieldName.forField("slot"); - static final FieldName id = FieldName.forField("id"); + static final FieldName slot = FieldName.forField("slot"); + static final FieldName avatarType = FieldName.forField("avatarType", "avatar_type"); } } diff --git a/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockEquipmentCsReqOuterClass.java index 517ad61..0f954cc 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 = 9; + * optional bool is_protected = 6; */ private boolean isProtected; /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_id_list = 3; */ private final RepeatedInt equipmentIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 6; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -48,7 +48,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 6; * @return this */ public LockEquipmentCsReq clearIsProtected() { @@ -58,7 +58,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 6; * @return the isProtected */ public boolean getIsProtected() { @@ -66,7 +66,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 6; * @param value the isProtected to set * @return this */ @@ -77,7 +77,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_id_list = 3; * @return whether the equipmentIdList field is set */ public boolean hasEquipmentIdList() { @@ -85,7 +85,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_id_list = 3; * @return this */ public LockEquipmentCsReq clearEquipmentIdList() { @@ -95,7 +95,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_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. @@ -109,7 +109,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_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 @@ -123,7 +123,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_id_list = 3; * @param value the equipmentIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class LockEquipmentCsReqOuterClass { } /** - * repeated uint32 equipment_id_list = 13; + * repeated uint32 equipment_id_list = 3; * @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) 72); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isProtected); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < equipmentIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(equipmentIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class LockEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 48: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 26) { break; } } - case 106: { + case 26: { // equipmentIdList [packed=true] input.readPackedUInt32(equipmentIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class LockEquipmentCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 24: { // 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 2116c83..76cbebc 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 = 10; + * optional uint32 retcode = 9; */ private int retcode; @@ -34,7 +34,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -42,7 +42,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return this */ public LockEquipmentScRsp clearRetcode() { @@ -52,7 +52,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -60,7 +60,7 @@ public final class LockEquipmentScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 9; * @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) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } } @@ -150,7 +150,7 @@ public final class LockEquipmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // 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 80a9301..2b078e6 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 = 10; + * optional uint32 relic_unique_id = 9; */ private int relicUniqueId; /** - * optional bool is_protected = 9; + * optional bool is_protected = 7; */ private boolean isProtected; @@ -39,7 +39,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 9; * @return whether the relicUniqueId field is set */ public boolean hasRelicUniqueId() { @@ -47,7 +47,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 9; * @return this */ public LockRelicCsReq clearRelicUniqueId() { @@ -57,7 +57,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 9; * @return the relicUniqueId */ public int getRelicUniqueId() { @@ -65,7 +65,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional uint32 relic_unique_id = 10; + * optional uint32 relic_unique_id = 9; * @param value the relicUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 7; * @return whether the isProtected field is set */ public boolean hasIsProtected() { @@ -84,7 +84,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 7; * @return this */ public LockRelicCsReq clearIsProtected() { @@ -94,7 +94,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 7; * @return the isProtected */ public boolean getIsProtected() { @@ -102,7 +102,7 @@ public final class LockRelicCsReqOuterClass { } /** - * optional bool is_protected = 9; + * optional bool is_protected = 7; * @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) 80); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(relicUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 56); output.writeBoolNoTag(isProtected); } } @@ -205,16 +205,16 @@ public final class LockRelicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 72: { // relicUniqueId relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 56) { break; } } - case 72: { + case 56: { // isProtected isProtected = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java index a78474d..095cb28 100644 --- a/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/LockRelicScRspOuterClass.java @@ -19,7 +19,7 @@ public final class LockRelicScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 13; */ private int retcode; @@ -39,7 +39,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 13; * @return this */ public LockRelicScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class LockRelicScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -177,7 +177,7 @@ public final class LockRelicScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class LockRelicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkAvatarCsReqOuterClass.java index 0097b91..ff99ee3 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 = 9; + * optional uint32 avatar_id = 1; */ private int avatarId; /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; */ private boolean isMarked; @@ -39,7 +39,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -47,7 +47,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return this */ public MarkAvatarCsReq clearAvatarId() { @@ -57,7 +57,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @return the avatarId */ public int getAvatarId() { @@ -65,7 +65,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 9; + * optional uint32 avatar_id = 1; * @param value the avatarId to set * @return this */ @@ -76,7 +76,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -84,7 +84,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @return this */ public MarkAvatarCsReq clearIsMarked() { @@ -94,7 +94,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @return the isMarked */ public boolean getIsMarked() { @@ -102,7 +102,7 @@ public final class MarkAvatarCsReqOuterClass { } /** - * optional bool is_marked = 10; + * optional bool is_marked = 2; * @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) 72); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isMarked); } } @@ -205,16 +205,16 @@ public final class MarkAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 8: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 16) { break; } } - case 80: { + case 16: { // 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 7771e18..6a06ad6 100644 --- a/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MarkAvatarScRspOuterClass.java @@ -19,7 +19,7 @@ public final class MarkAvatarScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; */ private int retcode; @@ -29,7 +29,7 @@ public final class MarkAvatarScRspOuterClass { private int avatarId; /** - * optional bool is_marked = 14; + * optional bool is_marked = 2; */ private boolean isMarked; @@ -44,7 +44,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return this */ public MarkAvatarScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 14; + * optional bool is_marked = 2; * @return whether the isMarked field is set */ public boolean hasIsMarked() { @@ -126,7 +126,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 14; + * optional bool is_marked = 2; * @return this */ public MarkAvatarScRsp clearIsMarked() { @@ -136,7 +136,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 14; + * optional bool is_marked = 2; * @return the isMarked */ public boolean getIsMarked() { @@ -144,7 +144,7 @@ public final class MarkAvatarScRspOuterClass { } /** - * optional bool is_marked = 14; + * optional bool is_marked = 2; * @param value the isMarked to set * @return this */ @@ -225,7 +225,7 @@ public final class MarkAvatarScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { @@ -233,7 +233,7 @@ public final class MarkAvatarScRspOuterClass { output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeBoolNoTag(isMarked); } } @@ -260,7 +260,7 @@ public final class MarkAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; @@ -274,11 +274,11 @@ public final class MarkAvatarScRspOuterClass { avatarId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 112) { + if (tag != 16) { break; } } - case 112: { + case 16: { // isMarked isMarked = input.readBool(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/MarkReadMailCsReqOuterClass.java index 0189a63..115ba8b 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 = 1; + * optional uint32 id = 2; */ private int id; @@ -34,7 +34,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 2; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 2; * @return this */ public MarkReadMailCsReq clearId() { @@ -52,7 +52,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 2; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class MarkReadMailCsReqOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 2; * @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) 8); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class MarkReadMailCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 16: { // 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 894b924..f4173a2 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 = 1; + * optional uint32 id = 4; */ private int id; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; */ private int retcode; @@ -39,7 +39,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 4; * @return whether the id field is set */ public boolean hasId() { @@ -47,7 +47,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 4; * @return this */ public MarkReadMailScRsp clearId() { @@ -57,7 +57,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 4; * @return the id */ public int getId() { @@ -65,7 +65,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 4; * @param value the id to set * @return this */ @@ -76,7 +76,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return this */ public MarkReadMailScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class MarkReadMailScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 8; * @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) 8); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class MarkReadMailScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 32: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { + case 64: { // 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 fdb1f8e..754248d 100644 --- a/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MaterialOuterClass.java @@ -19,12 +19,12 @@ public final class MaterialOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 tid = 12; + * optional uint32 tid = 6; */ private int tid; /** - * optional uint32 num = 15; + * optional uint32 num = 8; */ private int num; @@ -39,7 +39,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 12; + * optional uint32 tid = 6; * @return whether the tid field is set */ public boolean hasTid() { @@ -47,7 +47,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 12; + * optional uint32 tid = 6; * @return this */ public Material clearTid() { @@ -57,7 +57,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 12; + * optional uint32 tid = 6; * @return the tid */ public int getTid() { @@ -65,7 +65,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 tid = 12; + * optional uint32 tid = 6; * @param value the tid to set * @return this */ @@ -76,7 +76,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 8; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 8; * @return this */ public Material clearNum() { @@ -94,7 +94,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 8; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class MaterialOuterClass { } /** - * optional uint32 num = 15; + * optional uint32 num = 8; * @param value the num to set * @return this */ @@ -177,11 +177,11 @@ public final class MaterialOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(tid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class MaterialOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 48: { // tid tid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { + case 64: { // num num = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java b/src/generated/main/emu/lunarcore/proto/MazeChestOuterClass.java index 5956b2e..c520daf 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 = 2; + * optional uint32 total_amount_list = 7; */ private int totalAmountList; /** - * optional uint32 unlocked_amount_list = 11; + * optional uint32 unlocked_amount_list = 12; */ private int unlockedAmountList; /** - * optional .MapInfoChestType map_info_chest_type = 3; + * optional .MapInfoChestType map_info_chest_type = 8; */ private int mapInfoChestType; @@ -44,7 +44,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 2; + * optional uint32 total_amount_list = 7; * @return whether the totalAmountList field is set */ public boolean hasTotalAmountList() { @@ -52,7 +52,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 2; + * optional uint32 total_amount_list = 7; * @return this */ public MazeChest clearTotalAmountList() { @@ -62,7 +62,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 2; + * optional uint32 total_amount_list = 7; * @return the totalAmountList */ public int getTotalAmountList() { @@ -70,7 +70,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 total_amount_list = 2; + * optional uint32 total_amount_list = 7; * @param value the totalAmountList to set * @return this */ @@ -81,7 +81,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 11; + * optional uint32 unlocked_amount_list = 12; * @return whether the unlockedAmountList field is set */ public boolean hasUnlockedAmountList() { @@ -89,7 +89,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 11; + * optional uint32 unlocked_amount_list = 12; * @return this */ public MazeChest clearUnlockedAmountList() { @@ -99,7 +99,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 11; + * optional uint32 unlocked_amount_list = 12; * @return the unlockedAmountList */ public int getUnlockedAmountList() { @@ -107,7 +107,7 @@ public final class MazeChestOuterClass { } /** - * optional uint32 unlocked_amount_list = 11; + * optional uint32 unlocked_amount_list = 12; * @param value the unlockedAmountList to set * @return this */ @@ -118,7 +118,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 3; + * optional .MapInfoChestType map_info_chest_type = 8; * @return whether the mapInfoChestType field is set */ public boolean hasMapInfoChestType() { @@ -126,7 +126,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 3; + * optional .MapInfoChestType map_info_chest_type = 8; * @return this */ public MazeChest clearMapInfoChestType() { @@ -136,7 +136,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 3; + * optional .MapInfoChestType map_info_chest_type = 8; * @return the mapInfoChestType */ public MapInfoChestTypeOuterClass.MapInfoChestType getMapInfoChestType() { @@ -169,7 +169,7 @@ public final class MazeChestOuterClass { } /** - * optional .MapInfoChestType map_info_chest_type = 3; + * optional .MapInfoChestType map_info_chest_type = 8; * @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) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(totalAmountList); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(unlockedAmountList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeEnumNoTag(mapInfoChestType); } } @@ -285,25 +285,25 @@ public final class MazeChestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // totalAmountList totalAmountList = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // unlockedAmountList unlockedAmountList = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 64) { break; } } - case 24: { + case 64: { // 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 0cba92c..94223dc 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 = 14; + * optional int64 modify_time = 15; */ private long modifyTime; /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 5; */ private int groupId; @@ -39,7 +39,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 14; + * optional int64 modify_time = 15; * @return whether the modifyTime field is set */ public boolean hasModifyTime() { @@ -47,7 +47,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 14; + * optional int64 modify_time = 15; * @return this */ public MazeGroup clearModifyTime() { @@ -57,7 +57,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 14; + * optional int64 modify_time = 15; * @return the modifyTime */ public long getModifyTime() { @@ -65,7 +65,7 @@ public final class MazeGroupOuterClass { } /** - * optional int64 modify_time = 14; + * optional int64 modify_time = 15; * @param value the modifyTime to set * @return this */ @@ -76,7 +76,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 5; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -84,7 +84,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 5; * @return this */ public MazeGroup clearGroupId() { @@ -94,7 +94,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 5; * @return the groupId */ public int getGroupId() { @@ -102,7 +102,7 @@ public final class MazeGroupOuterClass { } /** - * optional uint32 group_id = 8; + * optional uint32 group_id = 5; * @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) 112); + output.writeRawByte((byte) 120); output.writeInt64NoTag(modifyTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(groupId); } } @@ -205,16 +205,16 @@ public final class MazeGroupOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // modifyTime modifyTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 40) { break; } } - case 64: { + case 40: { // 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 8adcc97..6b57678 100644 --- a/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MazeMapDataOuterClass.java @@ -21,44 +21,44 @@ public final class MazeMapDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 entry_id = 12; - */ - private int entryId; - - /** - * optional uint32 cur_map_entry_id = 14; + * optional uint32 cur_map_entry_id = 2; */ private int curMapEntryId; /** - * repeated uint32 lighten_section_list = 10; + * optional uint32 entry_id = 5; */ - private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); + private int entryId; /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 10; */ private final RepeatedInt unlockedTeleportList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeGroup maze_group_list = 2; + * repeated uint32 lighten_section_list = 12; */ - private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); + private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); /** - * repeated .MazeChest unlocked_chest_list = 6; + * repeated .MazeProp maze_prop_list = 3; + */ + private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + + /** + * repeated .MazeChest unlocked_chest_list = 9; */ private final RepeatedMessage unlockedChestList = RepeatedMessage.newEmptyInstance(MazeChestOuterClass.MazeChest.getFactory()); /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeGroup maze_group_list = 14; */ - private final RepeatedMessage mazePropList = RepeatedMessage.newEmptyInstance(MazePropOuterClass.MazeProp.getFactory()); + private final RepeatedMessage mazeGroupList = RepeatedMessage.newEmptyInstance(MazeGroupOuterClass.MazeGroup.getFactory()); private MazeMapData() { } @@ -71,7 +71,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -79,7 +79,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return this */ public MazeMapData clearRetcode() { @@ -89,7 +89,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -97,7 +97,7 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 retcode = 4; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -108,62 +108,25 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 entry_id = 12; - * @return whether the entryId field is set + * optional uint32 cur_map_entry_id = 2; + * @return whether the curMapEntryId field is set */ - public boolean hasEntryId() { + public boolean hasCurMapEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entry_id = 12; - * @return this - */ - public MazeMapData clearEntryId() { - bitField0_ &= ~0x00000002; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 12; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 12; - * @param value the entryId to set - * @return this - */ - public MazeMapData setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 cur_map_entry_id = 14; - * @return whether the curMapEntryId field is set - */ - public boolean hasCurMapEntryId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_map_entry_id = 14; + * optional uint32 cur_map_entry_id = 2; * @return this */ public MazeMapData clearCurMapEntryId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; curMapEntryId = 0; return this; } /** - * optional uint32 cur_map_entry_id = 14; + * optional uint32 cur_map_entry_id = 2; * @return the curMapEntryId */ public int getCurMapEntryId() { @@ -171,104 +134,73 @@ public final class MazeMapDataOuterClass { } /** - * optional uint32 cur_map_entry_id = 14; + * optional uint32 cur_map_entry_id = 2; * @param value the curMapEntryId to set * @return this */ public MazeMapData setCurMapEntryId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; curMapEntryId = value; return this; } /** - * repeated uint32 lighten_section_list = 10; - * @return whether the lightenSectionList field is set + * optional uint32 entry_id = 5; + * @return whether the entryId field is set */ - public boolean hasLightenSectionList() { + public boolean hasEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entry_id = 5; + * @return this + */ + public MazeMapData clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 5; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 5; + * @param value the entryId to set + * @return this + */ + public MazeMapData setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = value; + return this; + } + + /** + * repeated uint32 unlocked_teleport_list = 10; + * @return whether the unlockedTeleportList field is set + */ + public boolean hasUnlockedTeleportList() { return (bitField0_ & 0x00000008) != 0; } /** - * repeated uint32 lighten_section_list = 10; - * @return this - */ - public MazeMapData clearLightenSectionList() { - bitField0_ &= ~0x00000008; - lightenSectionList.clear(); - return this; - } - - /** - * repeated uint32 lighten_section_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 #getMutableLightenSectionList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getLightenSectionList() { - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_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 getMutableLightenSectionList() { - bitField0_ |= 0x00000008; - return lightenSectionList; - } - - /** - * repeated uint32 lighten_section_list = 10; - * @param value the lightenSectionList to add - * @return this - */ - public MazeMapData addLightenSectionList(final int value) { - bitField0_ |= 0x00000008; - lightenSectionList.add(value); - return this; - } - - /** - * repeated uint32 lighten_section_list = 10; - * @param values the lightenSectionList to add - * @return this - */ - public MazeMapData addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000008; - lightenSectionList.addAll(values); - return this; - } - - /** - * repeated uint32 unlocked_teleport_list = 13; - * @return whether the unlockedTeleportList field is set - */ - public boolean hasUnlockedTeleportList() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 10; * @return this */ public MazeMapData clearUnlockedTeleportList() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; unlockedTeleportList.clear(); return this; } /** - * repeated uint32 unlocked_teleport_list = 13; + * 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. @@ -282,7 +214,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated uint32 unlocked_teleport_list = 13; + * 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 @@ -291,188 +223,120 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableUnlockedTeleportList() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return unlockedTeleportList; } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 10; * @param value the unlockedTeleportList to add * @return this */ public MazeMapData addUnlockedTeleportList(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; unlockedTeleportList.add(value); return this; } /** - * repeated uint32 unlocked_teleport_list = 13; + * repeated uint32 unlocked_teleport_list = 10; * @param values the unlockedTeleportList to add * @return this */ public MazeMapData addAllUnlockedTeleportList(final int... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; unlockedTeleportList.addAll(values); return this; } /** - * repeated .MazeGroup maze_group_list = 2; - * @return whether the mazeGroupList field is set + * repeated uint32 lighten_section_list = 12; + * @return whether the lightenSectionList field is set */ - public boolean hasMazeGroupList() { + public boolean hasLightenSectionList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated uint32 lighten_section_list = 12; + * @return this + */ + public MazeMapData clearLightenSectionList() { + bitField0_ &= ~0x00000010; + lightenSectionList.clear(); + return this; + } + + /** + * repeated uint32 lighten_section_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 #getMutableLightenSectionList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLightenSectionList() { + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_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 RepeatedInt getMutableLightenSectionList() { + bitField0_ |= 0x00000010; + return lightenSectionList; + } + + /** + * repeated uint32 lighten_section_list = 12; + * @param value the lightenSectionList to add + * @return this + */ + public MazeMapData addLightenSectionList(final int value) { + bitField0_ |= 0x00000010; + lightenSectionList.add(value); + return this; + } + + /** + * repeated uint32 lighten_section_list = 12; + * @param values the lightenSectionList to add + * @return this + */ + public MazeMapData addAllLightenSectionList(final int... values) { + bitField0_ |= 0x00000010; + lightenSectionList.addAll(values); + return this; + } + + /** + * repeated .MazeProp maze_prop_list = 3; + * @return whether the mazePropList field is set + */ + public boolean hasMazePropList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .MazeGroup maze_group_list = 2; - * @return this - */ - public MazeMapData clearMazeGroupList() { - bitField0_ &= ~0x00000020; - mazeGroupList.clear(); - return this; - } - - /** - * repeated .MazeGroup maze_group_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 #getMutableMazeGroupList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMazeGroupList() { - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_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 getMutableMazeGroupList() { - bitField0_ |= 0x00000020; - return mazeGroupList; - } - - /** - * repeated .MazeGroup maze_group_list = 2; - * @param value the mazeGroupList to add - * @return this - */ - public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { - bitField0_ |= 0x00000020; - mazeGroupList.add(value); - return this; - } - - /** - * repeated .MazeGroup maze_group_list = 2; - * @param values the mazeGroupList to add - * @return this - */ - public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { - bitField0_ |= 0x00000020; - mazeGroupList.addAll(values); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 6; - * @return whether the unlockedChestList field is set - */ - public boolean hasUnlockedChestList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .MazeChest unlocked_chest_list = 6; - * @return this - */ - public MazeMapData clearUnlockedChestList() { - bitField0_ &= ~0x00000040; - unlockedChestList.clear(); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getUnlockedChestList() { - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() { - bitField0_ |= 0x00000040; - return unlockedChestList; - } - - /** - * repeated .MazeChest unlocked_chest_list = 6; - * @param value the unlockedChestList to add - * @return this - */ - public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { - bitField0_ |= 0x00000040; - unlockedChestList.add(value); - return this; - } - - /** - * repeated .MazeChest unlocked_chest_list = 6; - * @param values the unlockedChestList to add - * @return this - */ - public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { - bitField0_ |= 0x00000040; - unlockedChestList.addAll(values); - return this; - } - - /** - * repeated .MazeProp maze_prop_list = 15; - * @return whether the mazePropList field is set - */ - public boolean hasMazePropList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeProp maze_prop_list = 3; * @return this */ public MazeMapData clearMazePropList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; mazePropList.clear(); return this; } /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeProp maze_prop_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. @@ -486,7 +350,7 @@ public final class MazeMapDataOuterClass { } /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeProp maze_prop_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 @@ -495,45 +359,181 @@ public final class MazeMapDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableMazePropList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; return mazePropList; } /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeProp maze_prop_list = 3; * @param value the mazePropList to add * @return this */ public MazeMapData addMazePropList(final MazePropOuterClass.MazeProp value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; mazePropList.add(value); return this; } /** - * repeated .MazeProp maze_prop_list = 15; + * repeated .MazeProp maze_prop_list = 3; * @param values the mazePropList to add * @return this */ public MazeMapData addAllMazePropList(final MazePropOuterClass.MazeProp... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; mazePropList.addAll(values); return this; } + /** + * repeated .MazeChest unlocked_chest_list = 9; + * @return whether the unlockedChestList field is set + */ + public boolean hasUnlockedChestList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated .MazeChest unlocked_chest_list = 9; + * @return this + */ + public MazeMapData clearUnlockedChestList() { + bitField0_ &= ~0x00000040; + unlockedChestList.clear(); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_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 #getMutableUnlockedChestList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getUnlockedChestList() { + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_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 getMutableUnlockedChestList() { + bitField0_ |= 0x00000040; + return unlockedChestList; + } + + /** + * repeated .MazeChest unlocked_chest_list = 9; + * @param value the unlockedChestList to add + * @return this + */ + public MazeMapData addUnlockedChestList(final MazeChestOuterClass.MazeChest value) { + bitField0_ |= 0x00000040; + unlockedChestList.add(value); + return this; + } + + /** + * repeated .MazeChest unlocked_chest_list = 9; + * @param values the unlockedChestList to add + * @return this + */ + public MazeMapData addAllUnlockedChestList(final MazeChestOuterClass.MazeChest... values) { + bitField0_ |= 0x00000040; + unlockedChestList.addAll(values); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @return whether the mazeGroupList field is set + */ + public boolean hasMazeGroupList() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @return this + */ + public MazeMapData clearMazeGroupList() { + bitField0_ &= ~0x00000080; + 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_ |= 0x00000080; + return mazeGroupList; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @param value the mazeGroupList to add + * @return this + */ + public MazeMapData addMazeGroupList(final MazeGroupOuterClass.MazeGroup value) { + bitField0_ |= 0x00000080; + mazeGroupList.add(value); + return this; + } + + /** + * repeated .MazeGroup maze_group_list = 14; + * @param values the mazeGroupList to add + * @return this + */ + public MazeMapData addAllMazeGroupList(final MazeGroupOuterClass.MazeGroup... values) { + bitField0_ |= 0x00000080; + mazeGroupList.addAll(values); + return this; + } + @Override public MazeMapData copyFrom(final MazeMapData other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - entryId = other.entryId; curMapEntryId = other.curMapEntryId; - lightenSectionList.copyFrom(other.lightenSectionList); + entryId = other.entryId; unlockedTeleportList.copyFrom(other.unlockedTeleportList); - mazeGroupList.copyFrom(other.mazeGroupList); - unlockedChestList.copyFrom(other.unlockedChestList); + lightenSectionList.copyFrom(other.lightenSectionList); mazePropList.copyFrom(other.mazePropList); + unlockedChestList.copyFrom(other.unlockedChestList); + mazeGroupList.copyFrom(other.mazeGroupList); } return this; } @@ -547,26 +547,26 @@ public final class MazeMapDataOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEntryId()) { - setEntryId(other.entryId); - } if (other.hasCurMapEntryId()) { setCurMapEntryId(other.curMapEntryId); } - if (other.hasLightenSectionList()) { - getMutableLightenSectionList().addAll(other.lightenSectionList); + if (other.hasEntryId()) { + setEntryId(other.entryId); } if (other.hasUnlockedTeleportList()) { getMutableUnlockedTeleportList().addAll(other.unlockedTeleportList); } - if (other.hasMazeGroupList()) { - getMutableMazeGroupList().addAll(other.mazeGroupList); + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); + } + if (other.hasMazePropList()) { + getMutableMazePropList().addAll(other.mazePropList); } if (other.hasUnlockedChestList()) { getMutableUnlockedChestList().addAll(other.unlockedChestList); } - if (other.hasMazePropList()) { - getMutableMazePropList().addAll(other.mazePropList); + if (other.hasMazeGroupList()) { + getMutableMazeGroupList().addAll(other.mazeGroupList); } return this; } @@ -579,13 +579,13 @@ public final class MazeMapDataOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - entryId = 0; curMapEntryId = 0; - lightenSectionList.clear(); + entryId = 0; unlockedTeleportList.clear(); - mazeGroupList.clear(); - unlockedChestList.clear(); + lightenSectionList.clear(); mazePropList.clear(); + unlockedChestList.clear(); + mazeGroupList.clear(); return this; } @@ -596,11 +596,11 @@ public final class MazeMapDataOuterClass { } cachedSize = -1; bitField0_ = 0; - lightenSectionList.clear(); unlockedTeleportList.clear(); - mazeGroupList.clearQuick(); - unlockedChestList.clearQuick(); + lightenSectionList.clear(); mazePropList.clearQuick(); + unlockedChestList.clearQuick(); + mazeGroupList.clearQuick(); return this; } @@ -615,57 +615,57 @@ public final class MazeMapDataOuterClass { MazeMapData other = (MazeMapData) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasEntryId() || entryId == other.entryId) && (!hasCurMapEntryId() || curMapEntryId == other.curMapEntryId) - && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasEntryId() || entryId == other.entryId) && (!hasUnlockedTeleportList() || unlockedTeleportList.equals(other.unlockedTeleportList)) - && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)) + && (!hasLightenSectionList() || lightenSectionList.equals(other.lightenSectionList)) + && (!hasMazePropList() || mazePropList.equals(other.mazePropList)) && (!hasUnlockedChestList() || unlockedChestList.equals(other.unlockedChestList)) - && (!hasMazePropList() || mazePropList.equals(other.mazePropList)); + && (!hasMazeGroupList() || mazeGroupList.equals(other.mazeGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(curMapEntryId); } - if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(lightenSectionList.array()[i]); - } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(entryId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < unlockedTeleportList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(unlockedTeleportList.array()[i]); } } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(lightenSectionList.array()[i]); + } + } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < mazeGroupList.length(); i++) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(mazeGroupList.get(i)); + for (int i = 0; i < mazePropList.length(); i++) { + output.writeRawByte((byte) 26); + output.writeMessageNoTag(mazePropList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < unlockedChestList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 74); output.writeMessageNoTag(unlockedChestList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < mazePropList.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(mazePropList.get(i)); + for (int i = 0; i < mazeGroupList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(mazeGroupList.get(i)); } } } @@ -677,25 +677,25 @@ public final class MazeMapDataOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curMapEntryId); } - if ((bitField0_ & 0x00000008) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { size += (1 * unlockedTeleportList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedTeleportList); } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); + size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * unlockedChestList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * mazePropList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazePropList); + size += (1 * mazeGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeGroupList); } return size; } @@ -707,27 +707,27 @@ public final class MazeMapDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 16) { break; } } - case 96: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 16: { // curMapEntryId curMapEntryId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 82) { @@ -735,42 +735,42 @@ public final class MazeMapDataOuterClass { } } case 82: { - // lightenSectionList [packed=true] - input.readPackedUInt32(lightenSectionList, tag); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { // unlockedTeleportList [packed=true] input.readPackedUInt32(unlockedTeleportList, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // lightenSectionList [packed=true] + input.readPackedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { - // mazeGroupList - tag = input.readRepeatedMessage(mazeGroupList, tag); + case 26: { + // mazePropList + tag = input.readRepeatedMessage(mazePropList, tag); bitField0_ |= 0x00000020; - if (tag != 50) { + if (tag != 74) { break; } } - case 50: { + case 74: { // unlockedChestList tag = input.readRepeatedMessage(unlockedChestList, tag); bitField0_ |= 0x00000040; - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { - // mazePropList - tag = input.readRepeatedMessage(mazePropList, tag); + case 114: { + // mazeGroupList + tag = input.readRepeatedMessage(mazeGroupList, tag); bitField0_ |= 0x00000080; if (tag != 0) { break; @@ -787,14 +787,14 @@ public final class MazeMapDataOuterClass { break; } case 80: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + // unlockedTeleportList [packed=false] + tag = input.readRepeatedUInt32(unlockedTeleportList, tag); bitField0_ |= 0x00000008; break; } - case 104: { - // unlockedTeleportList [packed=false] - tag = input.readRepeatedUInt32(unlockedTeleportList, tag); + case 96: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000010; break; } @@ -809,25 +809,25 @@ public final class MazeMapDataOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.curMapEntryId, curMapEntryId); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000008) != 0) { output.writeRepeatedUInt32(FieldNames.unlockedTeleportList, unlockedTeleportList); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); + output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.unlockedChestList, unlockedChestList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.mazePropList, mazePropList); + output.writeRepeatedMessage(FieldNames.mazeGroupList, mazeGroupList); } output.endObject(); } @@ -850,11 +850,11 @@ public final class MazeMapDataOuterClass { } break; } - case -1591558867: - case -2093663224: { - if (input.isAtField(FieldNames.entryId)) { + case 764919441: + case 2115673898: { + if (input.isAtField(FieldNames.curMapEntryId)) { if (!input.trySkipNullValue()) { - entryId = input.readUInt32(); + curMapEntryId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -862,11 +862,11 @@ public final class MazeMapDataOuterClass { } break; } - case 764919441: - case 2115673898: { - if (input.isAtField(FieldNames.curMapEntryId)) { + case -1591558867: + case -2093663224: { + if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { - curMapEntryId = input.readUInt32(); + entryId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -874,23 +874,23 @@ public final class MazeMapDataOuterClass { } 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_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1942343836: + case 1328850360: { + if (input.isAtField(FieldNames.lightenSectionList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lightenSectionList); bitField0_ |= 0x00000010; } } else { @@ -898,11 +898,11 @@ public final class MazeMapDataOuterClass { } break; } - case -317054274: - case 407435998: { - if (input.isAtField(FieldNames.mazeGroupList)) { + case 1676123008: + case 1875839866: { + if (input.isAtField(FieldNames.mazePropList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazeGroupList); + input.readRepeatedMessage(mazePropList); bitField0_ |= 0x00000020; } } else { @@ -922,11 +922,11 @@ public final class MazeMapDataOuterClass { } break; } - case 1676123008: - case 1875839866: { - if (input.isAtField(FieldNames.mazePropList)) { + case -317054274: + case 407435998: { + if (input.isAtField(FieldNames.mazeGroupList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(mazePropList); + input.readRepeatedMessage(mazeGroupList); bitField0_ |= 0x00000080; } } else { @@ -988,19 +988,19 @@ public final class MazeMapDataOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName curMapEntryId = FieldName.forField("curMapEntryId", "cur_map_entry_id"); - static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); static final FieldName unlockedTeleportList = FieldName.forField("unlockedTeleportList", "unlocked_teleport_list"); - static final FieldName mazeGroupList = FieldName.forField("mazeGroupList", "maze_group_list"); + static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); + + static final FieldName mazePropList = FieldName.forField("mazePropList", "maze_prop_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 c60d62d..bc060c5 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 config_id = 1; - */ - private int configId; - - /** - * optional uint32 state = 12; + * optional uint32 state = 1; */ private int state; /** - * optional uint32 group_id = 15; + * optional uint32 config_id = 3; + */ + private int configId; + + /** + * optional uint32 group_id = 6; */ private int groupId; @@ -44,62 +44,25 @@ public final class MazePropOuterClass { } /** - * optional uint32 config_id = 1; - * @return whether the configId field is set + * optional uint32 state = 1; + * @return whether the state field is set */ - public boolean hasConfigId() { + public boolean hasState() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 config_id = 1; - * @return this - */ - public MazeProp clearConfigId() { - bitField0_ &= ~0x00000001; - configId = 0; - return this; - } - - /** - * optional uint32 config_id = 1; - * @return the configId - */ - public int getConfigId() { - return configId; - } - - /** - * optional uint32 config_id = 1; - * @param value the configId to set - * @return this - */ - public MazeProp setConfigId(final int value) { - bitField0_ |= 0x00000001; - configId = value; - return this; - } - - /** - * optional uint32 state = 12; - * @return whether the state field is set - */ - public boolean hasState() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 state = 12; + * optional uint32 state = 1; * @return this */ public MazeProp clearState() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; state = 0; return this; } /** - * optional uint32 state = 12; + * optional uint32 state = 1; * @return the state */ public int getState() { @@ -107,18 +70,55 @@ public final class MazePropOuterClass { } /** - * optional uint32 state = 12; + * optional uint32 state = 1; * @param value the state to set * @return this */ public MazeProp setState(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; state = value; return this; } /** - * optional uint32 group_id = 15; + * optional uint32 config_id = 3; + * @return whether the configId field is set + */ + public boolean hasConfigId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 config_id = 3; + * @return this + */ + public MazeProp clearConfigId() { + bitField0_ &= ~0x00000002; + configId = 0; + return this; + } + + /** + * optional uint32 config_id = 3; + * @return the configId + */ + public int getConfigId() { + return configId; + } + + /** + * optional uint32 config_id = 3; + * @param value the configId to set + * @return this + */ + public MazeProp setConfigId(final int value) { + bitField0_ |= 0x00000002; + configId = value; + return this; + } + + /** + * optional uint32 group_id = 6; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -126,7 +126,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 6; * @return this */ public MazeProp clearGroupId() { @@ -136,7 +136,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 6; * @return the groupId */ public int getGroupId() { @@ -144,7 +144,7 @@ public final class MazePropOuterClass { } /** - * optional uint32 group_id = 15; + * optional uint32 group_id = 6; * @param value the groupId to set * @return this */ @@ -159,8 +159,8 @@ public final class MazePropOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - configId = other.configId; state = other.state; + configId = other.configId; groupId = other.groupId; } return this; @@ -172,12 +172,12 @@ public final class MazePropOuterClass { return this; } cachedSize = -1; - if (other.hasConfigId()) { - setConfigId(other.configId); - } if (other.hasState()) { setState(other.state); } + if (other.hasConfigId()) { + setConfigId(other.configId); + } if (other.hasGroupId()) { setGroupId(other.groupId); } @@ -191,8 +191,8 @@ public final class MazePropOuterClass { } cachedSize = -1; bitField0_ = 0; - configId = 0; state = 0; + configId = 0; groupId = 0; return this; } @@ -217,8 +217,8 @@ public final class MazePropOuterClass { } MazeProp other = (MazeProp) o; return bitField0_ == other.bitField0_ - && (!hasConfigId() || configId == other.configId) && (!hasState() || state == other.state) + && (!hasConfigId() || configId == other.configId) && (!hasGroupId() || groupId == other.groupId); } @@ -226,14 +226,14 @@ public final class MazePropOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(configId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); output.writeUInt32NoTag(state); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(configId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(groupId); } } @@ -242,10 +242,10 @@ public final class MazePropOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(configId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); @@ -261,24 +261,24 @@ public final class MazePropOuterClass { while (true) { switch (tag) { case 8: { - // configId - configId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { // state state = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 24) { break; } } - case 120: { + case 24: { + // configId + configId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class MazePropOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.configId, configId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.state, state); + output.writeUInt32(FieldNames.configId, configId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.groupId, groupId); @@ -323,11 +323,10 @@ public final class MazePropOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -580140035: - case -804450504: { - if (input.isAtField(FieldNames.configId)) { + case 109757585: { + if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { - configId = input.readUInt32(); + state = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,10 +334,11 @@ public final class MazePropOuterClass { } break; } - case 109757585: { - if (input.isAtField(FieldNames.state)) { + case -580140035: + case -804450504: { + if (input.isAtField(FieldNames.configId)) { if (!input.trySkipNullValue()) { - state = input.readUInt32(); + configId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -410,10 +410,10 @@ public final class MazePropOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName configId = FieldName.forField("configId", "config_id"); - static final FieldName state = FieldName.forField("state"); + static final FieldName configId = FieldName.forField("configId", "config_id"); + static final FieldName groupId = FieldName.forField("groupId", "group_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.java new file mode 100644 index 0000000..044ae1d --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/MissionCustomValueDataOuterClass.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 MissionCustomValueDataOuterClass { + /** + * Protobuf type {@code MissionCustomValueData} + */ + public static final class MissionCustomValueData extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 index = 8; + */ + private int index; + + /** + * optional uint32 custom_value = 10; + */ + private int customValue; + + private MissionCustomValueData() { + } + + /** + * @return a new empty instance of {@code MissionCustomValueData} + */ + public static MissionCustomValueData newInstance() { + return new MissionCustomValueData(); + } + + /** + * optional uint32 index = 8; + * @return whether the index field is set + */ + public boolean hasIndex() { + 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; + * @return this + */ + public MissionCustomValueData clearCustomValue() { + bitField0_ &= ~0x00000002; + customValue = 0; + return this; + } + + /** + * optional uint32 custom_value = 10; + * @return the customValue + */ + public int getCustomValue() { + return customValue; + } + + /** + * optional uint32 custom_value = 10; + * @param value the customValue to set + * @return this + */ + public MissionCustomValueData setCustomValue(final int value) { + bitField0_ |= 0x00000002; + customValue = 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; + } + return this; + } + + @Override + public MissionCustomValueData mergeFrom(final MissionCustomValueData other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasIndex()) { + setIndex(other.index); + } + if (other.hasCustomValue()) { + setCustomValue(other.customValue); + } + return this; + } + + @Override + public MissionCustomValueData clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + index = 0; + customValue = 0; + return this; + } + + @Override + public MissionCustomValueData 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 MissionCustomValueData)) { + return false; + } + MissionCustomValueData other = (MissionCustomValueData) o; + return bitField0_ == other.bitField0_ + && (!hasIndex() || index == other.index) + && (!hasCustomValue() || customValue == other.customValue); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(index); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(customValue); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(customValue); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public MissionCustomValueData mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 64: { + // index + index = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // customValue + customValue = 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.index, index); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.customValue, customValue); + } + output.endObject(); + } + + @Override + public MissionCustomValueData mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + 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 -1786407808: + case 732653347: { + if (input.isAtField(FieldNames.customValue)) { + if (!input.trySkipNullValue()) { + customValue = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public MissionCustomValueData clone() { + return new MissionCustomValueData().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static MissionCustomValueData parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new MissionCustomValueData(), data).checkInitialized(); + } + + public static MissionCustomValueData parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new MissionCustomValueData(), input).checkInitialized(); + } + + public static MissionCustomValueData parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new MissionCustomValueData(), input).checkInitialized(); + } + + /** + * @return factory for creating MissionCustomValueData messages + */ + public static MessageFactory getFactory() { + return MissionCustomValueDataFactory.INSTANCE; + } + + private enum MissionCustomValueDataFactory implements MessageFactory { + INSTANCE; + + @Override + public MissionCustomValueData create() { + return MissionCustomValueData.newInstance(); + } + } + + /** + * 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"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java b/src/generated/main/emu/lunarcore/proto/MissionOuterClass.java index d81dc18..caea82c 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 = 1; + * optional uint32 id = 5; */ private int id; /** - * optional uint32 progress = 8; + * optional uint32 progress = 11; */ private int progress; /** - * optional .MissionStatus status = 10; + * optional .MissionStatus status = 6; */ private int status; @@ -44,7 +44,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 5; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 5; * @return this */ public Mission clearId() { @@ -62,7 +62,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 5; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public final class MissionOuterClass { } /** - * optional uint32 id = 1; + * optional uint32 id = 5; * @param value the id to set * @return this */ @@ -81,7 +81,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 8; + * optional uint32 progress = 11; * @return whether the progress field is set */ public boolean hasProgress() { @@ -89,7 +89,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 8; + * optional uint32 progress = 11; * @return this */ public Mission clearProgress() { @@ -99,7 +99,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 8; + * optional uint32 progress = 11; * @return the progress */ public int getProgress() { @@ -107,7 +107,7 @@ public final class MissionOuterClass { } /** - * optional uint32 progress = 8; + * optional uint32 progress = 11; * @param value the progress to set * @return this */ @@ -118,7 +118,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 10; + * optional .MissionStatus status = 6; * @return whether the status field is set */ public boolean hasStatus() { @@ -126,7 +126,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 10; + * optional .MissionStatus status = 6; * @return this */ public Mission clearStatus() { @@ -136,7 +136,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 10; + * optional .MissionStatus status = 6; * @return the status */ public MissionStatusOuterClass.MissionStatus getStatus() { @@ -169,7 +169,7 @@ public final class MissionOuterClass { } /** - * optional .MissionStatus status = 10; + * optional .MissionStatus status = 6; * @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) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeEnumNoTag(status); } } @@ -285,25 +285,25 @@ public final class MissionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // progress progress = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { + case 48: { // status final int value = input.readInt32(); if (MissionStatusOuterClass.MissionStatus.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/MonsterArchiveOuterClass.java index 278b68b..39399ab 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 = 10; + * optional uint32 monster_id = 2; */ private int monsterId; /** - * optional uint32 num = 14; + * optional uint32 num = 3; */ private int num; @@ -39,7 +39,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 2; * @return whether the monsterId field is set */ public boolean hasMonsterId() { @@ -47,7 +47,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 2; * @return this */ public MonsterArchive clearMonsterId() { @@ -57,7 +57,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 2; * @return the monsterId */ public int getMonsterId() { @@ -65,7 +65,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 monster_id = 10; + * optional uint32 monster_id = 2; * @param value the monsterId to set * @return this */ @@ -76,7 +76,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 3; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 3; * @return this */ public MonsterArchive clearNum() { @@ -94,7 +94,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 3; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class MonsterArchiveOuterClass { } /** - * optional uint32 num = 14; + * optional uint32 num = 3; * @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) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(monsterId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class MonsterArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // monsterId monsterId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 24) { break; } } - case 112: { + case 24: { // 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 5493f13..f876a42 100644 --- a/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/MotionInfoOuterClass.java @@ -19,15 +19,15 @@ public final class MotionInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .Vector rot = 4; - */ - private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); - - /** - * optional .Vector pos = 12; + * optional .Vector pos = 10; */ private final VectorOuterClass.Vector pos = VectorOuterClass.Vector.newInstance(); + /** + * optional .Vector rot = 14; + */ + private final VectorOuterClass.Vector rot = VectorOuterClass.Vector.newInstance(); + private MotionInfo() { } @@ -39,82 +39,25 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector rot = 4; - * @return whether the rot field is set + * optional .Vector pos = 10; + * @return whether the pos field is set */ - public boolean hasRot() { + public boolean hasPos() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .Vector rot = 4; - * @return this - */ - public MotionInfo clearRot() { - bitField0_ &= ~0x00000001; - rot.clear(); - return this; - } - - /** - * optional .Vector rot = 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 #getMutableRot()} if you want to modify it. - * - * @return internal storage object for reading - */ - public VectorOuterClass.Vector getRot() { - return rot; - } - - /** - * optional .Vector rot = 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 VectorOuterClass.Vector getMutableRot() { - bitField0_ |= 0x00000001; - return rot; - } - - /** - * optional .Vector rot = 4; - * @param value the rot to set - * @return this - */ - public MotionInfo setRot(final VectorOuterClass.Vector value) { - bitField0_ |= 0x00000001; - rot.copyFrom(value); - return this; - } - - /** - * optional .Vector pos = 12; - * @return whether the pos field is set - */ - public boolean hasPos() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .Vector pos = 12; + * optional .Vector pos = 10; * @return this */ public MotionInfo clearPos() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; pos.clear(); return this; } /** - * optional .Vector pos = 12; + * optional .Vector pos = 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. @@ -128,7 +71,7 @@ public final class MotionInfoOuterClass { } /** - * optional .Vector pos = 12; + * optional .Vector pos = 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 @@ -137,28 +80,85 @@ public final class MotionInfoOuterClass { * @return internal storage object for modifications */ public VectorOuterClass.Vector getMutablePos() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return pos; } /** - * optional .Vector pos = 12; + * optional .Vector pos = 10; * @param value the pos to set * @return this */ public MotionInfo setPos(final VectorOuterClass.Vector value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; pos.copyFrom(value); return this; } + /** + * optional .Vector rot = 14; + * @return whether the rot field is set + */ + public boolean hasRot() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .Vector rot = 14; + * @return this + */ + public MotionInfo clearRot() { + bitField0_ &= ~0x00000002; + rot.clear(); + return this; + } + + /** + * optional .Vector rot = 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 #getMutableRot()} if you want to modify it. + * + * @return internal storage object for reading + */ + public VectorOuterClass.Vector getRot() { + return rot; + } + + /** + * optional .Vector rot = 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 VectorOuterClass.Vector getMutableRot() { + bitField0_ |= 0x00000002; + return rot; + } + + /** + * optional .Vector rot = 14; + * @param value the rot to set + * @return this + */ + public MotionInfo setRot(final VectorOuterClass.Vector value) { + bitField0_ |= 0x00000002; + rot.copyFrom(value); + return this; + } + @Override public MotionInfo copyFrom(final MotionInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rot.copyFrom(other.rot); pos.copyFrom(other.pos); + rot.copyFrom(other.rot); } return this; } @@ -169,12 +169,12 @@ public final class MotionInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRot()) { - getMutableRot().mergeFrom(other.rot); - } if (other.hasPos()) { getMutablePos().mergeFrom(other.pos); } + if (other.hasRot()) { + getMutableRot().mergeFrom(other.rot); + } return this; } @@ -185,8 +185,8 @@ public final class MotionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rot.clear(); pos.clear(); + rot.clear(); return this; } @@ -197,8 +197,8 @@ public final class MotionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rot.clearQuick(); pos.clearQuick(); + rot.clearQuick(); return this; } @@ -212,19 +212,19 @@ public final class MotionInfoOuterClass { } MotionInfo other = (MotionInfo) o; return bitField0_ == other.bitField0_ - && (!hasRot() || rot.equals(other.rot)) - && (!hasPos() || pos.equals(other.pos)); + && (!hasPos() || pos.equals(other.pos)) + && (!hasRot() || rot.equals(other.rot)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(rot); + output.writeRawByte((byte) 82); + output.writeMessageNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(pos); + output.writeRawByte((byte) 114); + output.writeMessageNoTag(rot); } } @@ -232,10 +232,10 @@ public final class MotionInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rot); + size += 1 + ProtoSink.computeMessageSizeNoTag(pos); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(pos); + size += 1 + ProtoSink.computeMessageSizeNoTag(rot); } return size; } @@ -247,18 +247,18 @@ public final class MotionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { - // rot - input.readMessage(rot); + case 82: { + // pos + input.readMessage(pos); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { - // pos - input.readMessage(pos); + case 114: { + // rot + input.readMessage(rot); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -283,10 +283,10 @@ public final class MotionInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rot, rot); + output.writeMessage(FieldNames.pos, pos); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.pos, pos); + output.writeMessage(FieldNames.rot, rot); } output.endObject(); } @@ -298,10 +298,10 @@ public final class MotionInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 113111: { - if (input.isAtField(FieldNames.rot)) { + case 111188: { + if (input.isAtField(FieldNames.pos)) { if (!input.trySkipNullValue()) { - input.readMessage(rot); + input.readMessage(pos); bitField0_ |= 0x00000001; } } else { @@ -309,10 +309,10 @@ public final class MotionInfoOuterClass { } break; } - case 111188: { - if (input.isAtField(FieldNames.pos)) { + case 113111: { + if (input.isAtField(FieldNames.rot)) { if (!input.trySkipNullValue()) { - input.readMessage(pos); + input.readMessage(rot); bitField0_ |= 0x00000002; } } else { @@ -372,9 +372,9 @@ public final class MotionInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rot = FieldName.forField("rot"); - static final FieldName pos = FieldName.forField("pos"); + + static final FieldName rot = FieldName.forField("rot"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/NewMailScNotifyOuterClass.java index 7371113..655c45a 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 = 8; + * repeated uint32 mail_id_list = 2; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_id_list = 2; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -43,7 +43,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_id_list = 2; * @return this */ public NewMailScNotify clearMailIdList() { @@ -53,7 +53,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_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 NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_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 NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_id_list = 2; * @param value the mailIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class NewMailScNotifyOuterClass { } /** - * repeated uint32 mail_id_list = 8; + * repeated uint32 mail_id_list = 2; * @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) 64); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class NewMailScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 18: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class NewMailScNotifyOuterClass { tag = input.readTag(); break; } - case 64: { + case 16: { // 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 afb3fe1..33acfe8 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 = 6; + * optional .NpcRogueInfo rogue_info = 9; */ private final NpcRogueInfoOuterClass.NpcRogueInfo rogueInfo = NpcRogueInfoOuterClass.NpcRogueInfo.newInstance(); @@ -34,7 +34,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 6; + * optional .NpcRogueInfo rogue_info = 9; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -42,7 +42,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 6; + * optional .NpcRogueInfo rogue_info = 9; * @return this */ public NpcExtraInfo clearRogueInfo() { @@ -52,7 +52,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 6; + * optional .NpcRogueInfo 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. @@ -66,7 +66,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 6; + * optional .NpcRogueInfo 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 @@ -80,7 +80,7 @@ public final class NpcExtraInfoOuterClass { } /** - * optional .NpcRogueInfo rogue_info = 6; + * optional .NpcRogueInfo rogue_info = 9; * @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) 50); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueInfo); } } @@ -171,7 +171,7 @@ public final class NpcExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 50: { + case 74: { // 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 253bc17..95a6c21 100644 --- a/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/NpcRogueInfoOuterClass.java @@ -20,7 +20,7 @@ public final class NpcRogueInfoOuterClass { /** * 
-     *  uint32 KKCPLMGIADL = 3; // useless??
+     *  ???
      *
* * optional uint32 dialogue_group_id = 2; @@ -28,29 +28,29 @@ public final class NpcRogueInfoOuterClass { private int dialogueGroupId; /** - * optional uint32 rogue_npc_id = 15; + * optional uint32 rogue_npc_id = 8; */ private int rogueNpcId; /** - * optional bool AAHKFINCBIL = 1; + * optional bool AAHKFINCBIL = 7; */ private boolean aAHKFINCBIL; - /** - * optional bool LCKILOCIFJH = 10; - */ - private boolean lCKILOCIFJH; - /** * 
      *  unk
      *
* - * optional bool finish_dialogue = 12; + * optional bool finish_dialogue = 10; */ private boolean finishDialogue; + /** + * optional bool LCKILOCIFJH = 15; + */ + private boolean lCKILOCIFJH; + private NpcRogueInfo() { } @@ -63,7 +63,7 @@ public final class NpcRogueInfoOuterClass { /** * 
-     *  uint32 KKCPLMGIADL = 3; // useless??
+     *  ???
      *
* * optional uint32 dialogue_group_id = 2; @@ -75,7 +75,7 @@ public final class NpcRogueInfoOuterClass { /** * 
-     *  uint32 KKCPLMGIADL = 3; // useless??
+     *  ???
      *
* * optional uint32 dialogue_group_id = 2; @@ -89,7 +89,7 @@ public final class NpcRogueInfoOuterClass { /** * 
-     *  uint32 KKCPLMGIADL = 3; // useless??
+     *  ???
      *
* * optional uint32 dialogue_group_id = 2; @@ -101,7 +101,7 @@ public final class NpcRogueInfoOuterClass { /** * 
-     *  uint32 KKCPLMGIADL = 3; // useless??
+     *  ???
      *
* * optional uint32 dialogue_group_id = 2; @@ -115,7 +115,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional uint32 rogue_npc_id = 15; + * optional uint32 rogue_npc_id = 8; * @return whether the rogueNpcId field is set */ public boolean hasRogueNpcId() { @@ -123,7 +123,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional uint32 rogue_npc_id = 15; + * optional uint32 rogue_npc_id = 8; * @return this */ public NpcRogueInfo clearRogueNpcId() { @@ -133,7 +133,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional uint32 rogue_npc_id = 15; + * optional uint32 rogue_npc_id = 8; * @return the rogueNpcId */ public int getRogueNpcId() { @@ -141,7 +141,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional uint32 rogue_npc_id = 15; + * optional uint32 rogue_npc_id = 8; * @param value the rogueNpcId to set * @return this */ @@ -152,7 +152,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool AAHKFINCBIL = 1; + * optional bool AAHKFINCBIL = 7; * @return whether the aAHKFINCBIL field is set */ public boolean hasAAHKFINCBIL() { @@ -160,7 +160,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool AAHKFINCBIL = 1; + * optional bool AAHKFINCBIL = 7; * @return this */ public NpcRogueInfo clearAAHKFINCBIL() { @@ -170,7 +170,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool AAHKFINCBIL = 1; + * optional bool AAHKFINCBIL = 7; * @return the aAHKFINCBIL */ public boolean getAAHKFINCBIL() { @@ -178,7 +178,7 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool AAHKFINCBIL = 1; + * optional bool AAHKFINCBIL = 7; * @param value the aAHKFINCBIL to set * @return this */ @@ -189,64 +189,27 @@ public final class NpcRogueInfoOuterClass { } /** - * optional bool LCKILOCIFJH = 10; - * @return whether the lCKILOCIFJH field is set + * 
+     *  unk
+     *
+ * + * optional bool finish_dialogue = 10; + * @return whether the finishDialogue field is set */ - public boolean hasLCKILOCIFJH() { + public boolean hasFinishDialogue() { return (bitField0_ & 0x00000008) != 0; } - /** - * optional bool LCKILOCIFJH = 10; - * @return this - */ - public NpcRogueInfo clearLCKILOCIFJH() { - bitField0_ &= ~0x00000008; - lCKILOCIFJH = false; - return this; - } - - /** - * optional bool LCKILOCIFJH = 10; - * @return the lCKILOCIFJH - */ - public boolean getLCKILOCIFJH() { - return lCKILOCIFJH; - } - - /** - * optional bool LCKILOCIFJH = 10; - * @param value the lCKILOCIFJH to set - * @return this - */ - public NpcRogueInfo setLCKILOCIFJH(final boolean value) { - bitField0_ |= 0x00000008; - lCKILOCIFJH = value; - return this; - } - /** * 
      *  unk
      *
* - * optional bool finish_dialogue = 12; - * @return whether the finishDialogue field is set - */ - public boolean hasFinishDialogue() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * 
-     *  unk
-     *
- * - * optional bool finish_dialogue = 12; + * optional bool finish_dialogue = 10; * @return this */ public NpcRogueInfo clearFinishDialogue() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; finishDialogue = false; return this; } @@ -256,7 +219,7 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 12; + * optional bool finish_dialogue = 10; * @return the finishDialogue */ public boolean getFinishDialogue() { @@ -268,16 +231,53 @@ public final class NpcRogueInfoOuterClass { * unk * * - * optional bool finish_dialogue = 12; + * optional bool finish_dialogue = 10; * @param value the finishDialogue to set * @return this */ public NpcRogueInfo setFinishDialogue(final boolean value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; finishDialogue = value; return this; } + /** + * optional bool LCKILOCIFJH = 15; + * @return whether the lCKILOCIFJH field is set + */ + public boolean hasLCKILOCIFJH() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional bool LCKILOCIFJH = 15; + * @return this + */ + public NpcRogueInfo clearLCKILOCIFJH() { + bitField0_ &= ~0x00000010; + lCKILOCIFJH = false; + return this; + } + + /** + * optional bool LCKILOCIFJH = 15; + * @return the lCKILOCIFJH + */ + public boolean getLCKILOCIFJH() { + return lCKILOCIFJH; + } + + /** + * optional bool LCKILOCIFJH = 15; + * @param value the lCKILOCIFJH to set + * @return this + */ + public NpcRogueInfo setLCKILOCIFJH(final boolean value) { + bitField0_ |= 0x00000010; + lCKILOCIFJH = value; + return this; + } + @Override public NpcRogueInfo copyFrom(final NpcRogueInfo other) { cachedSize = other.cachedSize; @@ -286,8 +286,8 @@ public final class NpcRogueInfoOuterClass { dialogueGroupId = other.dialogueGroupId; rogueNpcId = other.rogueNpcId; aAHKFINCBIL = other.aAHKFINCBIL; - lCKILOCIFJH = other.lCKILOCIFJH; finishDialogue = other.finishDialogue; + lCKILOCIFJH = other.lCKILOCIFJH; } return this; } @@ -307,12 +307,12 @@ public final class NpcRogueInfoOuterClass { if (other.hasAAHKFINCBIL()) { setAAHKFINCBIL(other.aAHKFINCBIL); } - if (other.hasLCKILOCIFJH()) { - setLCKILOCIFJH(other.lCKILOCIFJH); - } if (other.hasFinishDialogue()) { setFinishDialogue(other.finishDialogue); } + if (other.hasLCKILOCIFJH()) { + setLCKILOCIFJH(other.lCKILOCIFJH); + } return this; } @@ -326,8 +326,8 @@ public final class NpcRogueInfoOuterClass { dialogueGroupId = 0; rogueNpcId = 0; aAHKFINCBIL = false; - lCKILOCIFJH = false; finishDialogue = false; + lCKILOCIFJH = false; return this; } @@ -354,8 +354,8 @@ public final class NpcRogueInfoOuterClass { && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasRogueNpcId() || rogueNpcId == other.rogueNpcId) && (!hasAAHKFINCBIL() || aAHKFINCBIL == other.aAHKFINCBIL) - && (!hasLCKILOCIFJH() || lCKILOCIFJH == other.lCKILOCIFJH) - && (!hasFinishDialogue() || finishDialogue == other.finishDialogue); + && (!hasFinishDialogue() || finishDialogue == other.finishDialogue) + && (!hasLCKILOCIFJH() || lCKILOCIFJH == other.lCKILOCIFJH); } @Override @@ -365,20 +365,20 @@ public final class NpcRogueInfoOuterClass { output.writeUInt32NoTag(dialogueGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(rogueNpcId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 56); output.writeBoolNoTag(aAHKFINCBIL); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 80); - output.writeBoolNoTag(lCKILOCIFJH); + output.writeBoolNoTag(finishDialogue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 96); - output.writeBoolNoTag(finishDialogue); + output.writeRawByte((byte) 120); + output.writeBoolNoTag(lCKILOCIFJH); } } @@ -415,20 +415,20 @@ public final class NpcRogueInfoOuterClass { dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 64) { break; } } - case 120: { + case 64: { // rogueNpcId rogueNpcId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 8) { + if (tag != 56) { break; } } - case 8: { + case 56: { // aAHKFINCBIL aAHKFINCBIL = input.readBool(); bitField0_ |= 0x00000004; @@ -438,17 +438,17 @@ public final class NpcRogueInfoOuterClass { } } case 80: { - // lCKILOCIFJH - lCKILOCIFJH = input.readBool(); + // finishDialogue + finishDialogue = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 120) { break; } } - case 96: { - // finishDialogue - finishDialogue = input.readBool(); + case 120: { + // lCKILOCIFJH + lCKILOCIFJH = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -482,10 +482,10 @@ public final class NpcRogueInfoOuterClass { output.writeBool(FieldNames.aAHKFINCBIL, aAHKFINCBIL); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.lCKILOCIFJH, lCKILOCIFJH); + output.writeBool(FieldNames.finishDialogue, finishDialogue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.finishDialogue, finishDialogue); + output.writeBool(FieldNames.lCKILOCIFJH, lCKILOCIFJH); } output.endObject(); } @@ -532,10 +532,11 @@ public final class NpcRogueInfoOuterClass { } break; } - case 1901777798: { - if (input.isAtField(FieldNames.lCKILOCIFJH)) { + case 552830859: + case 764736516: { + if (input.isAtField(FieldNames.finishDialogue)) { if (!input.trySkipNullValue()) { - lCKILOCIFJH = input.readBool(); + finishDialogue = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -543,11 +544,10 @@ public final class NpcRogueInfoOuterClass { } break; } - case 552830859: - case 764736516: { - if (input.isAtField(FieldNames.finishDialogue)) { + case 1901777798: { + if (input.isAtField(FieldNames.lCKILOCIFJH)) { if (!input.trySkipNullValue()) { - finishDialogue = input.readBool(); + lCKILOCIFJH = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -613,9 +613,9 @@ public final class NpcRogueInfoOuterClass { static final FieldName aAHKFINCBIL = FieldName.forField("AAHKFINCBIL"); - static final FieldName lCKILOCIFJH = FieldName.forField("LCKILOCIFJH"); - static final FieldName finishDialogue = FieldName.forField("finishDialogue", "finish_dialogue"); + + static final FieldName lCKILOCIFJH = FieldName.forField("LCKILOCIFJH"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/NpcTalkInfoOuterClass.java index 56d0a9c..9e746b4 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 = 6; + * optional uint32 npc_talk_id = 14; */ private int npcTalkId; @@ -34,7 +34,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 6; + * optional uint32 npc_talk_id = 14; * @return whether the npcTalkId field is set */ public boolean hasNpcTalkId() { @@ -42,7 +42,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 6; + * optional uint32 npc_talk_id = 14; * @return this */ public NpcTalkInfo clearNpcTalkId() { @@ -52,7 +52,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 6; + * optional uint32 npc_talk_id = 14; * @return the npcTalkId */ public int getNpcTalkId() { @@ -60,7 +60,7 @@ public final class NpcTalkInfoOuterClass { } /** - * optional uint32 npc_talk_id = 6; + * optional uint32 npc_talk_id = 14; * @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) 48); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(npcTalkId); } } @@ -150,7 +150,7 @@ public final class NpcTalkInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 112: { // 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 6d116f8..4ed8a48 100644 --- a/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PVEBattleResultCsReqOuterClass.java @@ -21,47 +21,47 @@ public final class PVEBattleResultCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 2; - */ - private int stageId; - - /** - * optional uint32 cost_time = 5; - */ - private int costTime; - - /** - * optional uint32 battle_id = 8; - */ - private int battleId; - - /** - * optional uint32 client_res_version = 10; + * optional uint32 client_res_version = 5; */ private int clientResVersion; /** - * optional .BattleEndStatus end_status = 7; + * optional uint32 stage_id = 8; + */ + private int stageId; + + /** + * optional uint32 battle_id = 11; + */ + private int battleId; + + /** + * optional uint32 cost_time = 13; + */ + private int costTime; + + /** + * optional .BattleEndStatus end_status = 15; */ private int endStatus; /** - * optional bool is_ai_consider_ultra_skill = 11; + * optional bool is_ai_consider_ultra_skill = 10; */ private boolean isAiConsiderUltraSkill; /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 14; */ private final BattleStatisticsOuterClass.BattleStatistics stt = BattleStatisticsOuterClass.BattleStatistics.newInstance(); /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; */ private final RepeatedByte turnSnapshotHash = RepeatedByte.newEmptyInstance(); /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_list = 12; */ private final RepeatedMessage opList = RepeatedMessage.newEmptyInstance(BattleOpOuterClass.BattleOp.getFactory()); @@ -76,25 +76,62 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 2; - * @return whether the stageId field is set + * optional uint32 client_res_version = 5; + * @return whether the clientResVersion field is set */ - public boolean hasStageId() { + public boolean hasClientResVersion() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 2; + * optional uint32 client_res_version = 5; + * @return this + */ + public PVEBattleResultCsReq clearClientResVersion() { + bitField0_ &= ~0x00000001; + clientResVersion = 0; + return this; + } + + /** + * optional uint32 client_res_version = 5; + * @return the clientResVersion + */ + public int getClientResVersion() { + return clientResVersion; + } + + /** + * optional uint32 client_res_version = 5; + * @param value the clientResVersion to set + * @return this + */ + public PVEBattleResultCsReq setClientResVersion(final int value) { + bitField0_ |= 0x00000001; + clientResVersion = value; + return this; + } + + /** + * optional uint32 stage_id = 8; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 stage_id = 8; * @return this */ public PVEBattleResultCsReq clearStageId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; stageId = 0; return this; } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 8; * @return the stageId */ public int getStageId() { @@ -102,55 +139,18 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 stage_id = 2; + * optional uint32 stage_id = 8; * @param value the stageId to set * @return this */ public PVEBattleResultCsReq setStageId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; stageId = value; return this; } /** - * optional uint32 cost_time = 5; - * @return whether the costTime field is set - */ - public boolean hasCostTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cost_time = 5; - * @return this - */ - public PVEBattleResultCsReq clearCostTime() { - bitField0_ &= ~0x00000002; - costTime = 0; - return this; - } - - /** - * optional uint32 cost_time = 5; - * @return the costTime - */ - public int getCostTime() { - return costTime; - } - - /** - * optional uint32 cost_time = 5; - * @param value the costTime to set - * @return this - */ - public PVEBattleResultCsReq setCostTime(final int value) { - bitField0_ |= 0x00000002; - costTime = value; - return this; - } - - /** - * optional uint32 battle_id = 8; + * optional uint32 battle_id = 11; * @return whether the battleId field is set */ public boolean hasBattleId() { @@ -158,7 +158,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 8; + * optional uint32 battle_id = 11; * @return this */ public PVEBattleResultCsReq clearBattleId() { @@ -168,7 +168,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 8; + * optional uint32 battle_id = 11; * @return the battleId */ public int getBattleId() { @@ -176,7 +176,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 battle_id = 8; + * optional uint32 battle_id = 11; * @param value the battleId to set * @return this */ @@ -187,44 +187,44 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional uint32 client_res_version = 10; - * @return whether the clientResVersion field is set + * optional uint32 cost_time = 13; + * @return whether the costTime field is set */ - public boolean hasClientResVersion() { + public boolean hasCostTime() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 client_res_version = 10; + * optional uint32 cost_time = 13; * @return this */ - public PVEBattleResultCsReq clearClientResVersion() { + public PVEBattleResultCsReq clearCostTime() { bitField0_ &= ~0x00000008; - clientResVersion = 0; + costTime = 0; return this; } /** - * optional uint32 client_res_version = 10; - * @return the clientResVersion + * optional uint32 cost_time = 13; + * @return the costTime */ - public int getClientResVersion() { - return clientResVersion; + public int getCostTime() { + return costTime; } /** - * optional uint32 client_res_version = 10; - * @param value the clientResVersion to set + * optional uint32 cost_time = 13; + * @param value the costTime to set * @return this */ - public PVEBattleResultCsReq setClientResVersion(final int value) { + public PVEBattleResultCsReq setCostTime(final int value) { bitField0_ |= 0x00000008; - clientResVersion = value; + costTime = value; return this; } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 15; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -232,7 +232,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 15; * @return this */ public PVEBattleResultCsReq clearEndStatus() { @@ -242,7 +242,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 15; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -275,7 +275,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleEndStatus end_status = 7; + * optional .BattleEndStatus end_status = 15; * @param value the endStatus to set * @return this */ @@ -287,7 +287,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 11; + * optional bool is_ai_consider_ultra_skill = 10; * @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 = 11; + * optional bool is_ai_consider_ultra_skill = 10; * @return this */ public PVEBattleResultCsReq clearIsAiConsiderUltraSkill() { @@ -305,7 +305,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 11; + * optional bool is_ai_consider_ultra_skill = 10; * @return the isAiConsiderUltraSkill */ public boolean getIsAiConsiderUltraSkill() { @@ -313,7 +313,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bool is_ai_consider_ultra_skill = 11; + * optional bool is_ai_consider_ultra_skill = 10; * @param value the isAiConsiderUltraSkill to set * @return this */ @@ -324,7 +324,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 14; * @return whether the stt field is set */ public boolean hasStt() { @@ -332,7 +332,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 14; * @return this */ public PVEBattleResultCsReq clearStt() { @@ -342,7 +342,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 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. @@ -356,7 +356,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 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 @@ -370,7 +370,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional .BattleStatistics stt = 13; + * optional .BattleStatistics stt = 14; * @param value the stt to set * @return this */ @@ -381,7 +381,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; * @return whether the turnSnapshotHash field is set */ public boolean hasTurnSnapshotHash() { @@ -389,7 +389,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; * @return this */ public PVEBattleResultCsReq clearTurnSnapshotHash() { @@ -399,7 +399,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 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. @@ -413,7 +413,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 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 @@ -427,7 +427,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; * @param value the turnSnapshotHash to add * @return this */ @@ -438,7 +438,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; * @param values the turnSnapshotHash to add * @return this */ @@ -449,7 +449,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * optional bytes turn_snapshot_hash = 14; + * optional bytes turn_snapshot_hash = 1; * @param values the turnSnapshotHash to set * @return this */ @@ -460,7 +460,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_list = 12; * @return whether the opList field is set */ public boolean hasOpList() { @@ -468,7 +468,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_list = 12; * @return this */ public PVEBattleResultCsReq clearOpList() { @@ -478,7 +478,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_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. @@ -492,7 +492,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_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 @@ -506,7 +506,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_list = 12; * @param value the opList to add * @return this */ @@ -517,7 +517,7 @@ public final class PVEBattleResultCsReqOuterClass { } /** - * repeated .BattleOp op_list = 6; + * repeated .BattleOp op_list = 12; * @param values the opList to add * @return this */ @@ -532,10 +532,10 @@ public final class PVEBattleResultCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stageId = other.stageId; - costTime = other.costTime; - battleId = other.battleId; clientResVersion = other.clientResVersion; + stageId = other.stageId; + battleId = other.battleId; + costTime = other.costTime; endStatus = other.endStatus; isAiConsiderUltraSkill = other.isAiConsiderUltraSkill; stt.copyFrom(other.stt); @@ -551,17 +551,17 @@ public final class PVEBattleResultCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasClientResVersion()) { + setClientResVersion(other.clientResVersion); + } if (other.hasStageId()) { setStageId(other.stageId); } - if (other.hasCostTime()) { - setCostTime(other.costTime); - } if (other.hasBattleId()) { setBattleId(other.battleId); } - if (other.hasClientResVersion()) { - setClientResVersion(other.clientResVersion); + if (other.hasCostTime()) { + setCostTime(other.costTime); } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); @@ -588,10 +588,10 @@ public final class PVEBattleResultCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - stageId = 0; - costTime = 0; - battleId = 0; clientResVersion = 0; + stageId = 0; + battleId = 0; + costTime = 0; endStatus = 0; isAiConsiderUltraSkill = false; stt.clear(); @@ -623,10 +623,10 @@ public final class PVEBattleResultCsReqOuterClass { } PVEBattleResultCsReq other = (PVEBattleResultCsReq) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) - && (!hasCostTime() || costTime == other.costTime) - && (!hasBattleId() || battleId == other.battleId) && (!hasClientResVersion() || clientResVersion == other.clientResVersion) + && (!hasStageId() || stageId == other.stageId) + && (!hasBattleId() || battleId == other.battleId) + && (!hasCostTime() || costTime == other.costTime) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasIsAiConsiderUltraSkill() || isAiConsiderUltraSkill == other.isAiConsiderUltraSkill) && (!hasStt() || stt.equals(other.stt)) @@ -637,40 +637,40 @@ public final class PVEBattleResultCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(stageId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(costTime); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(battleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(clientResVersion); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(costTime); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isAiConsiderUltraSkill); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 114); output.writeMessageNoTag(stt); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 10); output.writeBytesNoTag(turnSnapshotHash); } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < opList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(opList.get(i)); } } @@ -680,16 +680,16 @@ public final class PVEBattleResultCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientResVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(costTime); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); @@ -716,43 +716,43 @@ public final class PVEBattleResultCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } case 40: { - // costTime - costTime = input.readUInt32(); - bitField0_ |= 0x00000002; + // clientResVersion + clientResVersion = input.readUInt32(); + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 64) { break; } } case 64: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { // battleId battleId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 104) { break; } } - case 80: { - // clientResVersion - clientResVersion = input.readUInt32(); + case 104: { + // costTime + costTime = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { + case 120: { // 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 != 88) { + if (tag != 80) { break; } } - case 88: { + case 80: { // isAiConsiderUltraSkill isAiConsiderUltraSkill = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // stt - input.readMessage(stt); - bitField0_ |= 0x00000040; - tag = input.readTag(); if (tag != 114) { break; } } case 114: { + // stt + input.readMessage(stt); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // turnSnapshotHash input.readBytes(turnSnapshotHash); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 50) { + if (tag != 98) { break; } } - case 50: { + case 98: { // opList tag = input.readRepeatedMessage(opList, tag); bitField0_ |= 0x00000100; @@ -817,16 +817,16 @@ public final class PVEBattleResultCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.clientResVersion, clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.costTime, costTime); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.battleId, battleId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.clientResVersion, clientResVersion); + output.writeUInt32(FieldNames.costTime, costTime); } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); @@ -853,11 +853,11 @@ public final class PVEBattleResultCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -2005674429: + case -349907515: { + if (input.isAtField(FieldNames.clientResVersion)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -865,11 +865,11 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -424687558: - case -269929473: { - if (input.isAtField(FieldNames.costTime)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - costTime = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -889,11 +889,11 @@ public final class PVEBattleResultCsReqOuterClass { } break; } - case -2005674429: - case -349907515: { - if (input.isAtField(FieldNames.clientResVersion)) { + case -424687558: + case -269929473: { + if (input.isAtField(FieldNames.costTime)) { if (!input.trySkipNullValue()) { - clientResVersion = input.readUInt32(); + costTime = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -1018,13 +1018,13 @@ public final class PVEBattleResultCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName clientResVersion = FieldName.forField("clientResVersion", "client_res_version"); - static final FieldName costTime = FieldName.forField("costTime", "cost_time"); + 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"); static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); diff --git a/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PVEBattleResultScRspOuterClass.java index c77cbc4..d1078e1 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 battle_id = 6; - */ - private int battleId; - - /** - * optional uint32 stage_id = 9; - */ - private int stageId; - - /** - * optional uint32 retcode = 10; - */ - private int retcode; - - /** - * optional uint32 event_id = 12; + * optional uint32 event_id = 2; */ private int eventId; /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 battle_id = 4; + */ + private int battleId; + + /** + * optional uint32 mismatch_turn_count = 6; */ private int mismatchTurnCount; /** - * optional .BattleEndStatus end_status = 13; + * optional uint32 stage_id = 7; + */ + private int stageId; + + /** + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional .BattleEndStatus end_status = 11; */ private int endStatus; /** - * optional bool check_identical = 1; + * optional bool check_identical = 8; */ private boolean checkIdentical; /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; */ private final ItemListOuterClass.ItemList dropData = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 3; */ private final ItemListOuterClass.ItemList unk1 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 10; */ private final ItemListOuterClass.ItemList unk2 = ItemListOuterClass.ItemList.newInstance(); /** - * optional .ItemList unk3 = 588; + * optional .ItemList unk3 = 253; */ private final ItemListOuterClass.ItemList unk3 = ItemListOuterClass.ItemList.newInstance(); /** - * optional string bin_version = 3; - */ - private final Utf8String binVersion = Utf8String.newEmptyInstance(); - - /** - * optional string res_version = 8; + * optional string res_version = 5; */ private final Utf8String resVersion = Utf8String.newEmptyInstance(); /** - * repeated .BattleAvatar battle_avatar_list = 7; + * optional string bin_version = 13; + */ + private final Utf8String binVersion = Utf8String.newEmptyInstance(); + + /** + * repeated .BattleAvatar battle_avatar_list = 15; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); @@ -101,136 +101,25 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 battle_id = 6; - * @return whether the battleId field is set + * optional uint32 event_id = 2; + * @return whether the eventId field is set */ - public boolean hasBattleId() { + public boolean hasEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 battle_id = 6; - * @return this - */ - public PVEBattleResultScRsp clearBattleId() { - bitField0_ &= ~0x00000001; - battleId = 0; - return this; - } - - /** - * optional uint32 battle_id = 6; - * @return the battleId - */ - public int getBattleId() { - return battleId; - } - - /** - * optional uint32 battle_id = 6; - * @param value the battleId to set - * @return this - */ - public PVEBattleResultScRsp setBattleId(final int value) { - bitField0_ |= 0x00000001; - battleId = value; - return this; - } - - /** - * optional uint32 stage_id = 9; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 9; - * @return this - */ - public PVEBattleResultScRsp clearStageId() { - bitField0_ &= ~0x00000002; - stageId = 0; - return this; - } - - /** - * optional uint32 stage_id = 9; - * @return the stageId - */ - public int getStageId() { - return stageId; - } - - /** - * optional uint32 stage_id = 9; - * @param value the stageId to set - * @return this - */ - public PVEBattleResultScRsp setStageId(final int value) { - bitField0_ |= 0x00000002; - stageId = value; - return this; - } - - /** - * optional uint32 retcode = 10; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 10; - * @return this - */ - public PVEBattleResultScRsp clearRetcode() { - bitField0_ &= ~0x00000004; - 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 PVEBattleResultScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; - retcode = value; - return this; - } - - /** - * optional uint32 event_id = 12; - * @return whether the eventId field is set - */ - public boolean hasEventId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 event_id = 12; + * optional uint32 event_id = 2; * @return this */ public PVEBattleResultScRsp clearEventId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; eventId = 0; return this; } /** - * optional uint32 event_id = 12; + * optional uint32 event_id = 2; * @return the eventId */ public int getEventId() { @@ -238,36 +127,73 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 event_id = 12; + * optional uint32 event_id = 2; * @param value the eventId to set * @return this */ public PVEBattleResultScRsp setEventId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; eventId = value; return this; } /** - * optional uint32 mismatch_turn_count = 15; - * @return whether the mismatchTurnCount field is set + * optional uint32 battle_id = 4; + * @return whether the battleId field is set */ - public boolean hasMismatchTurnCount() { - return (bitField0_ & 0x00000010) != 0; + public boolean hasBattleId() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 mismatch_turn_count = 15; + * 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; * @return this */ public PVEBattleResultScRsp clearMismatchTurnCount() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; mismatchTurnCount = 0; return this; } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 6; * @return the mismatchTurnCount */ public int getMismatchTurnCount() { @@ -275,18 +201,92 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional uint32 mismatch_turn_count = 15; + * optional uint32 mismatch_turn_count = 6; * @param value the mismatchTurnCount to set * @return this */ public PVEBattleResultScRsp setMismatchTurnCount(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; mismatchTurnCount = value; return this; } /** - * optional .BattleEndStatus end_status = 13; + * optional uint32 stage_id = 7; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stage_id = 7; + * @return this + */ + public PVEBattleResultScRsp clearStageId() { + bitField0_ &= ~0x00000008; + stageId = 0; + return this; + } + + /** + * optional uint32 stage_id = 7; + * @return the stageId + */ + public int getStageId() { + return stageId; + } + + /** + * optional uint32 stage_id = 7; + * @param value the stageId to set + * @return this + */ + public PVEBattleResultScRsp setStageId(final int value) { + bitField0_ |= 0x00000008; + stageId = value; + return this; + } + + /** + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public PVEBattleResultScRsp clearRetcode() { + bitField0_ &= ~0x00000010; + 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 PVEBattleResultScRsp setRetcode(final int value) { + bitField0_ |= 0x00000010; + retcode = value; + return this; + } + + /** + * optional .BattleEndStatus end_status = 11; * @return whether the endStatus field is set */ public boolean hasEndStatus() { @@ -294,7 +294,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 13; + * optional .BattleEndStatus end_status = 11; * @return this */ public PVEBattleResultScRsp clearEndStatus() { @@ -304,7 +304,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 13; + * optional .BattleEndStatus end_status = 11; * @return the endStatus */ public BattleEndStatusOuterClass.BattleEndStatus getEndStatus() { @@ -337,7 +337,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .BattleEndStatus end_status = 13; + * optional .BattleEndStatus end_status = 11; * @param value the endStatus to set * @return this */ @@ -349,7 +349,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 8; * @return whether the checkIdentical field is set */ public boolean hasCheckIdentical() { @@ -357,7 +357,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 8; * @return this */ public PVEBattleResultScRsp clearCheckIdentical() { @@ -367,7 +367,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 8; * @return the checkIdentical */ public boolean getCheckIdentical() { @@ -375,7 +375,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional bool check_identical = 1; + * optional bool check_identical = 8; * @param value the checkIdentical to set * @return this */ @@ -386,7 +386,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @return whether the dropData field is set */ public boolean hasDropData() { @@ -394,7 +394,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @return this */ public PVEBattleResultScRsp clearDropData() { @@ -404,7 +404,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * 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. @@ -418,7 +418,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * 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 @@ -432,7 +432,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList drop_data = 2; + * optional .ItemList drop_data = 1; * @param value the dropData to set * @return this */ @@ -443,7 +443,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 3; * @return whether the unk1 field is set */ public boolean hasUnk1() { @@ -451,7 +451,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 3; * @return this */ public PVEBattleResultScRsp clearUnk1() { @@ -461,7 +461,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 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. @@ -475,7 +475,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 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 @@ -489,7 +489,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk1 = 4; + * optional .ItemList unk1 = 3; * @param value the unk1 to set * @return this */ @@ -500,7 +500,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 10; * @return whether the unk2 field is set */ public boolean hasUnk2() { @@ -508,7 +508,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 10; * @return this */ public PVEBattleResultScRsp clearUnk2() { @@ -518,7 +518,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 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. @@ -532,7 +532,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 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 @@ -546,7 +546,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk2 = 14; + * optional .ItemList unk2 = 10; * @param value the unk2 to set * @return this */ @@ -557,7 +557,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 588; + * optional .ItemList unk3 = 253; * @return whether the unk3 field is set */ public boolean hasUnk3() { @@ -565,7 +565,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 588; + * optional .ItemList unk3 = 253; * @return this */ public PVEBattleResultScRsp clearUnk3() { @@ -575,7 +575,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional .ItemList unk3 = 588; + * optional .ItemList unk3 = 253; * * This 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 = 588; + * optional .ItemList unk3 = 253; * * 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 = 588; + * optional .ItemList unk3 = 253; * @param value the unk3 to set * @return this */ @@ -614,90 +614,25 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string bin_version = 3; - * @return whether the binVersion field is set + * optional string res_version = 5; + * @return whether the resVersion field is set */ - public boolean hasBinVersion() { + public boolean hasResVersion() { return (bitField0_ & 0x00000800) != 0; } /** - * optional string bin_version = 3; - * @return this - */ - public PVEBattleResultScRsp clearBinVersion() { - bitField0_ &= ~0x00000800; - binVersion.clear(); - return this; - } - - /** - * optional string bin_version = 3; - * @return the binVersion - */ - public String getBinVersion() { - return binVersion.getString(); - } - - /** - * optional string bin_version = 3; - * @return internal {@code Utf8String} representation of binVersion for reading - */ - public Utf8String getBinVersionBytes() { - return this.binVersion; - } - - /** - * optional string bin_version = 3; - * @return internal {@code Utf8String} representation of binVersion for modifications - */ - public Utf8String getMutableBinVersionBytes() { - bitField0_ |= 0x00000800; - return this.binVersion; - } - - /** - * optional string bin_version = 3; - * @param value the binVersion to set - * @return this - */ - public PVEBattleResultScRsp setBinVersion(final CharSequence value) { - bitField0_ |= 0x00000800; - binVersion.copyFrom(value); - return this; - } - - /** - * optional string bin_version = 3; - * @param value the binVersion to set - * @return this - */ - public PVEBattleResultScRsp setBinVersion(final Utf8String value) { - bitField0_ |= 0x00000800; - binVersion.copyFrom(value); - return this; - } - - /** - * optional string res_version = 8; - * @return whether the resVersion field is set - */ - public boolean hasResVersion() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * optional string res_version = 8; + * optional string res_version = 5; * @return this */ public PVEBattleResultScRsp clearResVersion() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00000800; resVersion.clear(); return this; } /** - * optional string res_version = 8; + * optional string res_version = 5; * @return the resVersion */ public String getResVersion() { @@ -705,7 +640,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 8; + * optional string res_version = 5; * @return internal {@code Utf8String} representation of resVersion for reading */ public Utf8String getResVersionBytes() { @@ -713,38 +648,103 @@ public final class PVEBattleResultScRspOuterClass { } /** - * optional string res_version = 8; + * optional string res_version = 5; * @return internal {@code Utf8String} representation of resVersion for modifications */ public Utf8String getMutableResVersionBytes() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this.resVersion; } /** - * optional string res_version = 8; + * optional string res_version = 5; * @param value the resVersion to set * @return this */ public PVEBattleResultScRsp setResVersion(final CharSequence value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; resVersion.copyFrom(value); return this; } /** - * optional string res_version = 8; + * optional string res_version = 5; * @param value the resVersion to set * @return this */ public PVEBattleResultScRsp setResVersion(final Utf8String value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; resVersion.copyFrom(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * optional string bin_version = 13; + * @return whether the binVersion field is set + */ + public boolean hasBinVersion() { + return (bitField0_ & 0x00001000) != 0; + } + + /** + * optional string bin_version = 13; + * @return this + */ + public PVEBattleResultScRsp clearBinVersion() { + bitField0_ &= ~0x00001000; + binVersion.clear(); + return this; + } + + /** + * optional string bin_version = 13; + * @return the binVersion + */ + public String getBinVersion() { + return binVersion.getString(); + } + + /** + * optional string bin_version = 13; + * @return internal {@code Utf8String} representation of binVersion for reading + */ + public Utf8String getBinVersionBytes() { + return this.binVersion; + } + + /** + * optional string bin_version = 13; + * @return internal {@code Utf8String} representation of binVersion for modifications + */ + public Utf8String getMutableBinVersionBytes() { + bitField0_ |= 0x00001000; + return this.binVersion; + } + + /** + * optional string bin_version = 13; + * @param value the binVersion to set + * @return this + */ + public PVEBattleResultScRsp setBinVersion(final CharSequence value) { + bitField0_ |= 0x00001000; + binVersion.copyFrom(value); + return this; + } + + /** + * optional string bin_version = 13; + * @param value the binVersion to set + * @return this + */ + public PVEBattleResultScRsp setBinVersion(final Utf8String value) { + bitField0_ |= 0x00001000; + binVersion.copyFrom(value); + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 15; * @return whether the battleAvatarList field is set */ public boolean hasBattleAvatarList() { @@ -752,7 +752,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 15; * @return this */ public PVEBattleResultScRsp clearBattleAvatarList() { @@ -762,7 +762,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * 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. @@ -776,7 +776,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * 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 @@ -790,7 +790,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 15; * @param value the battleAvatarList to add * @return this */ @@ -802,7 +802,7 @@ public final class PVEBattleResultScRspOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 7; + * repeated .BattleAvatar battle_avatar_list = 15; * @param values the battleAvatarList to add * @return this */ @@ -818,19 +818,19 @@ public final class PVEBattleResultScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + eventId = other.eventId; battleId = other.battleId; + mismatchTurnCount = other.mismatchTurnCount; stageId = other.stageId; retcode = other.retcode; - eventId = other.eventId; - mismatchTurnCount = other.mismatchTurnCount; endStatus = other.endStatus; checkIdentical = other.checkIdentical; dropData.copyFrom(other.dropData); unk1.copyFrom(other.unk1); unk2.copyFrom(other.unk2); unk3.copyFrom(other.unk3); - binVersion.copyFrom(other.binVersion); resVersion.copyFrom(other.resVersion); + binVersion.copyFrom(other.binVersion); battleAvatarList.copyFrom(other.battleAvatarList); } return this; @@ -842,21 +842,21 @@ 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.hasStageId()) { setStageId(other.stageId); } if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasEventId()) { - setEventId(other.eventId); - } - if (other.hasMismatchTurnCount()) { - setMismatchTurnCount(other.mismatchTurnCount); - } if (other.hasEndStatus()) { setEndStatusValue(other.endStatus); } @@ -875,12 +875,12 @@ public final class PVEBattleResultScRspOuterClass { if (other.hasUnk3()) { getMutableUnk3().mergeFrom(other.unk3); } - if (other.hasBinVersion()) { - getMutableBinVersionBytes().copyFrom(other.binVersion); - } if (other.hasResVersion()) { getMutableResVersionBytes().copyFrom(other.resVersion); } + if (other.hasBinVersion()) { + getMutableBinVersionBytes().copyFrom(other.binVersion); + } if (other.hasBattleAvatarList()) { getMutableBattleAvatarList().addAll(other.battleAvatarList); } @@ -894,19 +894,19 @@ public final class PVEBattleResultScRspOuterClass { } cachedSize = -1; bitField0_ = 0; + eventId = 0; battleId = 0; + mismatchTurnCount = 0; stageId = 0; retcode = 0; - eventId = 0; - mismatchTurnCount = 0; endStatus = 0; checkIdentical = false; dropData.clear(); unk1.clear(); unk2.clear(); unk3.clear(); - binVersion.clear(); resVersion.clear(); + binVersion.clear(); battleAvatarList.clear(); return this; } @@ -922,8 +922,8 @@ public final class PVEBattleResultScRspOuterClass { unk1.clearQuick(); unk2.clearQuick(); unk3.clearQuick(); - binVersion.clear(); resVersion.clear(); + binVersion.clear(); battleAvatarList.clearQuick(); return this; } @@ -938,79 +938,79 @@ public final class PVEBattleResultScRspOuterClass { } PVEBattleResultScRsp other = (PVEBattleResultScRsp) o; return bitField0_ == other.bitField0_ + && (!hasEventId() || eventId == other.eventId) && (!hasBattleId() || battleId == other.battleId) + && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) && (!hasStageId() || stageId == other.stageId) && (!hasRetcode() || retcode == other.retcode) - && (!hasEventId() || eventId == other.eventId) - && (!hasMismatchTurnCount() || mismatchTurnCount == other.mismatchTurnCount) && (!hasEndStatus() || endStatus == other.endStatus) && (!hasCheckIdentical() || checkIdentical == other.checkIdentical) && (!hasDropData() || dropData.equals(other.dropData)) && (!hasUnk1() || unk1.equals(other.unk1)) && (!hasUnk2() || unk2.equals(other.unk2)) && (!hasUnk3() || unk3.equals(other.unk3)) - && (!hasBinVersion() || binVersion.equals(other.binVersion)) && (!hasResVersion() || resVersion.equals(other.resVersion)) + && (!hasBinVersion() || binVersion.equals(other.binVersion)) && (!hasBattleAvatarList() || battleAvatarList.equals(other.battleAvatarList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(battleId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(stageId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(eventId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + 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); + output.writeUInt32NoTag(stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 88); output.writeEnumNoTag(endStatus); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 64); output.writeBoolNoTag(checkIdentical); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 10); output.writeMessageNoTag(dropData); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 26); output.writeMessageNoTag(unk1); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 82); output.writeMessageNoTag(unk2); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRawLittleEndian16((short) 9442); + output.writeRawLittleEndian16((short) 4074); output.writeMessageNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeRawByte((byte) 26); - output.writeStringNoTag(binVersion); + output.writeRawByte((byte) 42); + output.writeStringNoTag(resVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeRawByte((byte) 66); - output.writeStringNoTag(resVersion); + output.writeRawByte((byte) 106); + output.writeStringNoTag(binVersion); } if ((bitField0_ & 0x00002000) != 0) { for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); 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(battleId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(eventId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + } + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(mismatchTurnCount); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(endStatus); } @@ -1053,10 +1053,10 @@ public final class PVEBattleResultScRspOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(unk3); } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(binVersion); + size += 1 + ProtoSink.computeStringSizeNoTag(resVersion); } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(resVersion); + size += 1 + ProtoSink.computeStringSizeNoTag(binVersion); } if ((bitField0_ & 0x00002000) != 0) { size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); @@ -1071,52 +1071,52 @@ public final class PVEBattleResultScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // battleId - battleId = input.readUInt32(); + case 16: { + // eventId + eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 32) { break; } } - case 72: { - // stageId - stageId = input.readUInt32(); + case 32: { + // battleId + battleId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 48) { break; } } - case 80: { - // retcode - retcode = input.readUInt32(); + case 48: { + // mismatchTurnCount + mismatchTurnCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 96) { break; } } case 96: { - // eventId - eventId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { - // mismatchTurnCount - mismatchTurnCount = input.readUInt32(); + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 104) { + if (tag != 88) { break; } } - case 104: { + 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 != 8) { + if (tag != 64) { break; } } - case 8: { + case 64: { // checkIdentical checkIdentical = input.readBool(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { + case 10: { // dropData input.readMessage(dropData); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // unk1 - input.readMessage(unk1); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // unk2 - input.readMessage(unk2); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 4706) { - break; - } - } - case 4706: { - // unk3 - input.readMessage(unk3); - bitField0_ |= 0x00000400; - tag = input.readTag(); if (tag != 26) { break; } } case 26: { - // binVersion - input.readString(binVersion); - bitField0_ |= 0x00000800; + // unk1 + input.readMessage(unk1); + bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + 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_ |= 0x00001000; + bitField0_ |= 0x00000800; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { + // binVersion + input.readString(binVersion); + bitField0_ |= 0x00001000; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // 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.battleId, battleId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.eventId, eventId); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.battleId, battleId); + } + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.mismatchTurnCount, mismatchTurnCount); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.stageId, stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } if ((bitField0_ & 0x00000020) != 0) { output.writeEnum(FieldNames.endStatus, endStatus, BattleEndStatusOuterClass.BattleEndStatus.converter()); } @@ -1250,10 +1250,10 @@ public final class PVEBattleResultScRspOuterClass { output.writeMessage(FieldNames.unk3, unk3); } if ((bitField0_ & 0x00000800) != 0) { - output.writeString(FieldNames.binVersion, binVersion); + output.writeString(FieldNames.resVersion, resVersion); } if ((bitField0_ & 0x00001000) != 0) { - output.writeString(FieldNames.resVersion, resVersion); + output.writeString(FieldNames.binVersion, binVersion); } if ((bitField0_ & 0x00002000) != 0) { output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); @@ -1268,11 +1268,11 @@ public final class PVEBattleResultScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -1280,11 +1280,11 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -1678308365: + case -487930366: { + if (input.isAtField(FieldNames.battleId)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + battleId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1292,34 +1292,34 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { - if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1376502443: - case 278118624: { - if (input.isAtField(FieldNames.eventId)) { - if (!input.trySkipNullValue()) { - eventId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { + if (!input.trySkipNullValue()) { + retcode = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1401,11 +1401,11 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case 1864225233: - case -2003285600: { - if (input.isAtField(FieldNames.binVersion)) { + case 1778976792: + case -351019975: { + if (input.isAtField(FieldNames.resVersion)) { if (!input.trySkipNullValue()) { - input.readString(binVersion); + input.readString(resVersion); bitField0_ |= 0x00000800; } } else { @@ -1413,11 +1413,11 @@ public final class PVEBattleResultScRspOuterClass { } break; } - case 1778976792: - case -351019975: { - if (input.isAtField(FieldNames.resVersion)) { + case 1864225233: + case -2003285600: { + if (input.isAtField(FieldNames.binVersion)) { if (!input.trySkipNullValue()) { - input.readString(resVersion); + input.readString(binVersion); bitField0_ |= 0x00001000; } } else { @@ -1490,16 +1490,16 @@ 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 stageId = FieldName.forField("stageId", "stage_id"); static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName eventId = FieldName.forField("eventId", "event_id"); - - static final FieldName mismatchTurnCount = FieldName.forField("mismatchTurnCount", "mismatch_turn_count"); - static final FieldName endStatus = FieldName.forField("endStatus", "end_status"); static final FieldName checkIdentical = FieldName.forField("checkIdentical", "check_identical"); @@ -1512,10 +1512,10 @@ public final class PVEBattleResultScRspOuterClass { static final FieldName unk3 = FieldName.forField("unk3"); - static final FieldName binVersion = FieldName.forField("binVersion", "bin_version"); - static final FieldName resVersion = FieldName.forField("resVersion", "res_version"); + static final FieldName binVersion = FieldName.forField("binVersion", "bin_version"); + static final FieldName battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java index 93fdd3a..06968b5 100644 --- a/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PileItemOuterClass.java @@ -19,15 +19,15 @@ public final class PileItemOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 item_num = 8; - */ - private int itemNum; - - /** - * optional uint32 item_id = 11; + * optional uint32 item_id = 3; */ private int itemId; + /** + * optional uint32 item_num = 11; + */ + private int itemNum; + private PileItem() { } @@ -39,62 +39,25 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_num = 8; - * @return whether the itemNum field is set + * optional uint32 item_id = 3; + * @return whether the itemId field is set */ - public boolean hasItemNum() { + public boolean hasItemId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 item_num = 8; - * @return this - */ - public PileItem clearItemNum() { - bitField0_ &= ~0x00000001; - itemNum = 0; - return this; - } - - /** - * optional uint32 item_num = 8; - * @return the itemNum - */ - public int getItemNum() { - return itemNum; - } - - /** - * optional uint32 item_num = 8; - * @param value the itemNum to set - * @return this - */ - public PileItem setItemNum(final int value) { - bitField0_ |= 0x00000001; - itemNum = value; - return this; - } - - /** - * optional uint32 item_id = 11; - * @return whether the itemId field is set - */ - public boolean hasItemId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 item_id = 11; + * optional uint32 item_id = 3; * @return this */ public PileItem clearItemId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; itemId = 0; return this; } /** - * optional uint32 item_id = 11; + * optional uint32 item_id = 3; * @return the itemId */ public int getItemId() { @@ -102,23 +65,60 @@ public final class PileItemOuterClass { } /** - * optional uint32 item_id = 11; + * optional uint32 item_id = 3; * @param value the itemId to set * @return this */ public PileItem setItemId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; itemId = value; return this; } + /** + * optional uint32 item_num = 11; + * @return whether the itemNum field is set + */ + public boolean hasItemNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 item_num = 11; + * @return this + */ + public PileItem clearItemNum() { + bitField0_ &= ~0x00000002; + itemNum = 0; + return this; + } + + /** + * optional uint32 item_num = 11; + * @return the itemNum + */ + public int getItemNum() { + return itemNum; + } + + /** + * optional uint32 item_num = 11; + * @param value the itemNum to set + * @return this + */ + public PileItem setItemNum(final int value) { + bitField0_ |= 0x00000002; + itemNum = value; + return this; + } + @Override public PileItem copyFrom(final PileItem other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - itemNum = other.itemNum; itemId = other.itemId; + itemNum = other.itemNum; } return this; } @@ -129,12 +129,12 @@ public final class PileItemOuterClass { return this; } cachedSize = -1; - if (other.hasItemNum()) { - setItemNum(other.itemNum); - } if (other.hasItemId()) { setItemId(other.itemId); } + if (other.hasItemNum()) { + setItemNum(other.itemNum); + } return this; } @@ -145,8 +145,8 @@ public final class PileItemOuterClass { } cachedSize = -1; bitField0_ = 0; - itemNum = 0; itemId = 0; + itemNum = 0; return this; } @@ -170,19 +170,19 @@ public final class PileItemOuterClass { } PileItem other = (PileItem) o; return bitField0_ == other.bitField0_ - && (!hasItemNum() || itemNum == other.itemNum) - && (!hasItemId() || itemId == other.itemId); + && (!hasItemId() || itemId == other.itemId) + && (!hasItemNum() || itemNum == other.itemNum); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(itemNum); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 88); - output.writeUInt32NoTag(itemId); + output.writeUInt32NoTag(itemNum); } } @@ -190,10 +190,10 @@ public final class PileItemOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(itemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(itemNum); } return size; } @@ -205,9 +205,9 @@ public final class PileItemOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // itemNum - itemNum = input.readUInt32(); + case 24: { + // itemId + itemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 88) { @@ -215,8 +215,8 @@ public final class PileItemOuterClass { } } case 88: { - // itemId - itemId = input.readUInt32(); + // itemNum + itemNum = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class PileItemOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.itemNum, itemNum); + output.writeUInt32(FieldNames.itemId, itemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.itemId, itemId); + output.writeUInt32(FieldNames.itemNum, itemNum); } output.endObject(); } @@ -256,11 +256,11 @@ public final class PileItemOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 2116189043: - case 1177850970: { - if (input.isAtField(FieldNames.itemNum)) { + case -1178662002: + case 2116204999: { + if (input.isAtField(FieldNames.itemId)) { if (!input.trySkipNullValue()) { - itemNum = input.readUInt32(); + itemId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class PileItemOuterClass { } break; } - case -1178662002: - case 2116204999: { - if (input.isAtField(FieldNames.itemId)) { + case 2116189043: + case 1177850970: { + if (input.isAtField(FieldNames.itemNum)) { if (!input.trySkipNullValue()) { - itemId = input.readUInt32(); + itemNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class PileItemOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName itemNum = FieldName.forField("itemNum", "item_num"); - static final FieldName itemId = FieldName.forField("itemId", "item_id"); + + static final FieldName itemNum = FieldName.forField("itemNum", "item_num"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayBackGroundMusicCsReqOuterClass.java index b1c2884..36d2483 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 = 8; + * optional uint32 play_music_id = 14; */ private int playMusicId; @@ -34,7 +34,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 8; + * optional uint32 play_music_id = 14; * @return whether the playMusicId field is set */ public boolean hasPlayMusicId() { @@ -42,7 +42,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 8; + * optional uint32 play_music_id = 14; * @return this */ public PlayBackGroundMusicCsReq clearPlayMusicId() { @@ -52,7 +52,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 8; + * optional uint32 play_music_id = 14; * @return the playMusicId */ public int getPlayMusicId() { @@ -60,7 +60,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { } /** - * optional uint32 play_music_id = 8; + * optional uint32 play_music_id = 14; * @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) 64); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(playMusicId); } } @@ -150,7 +150,7 @@ public final class PlayBackGroundMusicCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 112: { // 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 ac19d49..a3710c2 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 = 2; + * optional uint32 playing_id = 4; */ private int playingId; /** - * optional uint32 play_music_id = 7; - */ - private int playMusicId; - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; */ private int retcode; + /** + * optional uint32 play_music_id = 15; + */ + private int playMusicId; + private PlayBackGroundMusicScRsp() { } @@ -44,7 +44,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 2; + * optional uint32 playing_id = 4; * @return whether the playingId field is set */ public boolean hasPlayingId() { @@ -52,7 +52,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 2; + * optional uint32 playing_id = 4; * @return this */ public PlayBackGroundMusicScRsp clearPlayingId() { @@ -62,7 +62,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 2; + * optional uint32 playing_id = 4; * @return the playingId */ public int getPlayingId() { @@ -70,7 +70,7 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 playing_id = 2; + * optional uint32 playing_id = 4; * @param value the playingId to set * @return this */ @@ -81,62 +81,25 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 play_music_id = 7; - * @return whether the playMusicId field is set + * optional uint32 retcode = 9; + * @return whether the retcode field is set */ - public boolean hasPlayMusicId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 play_music_id = 7; - * @return this - */ - public PlayBackGroundMusicScRsp clearPlayMusicId() { - bitField0_ &= ~0x00000002; - playMusicId = 0; - return this; - } - - /** - * optional uint32 play_music_id = 7; - * @return the playMusicId - */ - public int getPlayMusicId() { - return playMusicId; - } - - /** - * optional uint32 play_music_id = 7; - * @param value the playMusicId to set - * @return this - */ - public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { - bitField0_ |= 0x00000002; - playMusicId = value; - return this; - } - - /** - * optional uint32 retcode = 15; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return this */ public PlayBackGroundMusicScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -144,24 +107,61 @@ public final class PlayBackGroundMusicScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ public PlayBackGroundMusicScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + 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; + * @return this + */ + public PlayBackGroundMusicScRsp clearPlayMusicId() { + bitField0_ &= ~0x00000004; + playMusicId = 0; + return this; + } + + /** + * optional uint32 play_music_id = 15; + * @return the playMusicId + */ + public int getPlayMusicId() { + return playMusicId; + } + + /** + * optional uint32 play_music_id = 15; + * @param value the playMusicId to set + * @return this + */ + public PlayBackGroundMusicScRsp setPlayMusicId(final int value) { + bitField0_ |= 0x00000004; + playMusicId = value; + return this; + } + @Override public PlayBackGroundMusicScRsp copyFrom(final PlayBackGroundMusicScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; playingId = other.playingId; - playMusicId = other.playMusicId; retcode = other.retcode; + playMusicId = other.playMusicId; } return this; } @@ -175,12 +175,12 @@ public final class PlayBackGroundMusicScRspOuterClass { if (other.hasPlayingId()) { setPlayingId(other.playingId); } - if (other.hasPlayMusicId()) { - setPlayMusicId(other.playMusicId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasPlayMusicId()) { + setPlayMusicId(other.playMusicId); + } return this; } @@ -192,8 +192,8 @@ public final class PlayBackGroundMusicScRspOuterClass { cachedSize = -1; bitField0_ = 0; playingId = 0; - playMusicId = 0; retcode = 0; + playMusicId = 0; return this; } @@ -218,23 +218,23 @@ public final class PlayBackGroundMusicScRspOuterClass { PlayBackGroundMusicScRsp other = (PlayBackGroundMusicScRsp) o; return bitField0_ == other.bitField0_ && (!hasPlayingId() || playingId == other.playingId) - && (!hasPlayMusicId() || playMusicId == other.playMusicId) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasPlayMusicId() || playMusicId == other.playMusicId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(playingId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(playMusicId); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(playMusicId); } } @@ -245,10 +245,10 @@ public final class PlayBackGroundMusicScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(playingId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(playMusicId); } return size; } @@ -260,18 +260,18 @@ public final class PlayBackGroundMusicScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 32: { // playingId playingId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 72) { break; } } - case 56: { - // playMusicId - playMusicId = input.readUInt32(); + case 72: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 120) { @@ -279,8 +279,8 @@ public final class PlayBackGroundMusicScRspOuterClass { } } case 120: { - // retcode - retcode = input.readUInt32(); + // playMusicId + playMusicId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -308,10 +308,10 @@ public final class PlayBackGroundMusicScRspOuterClass { output.writeUInt32(FieldNames.playingId, playingId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.playMusicId, playMusicId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.playMusicId, playMusicId); } output.endObject(); } @@ -335,11 +335,10 @@ public final class PlayBackGroundMusicScRspOuterClass { } break; } - case 835898444: - case -1319856608: { - if (input.isAtField(FieldNames.playMusicId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - playMusicId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -347,10 +346,11 @@ public final class PlayBackGroundMusicScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 835898444: + case -1319856608: { + if (input.isAtField(FieldNames.playMusicId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + playMusicId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -413,9 +413,9 @@ public final class PlayBackGroundMusicScRspOuterClass { static class FieldNames { static final FieldName playingId = FieldName.forField("playingId", "playing_id"); - static final FieldName playMusicId = FieldName.forField("playMusicId", "play_music_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 7cc8abe..a1d9585 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 DCIOBLHLICO = 1; + * optional uint32 OPKIPBKCHHK = 6; */ - private int dCIOBLHLICO; + private int oPKIPBKCHHK; /** - * optional uint32 ILADMEOHHEC = 3; + * optional uint32 HFMNHPOGANN = 9; */ - private int iLADMEOHHEC; + private int hFMNHPOGANN; /** - * optional uint32 EJMJIKCDIMM = 6; + * optional uint32 APBMGEBOHPK = 10; */ - private int eJMJIKCDIMM; + private int aPBMGEBOHPK; /** - * optional uint32 JFLFDIJPNEO = 14; + * optional uint32 FOLOHMFJFLM = 12; */ - private int jFLFDIJPNEO; + private int fOLOHMFJFLM; /** - * optional uint32 KLLEONMNLDI = 15; + * optional uint32 JBADNDDCGFK = 15; */ - private int kLLEONMNLDI; + private int jBADNDDCGFK; private PlayerCollectionInfo() { } @@ -54,187 +54,187 @@ public final class PlayerCollectionInfoOuterClass { } /** - * optional uint32 DCIOBLHLICO = 1; - * @return whether the dCIOBLHLICO field is set + * optional uint32 OPKIPBKCHHK = 6; + * @return whether the oPKIPBKCHHK field is set */ - public boolean hasDCIOBLHLICO() { + public boolean hasOPKIPBKCHHK() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 DCIOBLHLICO = 1; + * optional uint32 OPKIPBKCHHK = 6; * @return this */ - public PlayerCollectionInfo clearDCIOBLHLICO() { + public PlayerCollectionInfo clearOPKIPBKCHHK() { bitField0_ &= ~0x00000001; - dCIOBLHLICO = 0; + oPKIPBKCHHK = 0; return this; } /** - * optional uint32 DCIOBLHLICO = 1; - * @return the dCIOBLHLICO + * optional uint32 OPKIPBKCHHK = 6; + * @return the oPKIPBKCHHK */ - public int getDCIOBLHLICO() { - return dCIOBLHLICO; + public int getOPKIPBKCHHK() { + return oPKIPBKCHHK; } /** - * optional uint32 DCIOBLHLICO = 1; - * @param value the dCIOBLHLICO to set + * optional uint32 OPKIPBKCHHK = 6; + * @param value the oPKIPBKCHHK to set * @return this */ - public PlayerCollectionInfo setDCIOBLHLICO(final int value) { + public PlayerCollectionInfo setOPKIPBKCHHK(final int value) { bitField0_ |= 0x00000001; - dCIOBLHLICO = value; + oPKIPBKCHHK = value; return this; } /** - * optional uint32 ILADMEOHHEC = 3; - * @return whether the iLADMEOHHEC field is set + * optional uint32 HFMNHPOGANN = 9; + * @return whether the hFMNHPOGANN field is set */ - public boolean hasILADMEOHHEC() { + public boolean hasHFMNHPOGANN() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 ILADMEOHHEC = 3; + * optional uint32 HFMNHPOGANN = 9; * @return this */ - public PlayerCollectionInfo clearILADMEOHHEC() { + public PlayerCollectionInfo clearHFMNHPOGANN() { bitField0_ &= ~0x00000002; - iLADMEOHHEC = 0; + hFMNHPOGANN = 0; return this; } /** - * optional uint32 ILADMEOHHEC = 3; - * @return the iLADMEOHHEC + * optional uint32 HFMNHPOGANN = 9; + * @return the hFMNHPOGANN */ - public int getILADMEOHHEC() { - return iLADMEOHHEC; + public int getHFMNHPOGANN() { + return hFMNHPOGANN; } /** - * optional uint32 ILADMEOHHEC = 3; - * @param value the iLADMEOHHEC to set + * optional uint32 HFMNHPOGANN = 9; + * @param value the hFMNHPOGANN to set * @return this */ - public PlayerCollectionInfo setILADMEOHHEC(final int value) { + public PlayerCollectionInfo setHFMNHPOGANN(final int value) { bitField0_ |= 0x00000002; - iLADMEOHHEC = value; + hFMNHPOGANN = value; return this; } /** - * optional uint32 EJMJIKCDIMM = 6; - * @return whether the eJMJIKCDIMM field is set + * optional uint32 APBMGEBOHPK = 10; + * @return whether the aPBMGEBOHPK field is set */ - public boolean hasEJMJIKCDIMM() { + public boolean hasAPBMGEBOHPK() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 EJMJIKCDIMM = 6; + * optional uint32 APBMGEBOHPK = 10; * @return this */ - public PlayerCollectionInfo clearEJMJIKCDIMM() { + public PlayerCollectionInfo clearAPBMGEBOHPK() { bitField0_ &= ~0x00000004; - eJMJIKCDIMM = 0; + aPBMGEBOHPK = 0; return this; } /** - * optional uint32 EJMJIKCDIMM = 6; - * @return the eJMJIKCDIMM + * optional uint32 APBMGEBOHPK = 10; + * @return the aPBMGEBOHPK */ - public int getEJMJIKCDIMM() { - return eJMJIKCDIMM; + public int getAPBMGEBOHPK() { + return aPBMGEBOHPK; } /** - * optional uint32 EJMJIKCDIMM = 6; - * @param value the eJMJIKCDIMM to set + * optional uint32 APBMGEBOHPK = 10; + * @param value the aPBMGEBOHPK to set * @return this */ - public PlayerCollectionInfo setEJMJIKCDIMM(final int value) { + public PlayerCollectionInfo setAPBMGEBOHPK(final int value) { bitField0_ |= 0x00000004; - eJMJIKCDIMM = value; + aPBMGEBOHPK = value; return this; } /** - * optional uint32 JFLFDIJPNEO = 14; - * @return whether the jFLFDIJPNEO field is set + * optional uint32 FOLOHMFJFLM = 12; + * @return whether the fOLOHMFJFLM field is set */ - public boolean hasJFLFDIJPNEO() { + public boolean hasFOLOHMFJFLM() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 JFLFDIJPNEO = 14; + * optional uint32 FOLOHMFJFLM = 12; * @return this */ - public PlayerCollectionInfo clearJFLFDIJPNEO() { + public PlayerCollectionInfo clearFOLOHMFJFLM() { bitField0_ &= ~0x00000008; - jFLFDIJPNEO = 0; + fOLOHMFJFLM = 0; return this; } /** - * optional uint32 JFLFDIJPNEO = 14; - * @return the jFLFDIJPNEO + * optional uint32 FOLOHMFJFLM = 12; + * @return the fOLOHMFJFLM */ - public int getJFLFDIJPNEO() { - return jFLFDIJPNEO; + public int getFOLOHMFJFLM() { + return fOLOHMFJFLM; } /** - * optional uint32 JFLFDIJPNEO = 14; - * @param value the jFLFDIJPNEO to set + * optional uint32 FOLOHMFJFLM = 12; + * @param value the fOLOHMFJFLM to set * @return this */ - public PlayerCollectionInfo setJFLFDIJPNEO(final int value) { + public PlayerCollectionInfo setFOLOHMFJFLM(final int value) { bitField0_ |= 0x00000008; - jFLFDIJPNEO = value; + fOLOHMFJFLM = value; return this; } /** - * optional uint32 KLLEONMNLDI = 15; - * @return whether the kLLEONMNLDI field is set + * optional uint32 JBADNDDCGFK = 15; + * @return whether the jBADNDDCGFK field is set */ - public boolean hasKLLEONMNLDI() { + public boolean hasJBADNDDCGFK() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 KLLEONMNLDI = 15; + * optional uint32 JBADNDDCGFK = 15; * @return this */ - public PlayerCollectionInfo clearKLLEONMNLDI() { + public PlayerCollectionInfo clearJBADNDDCGFK() { bitField0_ &= ~0x00000010; - kLLEONMNLDI = 0; + jBADNDDCGFK = 0; return this; } /** - * optional uint32 KLLEONMNLDI = 15; - * @return the kLLEONMNLDI + * optional uint32 JBADNDDCGFK = 15; + * @return the jBADNDDCGFK */ - public int getKLLEONMNLDI() { - return kLLEONMNLDI; + public int getJBADNDDCGFK() { + return jBADNDDCGFK; } /** - * optional uint32 KLLEONMNLDI = 15; - * @param value the kLLEONMNLDI to set + * optional uint32 JBADNDDCGFK = 15; + * @param value the jBADNDDCGFK to set * @return this */ - public PlayerCollectionInfo setKLLEONMNLDI(final int value) { + public PlayerCollectionInfo setJBADNDDCGFK(final int value) { bitField0_ |= 0x00000010; - kLLEONMNLDI = value; + jBADNDDCGFK = value; return this; } @@ -243,11 +243,11 @@ public final class PlayerCollectionInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dCIOBLHLICO = other.dCIOBLHLICO; - iLADMEOHHEC = other.iLADMEOHHEC; - eJMJIKCDIMM = other.eJMJIKCDIMM; - jFLFDIJPNEO = other.jFLFDIJPNEO; - kLLEONMNLDI = other.kLLEONMNLDI; + oPKIPBKCHHK = other.oPKIPBKCHHK; + hFMNHPOGANN = other.hFMNHPOGANN; + aPBMGEBOHPK = other.aPBMGEBOHPK; + fOLOHMFJFLM = other.fOLOHMFJFLM; + jBADNDDCGFK = other.jBADNDDCGFK; } return this; } @@ -258,20 +258,20 @@ public final class PlayerCollectionInfoOuterClass { return this; } cachedSize = -1; - if (other.hasDCIOBLHLICO()) { - setDCIOBLHLICO(other.dCIOBLHLICO); + if (other.hasOPKIPBKCHHK()) { + setOPKIPBKCHHK(other.oPKIPBKCHHK); } - if (other.hasILADMEOHHEC()) { - setILADMEOHHEC(other.iLADMEOHHEC); + if (other.hasHFMNHPOGANN()) { + setHFMNHPOGANN(other.hFMNHPOGANN); } - if (other.hasEJMJIKCDIMM()) { - setEJMJIKCDIMM(other.eJMJIKCDIMM); + if (other.hasAPBMGEBOHPK()) { + setAPBMGEBOHPK(other.aPBMGEBOHPK); } - if (other.hasJFLFDIJPNEO()) { - setJFLFDIJPNEO(other.jFLFDIJPNEO); + if (other.hasFOLOHMFJFLM()) { + setFOLOHMFJFLM(other.fOLOHMFJFLM); } - if (other.hasKLLEONMNLDI()) { - setKLLEONMNLDI(other.kLLEONMNLDI); + if (other.hasJBADNDDCGFK()) { + setJBADNDDCGFK(other.jBADNDDCGFK); } return this; } @@ -283,11 +283,11 @@ public final class PlayerCollectionInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dCIOBLHLICO = 0; - iLADMEOHHEC = 0; - eJMJIKCDIMM = 0; - jFLFDIJPNEO = 0; - kLLEONMNLDI = 0; + oPKIPBKCHHK = 0; + hFMNHPOGANN = 0; + aPBMGEBOHPK = 0; + fOLOHMFJFLM = 0; + jBADNDDCGFK = 0; return this; } @@ -311,34 +311,34 @@ public final class PlayerCollectionInfoOuterClass { } PlayerCollectionInfo other = (PlayerCollectionInfo) o; return bitField0_ == other.bitField0_ - && (!hasDCIOBLHLICO() || dCIOBLHLICO == other.dCIOBLHLICO) - && (!hasILADMEOHHEC() || iLADMEOHHEC == other.iLADMEOHHEC) - && (!hasEJMJIKCDIMM() || eJMJIKCDIMM == other.eJMJIKCDIMM) - && (!hasJFLFDIJPNEO() || jFLFDIJPNEO == other.jFLFDIJPNEO) - && (!hasKLLEONMNLDI() || kLLEONMNLDI == other.kLLEONMNLDI); + && (!hasOPKIPBKCHHK() || oPKIPBKCHHK == other.oPKIPBKCHHK) + && (!hasHFMNHPOGANN() || hFMNHPOGANN == other.hFMNHPOGANN) + && (!hasAPBMGEBOHPK() || aPBMGEBOHPK == other.aPBMGEBOHPK) + && (!hasFOLOHMFJFLM() || fOLOHMFJFLM == other.fOLOHMFJFLM) + && (!hasJBADNDDCGFK() || jBADNDDCGFK == other.jBADNDDCGFK); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(dCIOBLHLICO); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(oPKIPBKCHHK); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(iLADMEOHHEC); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(hFMNHPOGANN); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(eJMJIKCDIMM); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(aPBMGEBOHPK); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(jFLFDIJPNEO); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(fOLOHMFJFLM); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(kLLEONMNLDI); + output.writeUInt32NoTag(jBADNDDCGFK); } } @@ -346,19 +346,19 @@ public final class PlayerCollectionInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dCIOBLHLICO); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oPKIPBKCHHK); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(iLADMEOHHEC); + size += 1 + ProtoSink.computeUInt32SizeNoTag(hFMNHPOGANN); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(eJMJIKCDIMM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(aPBMGEBOHPK); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jFLFDIJPNEO); + size += 1 + ProtoSink.computeUInt32SizeNoTag(fOLOHMFJFLM); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kLLEONMNLDI); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jBADNDDCGFK); } return size; } @@ -370,36 +370,36 @@ public final class PlayerCollectionInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // dCIOBLHLICO - dCIOBLHLICO = input.readUInt32(); + case 48: { + // oPKIPBKCHHK + oPKIPBKCHHK = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 72) { break; } } - case 24: { - // iLADMEOHHEC - iLADMEOHHEC = input.readUInt32(); + case 72: { + // hFMNHPOGANN + hFMNHPOGANN = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 80) { break; } } - case 48: { - // eJMJIKCDIMM - eJMJIKCDIMM = input.readUInt32(); + case 80: { + // aPBMGEBOHPK + aPBMGEBOHPK = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 112) { + if (tag != 96) { break; } } - case 112: { - // jFLFDIJPNEO - jFLFDIJPNEO = input.readUInt32(); + case 96: { + // fOLOHMFJFLM + fOLOHMFJFLM = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 120) { @@ -407,8 +407,8 @@ public final class PlayerCollectionInfoOuterClass { } } case 120: { - // kLLEONMNLDI - kLLEONMNLDI = input.readUInt32(); + // jBADNDDCGFK + jBADNDDCGFK = 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.dCIOBLHLICO, dCIOBLHLICO); + output.writeUInt32(FieldNames.oPKIPBKCHHK, oPKIPBKCHHK); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.iLADMEOHHEC, iLADMEOHHEC); + output.writeUInt32(FieldNames.hFMNHPOGANN, hFMNHPOGANN); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.eJMJIKCDIMM, eJMJIKCDIMM); + output.writeUInt32(FieldNames.aPBMGEBOHPK, aPBMGEBOHPK); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.jFLFDIJPNEO, jFLFDIJPNEO); + output.writeUInt32(FieldNames.fOLOHMFJFLM, fOLOHMFJFLM); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.kLLEONMNLDI, kLLEONMNLDI); + output.writeUInt32(FieldNames.jBADNDDCGFK, jBADNDDCGFK); } output.endObject(); } @@ -457,10 +457,10 @@ public final class PlayerCollectionInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -81891486: { - if (input.isAtField(FieldNames.dCIOBLHLICO)) { + case 1436262498: { + if (input.isAtField(FieldNames.oPKIPBKCHHK)) { if (!input.trySkipNullValue()) { - dCIOBLHLICO = input.readUInt32(); + oPKIPBKCHHK = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -468,10 +468,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -1683099505: { - if (input.isAtField(FieldNames.iLADMEOHHEC)) { + case 1498883298: { + if (input.isAtField(FieldNames.hFMNHPOGANN)) { if (!input.trySkipNullValue()) { - iLADMEOHHEC = input.readUInt32(); + hFMNHPOGANN = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -479,10 +479,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -134364028: { - if (input.isAtField(FieldNames.eJMJIKCDIMM)) { + case -1027359554: { + if (input.isAtField(FieldNames.aPBMGEBOHPK)) { if (!input.trySkipNullValue()) { - eJMJIKCDIMM = input.readUInt32(); + aPBMGEBOHPK = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -490,10 +490,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case -804934505: { - if (input.isAtField(FieldNames.jFLFDIJPNEO)) { + case -1809610350: { + if (input.isAtField(FieldNames.fOLOHMFJFLM)) { if (!input.trySkipNullValue()) { - jFLFDIJPNEO = input.readUInt32(); + fOLOHMFJFLM = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -501,10 +501,10 @@ public final class PlayerCollectionInfoOuterClass { } break; } - case 89650743: { - if (input.isAtField(FieldNames.kLLEONMNLDI)) { + case -666349892: { + if (input.isAtField(FieldNames.jBADNDDCGFK)) { if (!input.trySkipNullValue()) { - kLLEONMNLDI = input.readUInt32(); + jBADNDDCGFK = 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 dCIOBLHLICO = FieldName.forField("DCIOBLHLICO"); + static final FieldName oPKIPBKCHHK = FieldName.forField("OPKIPBKCHHK"); - static final FieldName iLADMEOHHEC = FieldName.forField("ILADMEOHHEC"); + static final FieldName hFMNHPOGANN = FieldName.forField("HFMNHPOGANN"); - static final FieldName eJMJIKCDIMM = FieldName.forField("EJMJIKCDIMM"); + static final FieldName aPBMGEBOHPK = FieldName.forField("APBMGEBOHPK"); - static final FieldName jFLFDIJPNEO = FieldName.forField("JFLFDIJPNEO"); + static final FieldName fOLOHMFJFLM = FieldName.forField("FOLOHMFJFLM"); - static final FieldName kLLEONMNLDI = FieldName.forField("KLLEONMNLDI"); + static final FieldName jBADNDDCGFK = FieldName.forField("JBADNDDCGFK"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java index db8b9ca..1ebdb5a 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerDetailInfoOuterClass.java @@ -21,62 +21,62 @@ public final class PlayerDetailInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; */ private int uid; /** - * optional uint32 head_icon = 6; - */ - private int headIcon; - - /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 5; */ private int worldLevel; /** - * optional uint32 level = 10; + * optional uint32 level = 11; */ private int level; /** - * optional .PlatformType platform_type = 15; + * optional uint32 head_icon = 12; + */ + private int headIcon; + + /** + * optional .PlatformType platform_type = 9; */ private int platformType; /** - * optional bool show_display_avatars = 14; + * optional bool show_display_avatars = 8; */ private boolean showDisplayAvatars; /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo record_info = 14; */ private final PlayerRecordInfoOuterClass.PlayerRecordInfo recordInfo = PlayerRecordInfoOuterClass.PlayerRecordInfo.newInstance(); /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; */ private final PlayerDisplaySettingsOuterClass.PlayerDisplaySettings displaySettings = PlayerDisplaySettingsOuterClass.PlayerDisplaySettings.newInstance(); /** - * optional string signature = 3; + * optional string signature = 2; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * optional string nickname = 4; + * optional string nickname = 15; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory()); /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; */ private final RepeatedMessage assistAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarDetailInfoOuterClass.DisplayAvatarDetailInfo.getFactory()); @@ -91,7 +91,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return whether the uid field is set */ public boolean hasUid() { @@ -99,7 +99,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return this */ public PlayerDetailInfo clearUid() { @@ -109,7 +109,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @return the uid */ public int getUid() { @@ -117,7 +117,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 uid = 5; + * optional uint32 uid = 3; * @param value the uid to set * @return this */ @@ -128,62 +128,25 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 head_icon = 6; - * @return whether the headIcon field is set + * optional uint32 world_level = 5; + * @return whether the worldLevel field is set */ - public boolean hasHeadIcon() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 head_icon = 6; - * @return this - */ - public PlayerDetailInfo clearHeadIcon() { - bitField0_ &= ~0x00000002; - headIcon = 0; - return this; - } - - /** - * optional uint32 head_icon = 6; - * @return the headIcon - */ - public int getHeadIcon() { - return headIcon; - } - - /** - * optional uint32 head_icon = 6; - * @param value the headIcon to set - * @return this - */ - public PlayerDetailInfo setHeadIcon(final int value) { - bitField0_ |= 0x00000002; - headIcon = value; - return this; - } - - /** - * optional uint32 world_level = 9; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 5; * @return this */ public PlayerDetailInfo clearWorldLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; worldLevel = 0; return this; } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 5; * @return the worldLevel */ public int getWorldLevel() { @@ -191,36 +154,36 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 world_level = 9; + * optional uint32 world_level = 5; * @param value the worldLevel to set * @return this */ public PlayerDetailInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; worldLevel = value; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 11; * @return whether the level field is set */ public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 level = 10; + * optional uint32 level = 11; * @return this */ public PlayerDetailInfo clearLevel() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; level = 0; return this; } /** - * optional uint32 level = 10; + * optional uint32 level = 11; * @return the level */ public int getLevel() { @@ -228,18 +191,55 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional uint32 level = 10; + * optional uint32 level = 11; * @param value the level to set * @return this */ public PlayerDetailInfo setLevel(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; level = value; return this; } /** - * optional .PlatformType platform_type = 15; + * optional uint32 head_icon = 12; + * @return whether the headIcon field is set + */ + public boolean hasHeadIcon() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 head_icon = 12; + * @return this + */ + public PlayerDetailInfo clearHeadIcon() { + bitField0_ &= ~0x00000008; + headIcon = 0; + return this; + } + + /** + * optional uint32 head_icon = 12; + * @return the headIcon + */ + public int getHeadIcon() { + return headIcon; + } + + /** + * optional uint32 head_icon = 12; + * @param value the headIcon to set + * @return this + */ + public PlayerDetailInfo setHeadIcon(final int value) { + bitField0_ |= 0x00000008; + headIcon = value; + return this; + } + + /** + * optional .PlatformType platform_type = 9; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -247,7 +247,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 9; * @return this */ public PlayerDetailInfo clearPlatformType() { @@ -257,7 +257,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 9; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -290,7 +290,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlatformType platform_type = 15; + * optional .PlatformType platform_type = 9; * @param value the platformType to set * @return this */ @@ -301,7 +301,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 14; + * optional bool show_display_avatars = 8; * @return whether the showDisplayAvatars field is set */ public boolean hasShowDisplayAvatars() { @@ -309,7 +309,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 14; + * optional bool show_display_avatars = 8; * @return this */ public PlayerDetailInfo clearShowDisplayAvatars() { @@ -319,7 +319,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 14; + * optional bool show_display_avatars = 8; * @return the showDisplayAvatars */ public boolean getShowDisplayAvatars() { @@ -327,7 +327,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional bool show_display_avatars = 14; + * optional bool show_display_avatars = 8; * @param value the showDisplayAvatars to set * @return this */ @@ -338,7 +338,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo record_info = 14; * @return whether the recordInfo field is set */ public boolean hasRecordInfo() { @@ -346,7 +346,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo record_info = 14; * @return this */ public PlayerDetailInfo clearRecordInfo() { @@ -356,7 +356,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo 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. @@ -370,7 +370,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo 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 @@ -384,7 +384,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerRecordInfo record_info = 7; + * optional .PlayerRecordInfo record_info = 14; * @param value the recordInfo to set * @return this */ @@ -395,7 +395,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; * @return whether the displaySettings field is set */ public boolean hasDisplaySettings() { @@ -403,7 +403,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; * @return this */ public PlayerDetailInfo clearDisplaySettings() { @@ -413,7 +413,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; * * This 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 +427,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -441,7 +441,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional .PlayerDisplaySettings display_settings = 757; + * optional .PlayerDisplaySettings display_settings = 1964; * @param value the displaySettings to set * @return this */ @@ -453,7 +453,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @return whether the signature field is set */ public boolean hasSignature() { @@ -461,7 +461,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @return this */ public PlayerDetailInfo clearSignature() { @@ -471,7 +471,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @return the signature */ public String getSignature() { @@ -479,7 +479,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -487,7 +487,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -496,7 +496,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @param value the signature to set * @return this */ @@ -507,7 +507,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string signature = 3; + * optional string signature = 2; * @param value the signature to set * @return this */ @@ -518,7 +518,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -526,7 +526,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @return this */ public PlayerDetailInfo clearNickname() { @@ -536,7 +536,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @return the nickname */ public String getNickname() { @@ -544,7 +544,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -552,7 +552,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -561,7 +561,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @param value the nickname to set * @return this */ @@ -572,7 +572,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * optional string nickname = 4; + * optional string nickname = 15; * @param value the nickname to set * @return this */ @@ -583,7 +583,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -591,7 +591,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; * @return this */ public PlayerDetailInfo clearDisplayAvatarList() { @@ -601,7 +601,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo 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. @@ -616,7 +616,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo 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 @@ -631,7 +631,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; * @param value the displayAvatarList to add * @return this */ @@ -643,7 +643,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo display_avatar_list = 13; + * repeated .DisplayAvatarDetailInfo display_avatar_list = 7; * @param values the displayAvatarList to add * @return this */ @@ -655,7 +655,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * @return whether the assistAvatarList field is set */ public boolean hasAssistAvatarList() { @@ -663,7 +663,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * @return this */ public PlayerDetailInfo clearAssistAvatarList() { @@ -673,7 +673,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * * This 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 +688,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -703,7 +703,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * @param value the assistAvatarList to add * @return this */ @@ -715,7 +715,7 @@ public final class PlayerDetailInfoOuterClass { } /** - * repeated .DisplayAvatarDetailInfo assist_avatar_list = 425; + * repeated .DisplayAvatarDetailInfo assist_avatar_list = 373; * @param values the assistAvatarList to add * @return this */ @@ -732,9 +732,9 @@ public final class PlayerDetailInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; uid = other.uid; - headIcon = other.headIcon; worldLevel = other.worldLevel; level = other.level; + headIcon = other.headIcon; platformType = other.platformType; showDisplayAvatars = other.showDisplayAvatars; recordInfo.copyFrom(other.recordInfo); @@ -756,15 +756,15 @@ public final class PlayerDetailInfoOuterClass { if (other.hasUid()) { setUid(other.uid); } - if (other.hasHeadIcon()) { - setHeadIcon(other.headIcon); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasHeadIcon()) { + setHeadIcon(other.headIcon); + } if (other.hasPlatformType()) { setPlatformTypeValue(other.platformType); } @@ -800,9 +800,9 @@ public final class PlayerDetailInfoOuterClass { cachedSize = -1; bitField0_ = 0; uid = 0; - headIcon = 0; worldLevel = 0; level = 0; + headIcon = 0; platformType = 0; showDisplayAvatars = false; recordInfo.clear(); @@ -841,9 +841,9 @@ public final class PlayerDetailInfoOuterClass { PlayerDetailInfo other = (PlayerDetailInfo) o; return bitField0_ == other.bitField0_ && (!hasUid() || uid == other.uid) - && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasWorldLevel() || worldLevel == other.worldLevel) && (!hasLevel() || level == other.level) + && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasPlatformType() || platformType == other.platformType) && (!hasShowDisplayAvatars() || showDisplayAvatars == other.showDisplayAvatars) && (!hasRecordInfo() || recordInfo.equals(other.recordInfo)) @@ -857,54 +857,54 @@ public final class PlayerDetailInfoOuterClass { @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) 48); - output.writeUInt32NoTag(headIcon); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(headIcon); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeEnumNoTag(platformType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeBoolNoTag(showDisplayAvatars); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 114); output.writeMessageNoTag(recordInfo); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawLittleEndian16((short) 12202); + output.writeRawLittleEndian16((short) 31458); output.writeMessageNoTag(displaySettings); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 18); output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 122); output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(displayAvatarList.get(i)); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < assistAvatarList.length(); i++) { - output.writeRawLittleEndian16((short) 6858); + output.writeRawLittleEndian16((short) 6058); output.writeMessageNoTag(assistAvatarList.get(i)); } } @@ -917,14 +917,14 @@ public final class PlayerDetailInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); + } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); } @@ -959,43 +959,43 @@ public final class PlayerDetailInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 24: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 40) { break; } } - case 48: { + case 40: { + // worldLevel + worldLevel = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { // headIcon headIcon = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // platformType final int value = input.readInt32(); if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { @@ -1003,64 +1003,64 @@ public final class PlayerDetailInfoOuterClass { bitField0_ |= 0x00000010; } tag = input.readTag(); - if (tag != 112) { + if (tag != 64) { break; } } - case 112: { + case 64: { // showDisplayAvatars showDisplayAvatars = input.readBool(); bitField0_ |= 0x00000020; tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // recordInfo + input.readMessage(recordInfo); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 15714) { + break; + } + } + case 15714: { + // displaySettings + input.readMessage(displaySettings); + bitField0_ |= 0x00000080; + 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) { break; } } case 58: { - // recordInfo - input.readMessage(recordInfo); - bitField0_ |= 0x00000040; - tag = input.readTag(); - if (tag != 6058) { - break; - } - } - case 6058: { - // displaySettings - input.readMessage(displaySettings); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 26) { - break; - } - } - case 26: { - // signature - input.readString(signature); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 34) { - break; - } - } - case 34: { - // nickname - input.readString(nickname); - bitField0_ |= 0x00000200; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { // displayAvatarList tag = input.readRepeatedMessage(displayAvatarList, tag); bitField0_ |= 0x00000400; - if (tag != 3402) { + if (tag != 2986) { break; } } - case 3402: { + case 2986: { // assistAvatarList tag = input.readRepeatedMessage(assistAvatarList, tag); bitField0_ |= 0x00000800; @@ -1089,14 +1089,14 @@ public final class PlayerDetailInfoOuterClass { output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.headIcon, headIcon); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.headIcon, headIcon); + } if ((bitField0_ & 0x00000010) != 0) { output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); } @@ -1142,24 +1142,12 @@ public final class PlayerDetailInfoOuterClass { } break; } - case -1116107143: - case -219098248: { - if (input.isAtField(FieldNames.headIcon)) { - if (!input.trySkipNullValue()) { - headIcon = 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; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -1170,6 +1158,18 @@ public final class PlayerDetailInfoOuterClass { 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_ |= 0x00000008; } } else { @@ -1331,12 +1331,12 @@ public final class PlayerDetailInfoOuterClass { static class FieldNames { static final FieldName uid = FieldName.forField("uid"); - static final FieldName headIcon = FieldName.forField("headIcon", "head_icon"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); static final FieldName level = FieldName.forField("level"); + static final FieldName headIcon = FieldName.forField("headIcon", "head_icon"); + static final FieldName platformType = FieldName.forField("platformType", "platform_type"); static final FieldName showDisplayAvatars = FieldName.forField("showDisplayAvatars", "show_display_avatars"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerDisplaySettingsOuterClass.java index b7f28ea..3a46793 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 NENFHJDADJA = 5; + * optional .DisplayRecordType GLJHHOCLNFC = 10; */ - private int nENFHJDADJA; + private int gLJHHOCLNFC; /** - * optional bool OOAJONLNOKC = 1; + * optional bool LJEELNKPIFJ = 1; */ - private boolean oOAJONLNOKC; + private boolean lJEELNKPIFJ; /** - * optional bool BKFKEAOKJIC = 4; + * optional bool AMGBJCGCHLE = 3; */ - private boolean bKFKEAOKJIC; + private boolean aMGBJCGCHLE; /** - * optional bool KAMIFJJEHJO = 10; + * optional bool IDFLCNJJLDO = 8; */ - private boolean kAMIFJJEHJO; + private boolean iDFLCNJJLDO; /** - * optional bool ACEOIOACIJO = 11; + * optional bool FEEELLEAEPC = 12; */ - private boolean aCEOIOACIJO; + private boolean fEEELLEAEPC; /** - * optional bool DADJOGHHEDE = 14; + * optional bool AOKKOOOODCN = 13; */ - private boolean dADJOGHHEDE; + private boolean aOKKOOOODCN; private PlayerDisplaySettings() { } @@ -59,250 +59,250 @@ public final class PlayerDisplaySettingsOuterClass { } /** - * optional .DisplayRecordType NENFHJDADJA = 5; - * @return whether the nENFHJDADJA field is set + * optional .DisplayRecordType GLJHHOCLNFC = 10; + * @return whether the gLJHHOCLNFC field is set */ - public boolean hasNENFHJDADJA() { + public boolean hasGLJHHOCLNFC() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .DisplayRecordType NENFHJDADJA = 5; + * optional .DisplayRecordType GLJHHOCLNFC = 10; * @return this */ - public PlayerDisplaySettings clearNENFHJDADJA() { + public PlayerDisplaySettings clearGLJHHOCLNFC() { bitField0_ &= ~0x00000001; - nENFHJDADJA = 0; + gLJHHOCLNFC = 0; return this; } /** - * optional .DisplayRecordType NENFHJDADJA = 5; - * @return the nENFHJDADJA + * optional .DisplayRecordType GLJHHOCLNFC = 10; + * @return the gLJHHOCLNFC */ - public DisplayRecordTypeOuterClass.DisplayRecordType getNENFHJDADJA() { - return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(nENFHJDADJA); + public DisplayRecordTypeOuterClass.DisplayRecordType getGLJHHOCLNFC() { + return DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(gLJHHOCLNFC); } /** * Gets the value of the internal enum store. The result is - * equivalent to {@link PlayerDisplaySettings#getNENFHJDADJA()}.getNumber(). + * equivalent to {@link PlayerDisplaySettings#getGLJHHOCLNFC()}.getNumber(). * * @return numeric wire representation */ - public int getNENFHJDADJAValue() { - return nENFHJDADJA; + public int getGLJHHOCLNFCValue() { + return gLJHHOCLNFC; } /** * 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#getNENFHJDADJA()} to return null + * can cause {@link PlayerDisplaySettings#getGLJHHOCLNFC()} to return null * * @param value the numeric wire value to set * @return this */ - public PlayerDisplaySettings setNENFHJDADJAValue(final int value) { + public PlayerDisplaySettings setGLJHHOCLNFCValue(final int value) { bitField0_ |= 0x00000001; - nENFHJDADJA = value; + gLJHHOCLNFC = value; return this; } /** - * optional .DisplayRecordType NENFHJDADJA = 5; - * @param value the nENFHJDADJA to set + * optional .DisplayRecordType GLJHHOCLNFC = 10; + * @param value the gLJHHOCLNFC to set * @return this */ - public PlayerDisplaySettings setNENFHJDADJA( + public PlayerDisplaySettings setGLJHHOCLNFC( final DisplayRecordTypeOuterClass.DisplayRecordType value) { bitField0_ |= 0x00000001; - nENFHJDADJA = value.getNumber(); + gLJHHOCLNFC = value.getNumber(); return this; } /** - * optional bool OOAJONLNOKC = 1; - * @return whether the oOAJONLNOKC field is set + * optional bool LJEELNKPIFJ = 1; + * @return whether the lJEELNKPIFJ field is set */ - public boolean hasOOAJONLNOKC() { + public boolean hasLJEELNKPIFJ() { return (bitField0_ & 0x00000002) != 0; } /** - * optional bool OOAJONLNOKC = 1; + * optional bool LJEELNKPIFJ = 1; * @return this */ - public PlayerDisplaySettings clearOOAJONLNOKC() { + public PlayerDisplaySettings clearLJEELNKPIFJ() { bitField0_ &= ~0x00000002; - oOAJONLNOKC = false; + lJEELNKPIFJ = false; return this; } /** - * optional bool OOAJONLNOKC = 1; - * @return the oOAJONLNOKC + * optional bool LJEELNKPIFJ = 1; + * @return the lJEELNKPIFJ */ - public boolean getOOAJONLNOKC() { - return oOAJONLNOKC; + public boolean getLJEELNKPIFJ() { + return lJEELNKPIFJ; } /** - * optional bool OOAJONLNOKC = 1; - * @param value the oOAJONLNOKC to set + * optional bool LJEELNKPIFJ = 1; + * @param value the lJEELNKPIFJ to set * @return this */ - public PlayerDisplaySettings setOOAJONLNOKC(final boolean value) { + public PlayerDisplaySettings setLJEELNKPIFJ(final boolean value) { bitField0_ |= 0x00000002; - oOAJONLNOKC = value; + lJEELNKPIFJ = value; return this; } /** - * optional bool BKFKEAOKJIC = 4; - * @return whether the bKFKEAOKJIC field is set + * optional bool AMGBJCGCHLE = 3; + * @return whether the aMGBJCGCHLE field is set */ - public boolean hasBKFKEAOKJIC() { + public boolean hasAMGBJCGCHLE() { return (bitField0_ & 0x00000004) != 0; } /** - * optional bool BKFKEAOKJIC = 4; + * optional bool AMGBJCGCHLE = 3; * @return this */ - public PlayerDisplaySettings clearBKFKEAOKJIC() { + public PlayerDisplaySettings clearAMGBJCGCHLE() { bitField0_ &= ~0x00000004; - bKFKEAOKJIC = false; + aMGBJCGCHLE = false; return this; } /** - * optional bool BKFKEAOKJIC = 4; - * @return the bKFKEAOKJIC + * optional bool AMGBJCGCHLE = 3; + * @return the aMGBJCGCHLE */ - public boolean getBKFKEAOKJIC() { - return bKFKEAOKJIC; + public boolean getAMGBJCGCHLE() { + return aMGBJCGCHLE; } /** - * optional bool BKFKEAOKJIC = 4; - * @param value the bKFKEAOKJIC to set + * optional bool AMGBJCGCHLE = 3; + * @param value the aMGBJCGCHLE to set * @return this */ - public PlayerDisplaySettings setBKFKEAOKJIC(final boolean value) { + public PlayerDisplaySettings setAMGBJCGCHLE(final boolean value) { bitField0_ |= 0x00000004; - bKFKEAOKJIC = value; + aMGBJCGCHLE = value; return this; } /** - * optional bool KAMIFJJEHJO = 10; - * @return whether the kAMIFJJEHJO field is set + * optional bool IDFLCNJJLDO = 8; + * @return whether the iDFLCNJJLDO field is set */ - public boolean hasKAMIFJJEHJO() { + public boolean hasIDFLCNJJLDO() { return (bitField0_ & 0x00000008) != 0; } /** - * optional bool KAMIFJJEHJO = 10; + * optional bool IDFLCNJJLDO = 8; * @return this */ - public PlayerDisplaySettings clearKAMIFJJEHJO() { + public PlayerDisplaySettings clearIDFLCNJJLDO() { bitField0_ &= ~0x00000008; - kAMIFJJEHJO = false; + iDFLCNJJLDO = false; return this; } /** - * optional bool KAMIFJJEHJO = 10; - * @return the kAMIFJJEHJO + * optional bool IDFLCNJJLDO = 8; + * @return the iDFLCNJJLDO */ - public boolean getKAMIFJJEHJO() { - return kAMIFJJEHJO; + public boolean getIDFLCNJJLDO() { + return iDFLCNJJLDO; } /** - * optional bool KAMIFJJEHJO = 10; - * @param value the kAMIFJJEHJO to set + * optional bool IDFLCNJJLDO = 8; + * @param value the iDFLCNJJLDO to set * @return this */ - public PlayerDisplaySettings setKAMIFJJEHJO(final boolean value) { + public PlayerDisplaySettings setIDFLCNJJLDO(final boolean value) { bitField0_ |= 0x00000008; - kAMIFJJEHJO = value; + iDFLCNJJLDO = value; return this; } /** - * optional bool ACEOIOACIJO = 11; - * @return whether the aCEOIOACIJO field is set + * optional bool FEEELLEAEPC = 12; + * @return whether the fEEELLEAEPC field is set */ - public boolean hasACEOIOACIJO() { + public boolean hasFEEELLEAEPC() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool ACEOIOACIJO = 11; + * optional bool FEEELLEAEPC = 12; * @return this */ - public PlayerDisplaySettings clearACEOIOACIJO() { + public PlayerDisplaySettings clearFEEELLEAEPC() { bitField0_ &= ~0x00000010; - aCEOIOACIJO = false; + fEEELLEAEPC = false; return this; } /** - * optional bool ACEOIOACIJO = 11; - * @return the aCEOIOACIJO + * optional bool FEEELLEAEPC = 12; + * @return the fEEELLEAEPC */ - public boolean getACEOIOACIJO() { - return aCEOIOACIJO; + public boolean getFEEELLEAEPC() { + return fEEELLEAEPC; } /** - * optional bool ACEOIOACIJO = 11; - * @param value the aCEOIOACIJO to set + * optional bool FEEELLEAEPC = 12; + * @param value the fEEELLEAEPC to set * @return this */ - public PlayerDisplaySettings setACEOIOACIJO(final boolean value) { + public PlayerDisplaySettings setFEEELLEAEPC(final boolean value) { bitField0_ |= 0x00000010; - aCEOIOACIJO = value; + fEEELLEAEPC = value; return this; } /** - * optional bool DADJOGHHEDE = 14; - * @return whether the dADJOGHHEDE field is set + * optional bool AOKKOOOODCN = 13; + * @return whether the aOKKOOOODCN field is set */ - public boolean hasDADJOGHHEDE() { + public boolean hasAOKKOOOODCN() { return (bitField0_ & 0x00000020) != 0; } /** - * optional bool DADJOGHHEDE = 14; + * optional bool AOKKOOOODCN = 13; * @return this */ - public PlayerDisplaySettings clearDADJOGHHEDE() { + public PlayerDisplaySettings clearAOKKOOOODCN() { bitField0_ &= ~0x00000020; - dADJOGHHEDE = false; + aOKKOOOODCN = false; return this; } /** - * optional bool DADJOGHHEDE = 14; - * @return the dADJOGHHEDE + * optional bool AOKKOOOODCN = 13; + * @return the aOKKOOOODCN */ - public boolean getDADJOGHHEDE() { - return dADJOGHHEDE; + public boolean getAOKKOOOODCN() { + return aOKKOOOODCN; } /** - * optional bool DADJOGHHEDE = 14; - * @param value the dADJOGHHEDE to set + * optional bool AOKKOOOODCN = 13; + * @param value the aOKKOOOODCN to set * @return this */ - public PlayerDisplaySettings setDADJOGHHEDE(final boolean value) { + public PlayerDisplaySettings setAOKKOOOODCN(final boolean value) { bitField0_ |= 0x00000020; - dADJOGHHEDE = value; + aOKKOOOODCN = value; return this; } @@ -311,12 +311,12 @@ public final class PlayerDisplaySettingsOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - nENFHJDADJA = other.nENFHJDADJA; - oOAJONLNOKC = other.oOAJONLNOKC; - bKFKEAOKJIC = other.bKFKEAOKJIC; - kAMIFJJEHJO = other.kAMIFJJEHJO; - aCEOIOACIJO = other.aCEOIOACIJO; - dADJOGHHEDE = other.dADJOGHHEDE; + gLJHHOCLNFC = other.gLJHHOCLNFC; + lJEELNKPIFJ = other.lJEELNKPIFJ; + aMGBJCGCHLE = other.aMGBJCGCHLE; + iDFLCNJJLDO = other.iDFLCNJJLDO; + fEEELLEAEPC = other.fEEELLEAEPC; + aOKKOOOODCN = other.aOKKOOOODCN; } return this; } @@ -327,23 +327,23 @@ public final class PlayerDisplaySettingsOuterClass { return this; } cachedSize = -1; - if (other.hasNENFHJDADJA()) { - setNENFHJDADJAValue(other.nENFHJDADJA); + if (other.hasGLJHHOCLNFC()) { + setGLJHHOCLNFCValue(other.gLJHHOCLNFC); } - if (other.hasOOAJONLNOKC()) { - setOOAJONLNOKC(other.oOAJONLNOKC); + if (other.hasLJEELNKPIFJ()) { + setLJEELNKPIFJ(other.lJEELNKPIFJ); } - if (other.hasBKFKEAOKJIC()) { - setBKFKEAOKJIC(other.bKFKEAOKJIC); + if (other.hasAMGBJCGCHLE()) { + setAMGBJCGCHLE(other.aMGBJCGCHLE); } - if (other.hasKAMIFJJEHJO()) { - setKAMIFJJEHJO(other.kAMIFJJEHJO); + if (other.hasIDFLCNJJLDO()) { + setIDFLCNJJLDO(other.iDFLCNJJLDO); } - if (other.hasACEOIOACIJO()) { - setACEOIOACIJO(other.aCEOIOACIJO); + if (other.hasFEEELLEAEPC()) { + setFEEELLEAEPC(other.fEEELLEAEPC); } - if (other.hasDADJOGHHEDE()) { - setDADJOGHHEDE(other.dADJOGHHEDE); + if (other.hasAOKKOOOODCN()) { + setAOKKOOOODCN(other.aOKKOOOODCN); } return this; } @@ -355,12 +355,12 @@ public final class PlayerDisplaySettingsOuterClass { } cachedSize = -1; bitField0_ = 0; - nENFHJDADJA = 0; - oOAJONLNOKC = false; - bKFKEAOKJIC = false; - kAMIFJJEHJO = false; - aCEOIOACIJO = false; - dADJOGHHEDE = false; + gLJHHOCLNFC = 0; + lJEELNKPIFJ = false; + aMGBJCGCHLE = false; + iDFLCNJJLDO = false; + fEEELLEAEPC = false; + aOKKOOOODCN = false; return this; } @@ -384,39 +384,39 @@ public final class PlayerDisplaySettingsOuterClass { } PlayerDisplaySettings other = (PlayerDisplaySettings) o; return bitField0_ == other.bitField0_ - && (!hasNENFHJDADJA() || nENFHJDADJA == other.nENFHJDADJA) - && (!hasOOAJONLNOKC() || oOAJONLNOKC == other.oOAJONLNOKC) - && (!hasBKFKEAOKJIC() || bKFKEAOKJIC == other.bKFKEAOKJIC) - && (!hasKAMIFJJEHJO() || kAMIFJJEHJO == other.kAMIFJJEHJO) - && (!hasACEOIOACIJO() || aCEOIOACIJO == other.aCEOIOACIJO) - && (!hasDADJOGHHEDE() || dADJOGHHEDE == other.dADJOGHHEDE); + && (!hasGLJHHOCLNFC() || gLJHHOCLNFC == other.gLJHHOCLNFC) + && (!hasLJEELNKPIFJ() || lJEELNKPIFJ == other.lJEELNKPIFJ) + && (!hasAMGBJCGCHLE() || aMGBJCGCHLE == other.aMGBJCGCHLE) + && (!hasIDFLCNJJLDO() || iDFLCNJJLDO == other.iDFLCNJJLDO) + && (!hasFEEELLEAEPC() || fEEELLEAEPC == other.fEEELLEAEPC) + && (!hasAOKKOOOODCN() || aOKKOOOODCN == other.aOKKOOOODCN); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeEnumNoTag(nENFHJDADJA); + output.writeRawByte((byte) 80); + output.writeEnumNoTag(gLJHHOCLNFC); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeBoolNoTag(oOAJONLNOKC); + output.writeBoolNoTag(lJEELNKPIFJ); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeBoolNoTag(bKFKEAOKJIC); + output.writeRawByte((byte) 24); + output.writeBoolNoTag(aMGBJCGCHLE); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeBoolNoTag(kAMIFJJEHJO); + output.writeRawByte((byte) 64); + output.writeBoolNoTag(iDFLCNJJLDO); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeBoolNoTag(aCEOIOACIJO); + output.writeRawByte((byte) 96); + output.writeBoolNoTag(fEEELLEAEPC); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); - output.writeBoolNoTag(dADJOGHHEDE); + output.writeRawByte((byte) 104); + output.writeBoolNoTag(aOKKOOOODCN); } } @@ -424,7 +424,7 @@ public final class PlayerDisplaySettingsOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(nENFHJDADJA); + size += 1 + ProtoSink.computeEnumSizeNoTag(gLJHHOCLNFC); } if ((bitField0_ & 0x00000002) != 0) { size += 2; @@ -451,11 +451,11 @@ public final class PlayerDisplaySettingsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // nENFHJDADJA + case 80: { + // gLJHHOCLNFC final int value = input.readInt32(); if (DisplayRecordTypeOuterClass.DisplayRecordType.forNumber(value) != null) { - nENFHJDADJA = value; + gLJHHOCLNFC = value; bitField0_ |= 0x00000001; } tag = input.readTag(); @@ -464,44 +464,44 @@ public final class PlayerDisplaySettingsOuterClass { } } case 8: { - // oOAJONLNOKC - oOAJONLNOKC = input.readBool(); + // lJEELNKPIFJ + lJEELNKPIFJ = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 24) { break; } } - case 32: { - // bKFKEAOKJIC - bKFKEAOKJIC = input.readBool(); + case 24: { + // aMGBJCGCHLE + aMGBJCGCHLE = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { - // kAMIFJJEHJO - kAMIFJJEHJO = input.readBool(); + case 64: { + // iDFLCNJJLDO + iDFLCNJJLDO = input.readBool(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { - // aCEOIOACIJO - aCEOIOACIJO = input.readBool(); + case 96: { + // fEEELLEAEPC + fEEELLEAEPC = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // dADJOGHHEDE - dADJOGHHEDE = input.readBool(); + case 104: { + // aOKKOOOODCN + aOKKOOOODCN = 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.nENFHJDADJA, nENFHJDADJA, DisplayRecordTypeOuterClass.DisplayRecordType.converter()); + output.writeEnum(FieldNames.gLJHHOCLNFC, gLJHHOCLNFC, DisplayRecordTypeOuterClass.DisplayRecordType.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeBool(FieldNames.oOAJONLNOKC, oOAJONLNOKC); + output.writeBool(FieldNames.lJEELNKPIFJ, lJEELNKPIFJ); } if ((bitField0_ & 0x00000004) != 0) { - output.writeBool(FieldNames.bKFKEAOKJIC, bKFKEAOKJIC); + output.writeBool(FieldNames.aMGBJCGCHLE, aMGBJCGCHLE); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.kAMIFJJEHJO, kAMIFJJEHJO); + output.writeBool(FieldNames.iDFLCNJJLDO, iDFLCNJJLDO); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.aCEOIOACIJO, aCEOIOACIJO); + output.writeBool(FieldNames.fEEELLEAEPC, fEEELLEAEPC); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.dADJOGHHEDE, dADJOGHHEDE); + output.writeBool(FieldNames.aOKKOOOODCN, aOKKOOOODCN); } output.endObject(); } @@ -553,12 +553,12 @@ public final class PlayerDisplaySettingsOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 751445645: { - if (input.isAtField(FieldNames.nENFHJDADJA)) { + case 1337672088: { + if (input.isAtField(FieldNames.gLJHHOCLNFC)) { if (!input.trySkipNullValue()) { final DisplayRecordTypeOuterClass.DisplayRecordType value = input.readEnum(DisplayRecordTypeOuterClass.DisplayRecordType.converter()); if (value != null) { - nENFHJDADJA = value.getNumber(); + gLJHHOCLNFC = value.getNumber(); bitField0_ |= 0x00000001; } else { input.skipUnknownEnumValue(); @@ -569,10 +569,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -567401347: { - if (input.isAtField(FieldNames.oOAJONLNOKC)) { + case 83671720: { + if (input.isAtField(FieldNames.lJEELNKPIFJ)) { if (!input.trySkipNullValue()) { - oOAJONLNOKC = input.readBool(); + lJEELNKPIFJ = input.readBool(); bitField0_ |= 0x00000002; } } else { @@ -580,10 +580,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -1549915682: { - if (input.isAtField(FieldNames.bKFKEAOKJIC)) { + case -266688539: { + if (input.isAtField(FieldNames.aMGBJCGCHLE)) { if (!input.trySkipNullValue()) { - bKFKEAOKJIC = input.readBool(); + aMGBJCGCHLE = input.readBool(); bitField0_ |= 0x00000004; } } else { @@ -591,10 +591,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -690005892: { - if (input.isAtField(FieldNames.kAMIFJJEHJO)) { + case 467257547: { + if (input.isAtField(FieldNames.iDFLCNJJLDO)) { if (!input.trySkipNullValue()) { - kAMIFJJEHJO = input.readBool(); + iDFLCNJJLDO = input.readBool(); bitField0_ |= 0x00000008; } } else { @@ -602,10 +602,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case 1650591930: { - if (input.isAtField(FieldNames.aCEOIOACIJO)) { + case -1100204323: { + if (input.isAtField(FieldNames.fEEELLEAEPC)) { if (!input.trySkipNullValue()) { - aCEOIOACIJO = input.readBool(); + fEEELLEAEPC = input.readBool(); bitField0_ |= 0x00000010; } } else { @@ -613,10 +613,10 @@ public final class PlayerDisplaySettingsOuterClass { } break; } - case -856266613: { - if (input.isAtField(FieldNames.dADJOGHHEDE)) { + case -300332511: { + if (input.isAtField(FieldNames.aOKKOOOODCN)) { if (!input.trySkipNullValue()) { - dADJOGHHEDE = input.readBool(); + aOKKOOOODCN = 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 nENFHJDADJA = FieldName.forField("NENFHJDADJA"); + static final FieldName gLJHHOCLNFC = FieldName.forField("GLJHHOCLNFC"); - static final FieldName oOAJONLNOKC = FieldName.forField("OOAJONLNOKC"); + static final FieldName lJEELNKPIFJ = FieldName.forField("LJEELNKPIFJ"); - static final FieldName bKFKEAOKJIC = FieldName.forField("BKFKEAOKJIC"); + static final FieldName aMGBJCGCHLE = FieldName.forField("AMGBJCGCHLE"); - static final FieldName kAMIFJJEHJO = FieldName.forField("KAMIFJJEHJO"); + static final FieldName iDFLCNJJLDO = FieldName.forField("IDFLCNJJLDO"); - static final FieldName aCEOIOACIJO = FieldName.forField("ACEOIOACIJO"); + static final FieldName fEEELLEAEPC = FieldName.forField("FEEELLEAEPC"); - static final FieldName dADJOGHHEDE = FieldName.forField("DADJOGHHEDE"); + static final FieldName aOKKOOOODCN = FieldName.forField("AOKKOOOODCN"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java index 9bfc17f..2f49f7c 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenCsReqOuterClass.java @@ -20,20 +20,20 @@ public final class PlayerGetTokenCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 platform_type = 15; + * optional uint32 platform_type = 1; */ private int platformType; - /** - * optional string account_uid = 6; - */ - private final Utf8String accountUid = Utf8String.newEmptyInstance(); - /** * optional string token = 9; */ private final Utf8String token = Utf8String.newEmptyInstance(); + /** + * optional string account_uid = 13; + */ + private final Utf8String accountUid = Utf8String.newEmptyInstance(); + private PlayerGetTokenCsReq() { } @@ -45,7 +45,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 15; + * optional uint32 platform_type = 1; * @return whether the platformType field is set */ public boolean hasPlatformType() { @@ -53,7 +53,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 15; + * optional uint32 platform_type = 1; * @return this */ public PlayerGetTokenCsReq clearPlatformType() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 15; + * optional uint32 platform_type = 1; * @return the platformType */ public int getPlatformType() { @@ -71,7 +71,7 @@ public final class PlayerGetTokenCsReqOuterClass { } /** - * optional uint32 platform_type = 15; + * optional uint32 platform_type = 1; * @param value the platformType to set * @return this */ @@ -81,77 +81,12 @@ public final class PlayerGetTokenCsReqOuterClass { return this; } - /** - * optional string account_uid = 6; - * @return whether the accountUid field is set - */ - public boolean hasAccountUid() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional string account_uid = 6; - * @return this - */ - public PlayerGetTokenCsReq clearAccountUid() { - bitField0_ &= ~0x00000002; - accountUid.clear(); - return this; - } - - /** - * optional string account_uid = 6; - * @return the accountUid - */ - public String getAccountUid() { - return accountUid.getString(); - } - - /** - * optional string account_uid = 6; - * @return internal {@code Utf8String} representation of accountUid for reading - */ - public Utf8String getAccountUidBytes() { - return this.accountUid; - } - - /** - * optional string account_uid = 6; - * @return internal {@code Utf8String} representation of accountUid for modifications - */ - public Utf8String getMutableAccountUidBytes() { - bitField0_ |= 0x00000002; - return this.accountUid; - } - - /** - * optional string account_uid = 6; - * @param value the accountUid to set - * @return this - */ - public PlayerGetTokenCsReq setAccountUid(final CharSequence value) { - bitField0_ |= 0x00000002; - accountUid.copyFrom(value); - return this; - } - - /** - * optional string account_uid = 6; - * @param value the accountUid to set - * @return this - */ - public PlayerGetTokenCsReq setAccountUid(final Utf8String value) { - bitField0_ |= 0x00000002; - accountUid.copyFrom(value); - return this; - } - /** * optional string token = 9; * @return whether the token field is set */ public boolean hasToken() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -159,7 +94,7 @@ public final class PlayerGetTokenCsReqOuterClass { * @return this */ public PlayerGetTokenCsReq clearToken() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; token.clear(); return this; } @@ -185,7 +120,7 @@ public final class PlayerGetTokenCsReqOuterClass { * @return internal {@code Utf8String} representation of token for modifications */ public Utf8String getMutableTokenBytes() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return this.token; } @@ -195,7 +130,7 @@ public final class PlayerGetTokenCsReqOuterClass { * @return this */ public PlayerGetTokenCsReq setToken(final CharSequence value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; token.copyFrom(value); return this; } @@ -206,19 +141,84 @@ public final class PlayerGetTokenCsReqOuterClass { * @return this */ public PlayerGetTokenCsReq setToken(final Utf8String value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; token.copyFrom(value); return this; } + /** + * optional string account_uid = 13; + * @return whether the accountUid field is set + */ + public boolean hasAccountUid() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional string account_uid = 13; + * @return this + */ + public PlayerGetTokenCsReq clearAccountUid() { + bitField0_ &= ~0x00000004; + accountUid.clear(); + return this; + } + + /** + * optional string account_uid = 13; + * @return the accountUid + */ + public String getAccountUid() { + return accountUid.getString(); + } + + /** + * optional string account_uid = 13; + * @return internal {@code Utf8String} representation of accountUid for reading + */ + public Utf8String getAccountUidBytes() { + return this.accountUid; + } + + /** + * optional string account_uid = 13; + * @return internal {@code Utf8String} representation of accountUid for modifications + */ + public Utf8String getMutableAccountUidBytes() { + bitField0_ |= 0x00000004; + return this.accountUid; + } + + /** + * optional string account_uid = 13; + * @param value the accountUid to set + * @return this + */ + public PlayerGetTokenCsReq setAccountUid(final CharSequence value) { + bitField0_ |= 0x00000004; + accountUid.copyFrom(value); + return this; + } + + /** + * optional string account_uid = 13; + * @param value the accountUid to set + * @return this + */ + public PlayerGetTokenCsReq setAccountUid(final Utf8String value) { + bitField0_ |= 0x00000004; + accountUid.copyFrom(value); + return this; + } + @Override public PlayerGetTokenCsReq copyFrom(final PlayerGetTokenCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; platformType = other.platformType; - accountUid.copyFrom(other.accountUid); token.copyFrom(other.token); + accountUid.copyFrom(other.accountUid); } return this; } @@ -232,12 +232,12 @@ public final class PlayerGetTokenCsReqOuterClass { if (other.hasPlatformType()) { setPlatformType(other.platformType); } - if (other.hasAccountUid()) { - getMutableAccountUidBytes().copyFrom(other.accountUid); - } if (other.hasToken()) { getMutableTokenBytes().copyFrom(other.token); } + if (other.hasAccountUid()) { + getMutableAccountUidBytes().copyFrom(other.accountUid); + } return this; } @@ -249,8 +249,8 @@ public final class PlayerGetTokenCsReqOuterClass { cachedSize = -1; bitField0_ = 0; platformType = 0; - accountUid.clear(); token.clear(); + accountUid.clear(); return this; } @@ -261,8 +261,8 @@ public final class PlayerGetTokenCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - accountUid.clear(); token.clear(); + accountUid.clear(); return this; } @@ -277,24 +277,24 @@ public final class PlayerGetTokenCsReqOuterClass { PlayerGetTokenCsReq other = (PlayerGetTokenCsReq) o; return bitField0_ == other.bitField0_ && (!hasPlatformType() || platformType == other.platformType) - && (!hasAccountUid() || accountUid.equals(other.accountUid)) - && (!hasToken() || token.equals(other.token)); + && (!hasToken() || token.equals(other.token)) + && (!hasAccountUid() || accountUid.equals(other.accountUid)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(platformType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); - output.writeStringNoTag(accountUid); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 74); output.writeStringNoTag(token); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 106); + output.writeStringNoTag(accountUid); + } } @Override @@ -304,10 +304,10 @@ public final class PlayerGetTokenCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(platformType); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(accountUid); + size += 1 + ProtoSink.computeStringSizeNoTag(token); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(token); + size += 1 + ProtoSink.computeStringSizeNoTag(accountUid); } return size; } @@ -319,20 +319,11 @@ public final class PlayerGetTokenCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 8: { // platformType platformType = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // accountUid - input.readString(accountUid); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 74) { break; } @@ -340,6 +331,15 @@ public final class PlayerGetTokenCsReqOuterClass { case 74: { // token input.readString(token); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // accountUid + input.readString(accountUid); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -367,10 +367,10 @@ public final class PlayerGetTokenCsReqOuterClass { output.writeUInt32(FieldNames.platformType, platformType); } if ((bitField0_ & 0x00000002) != 0) { - output.writeString(FieldNames.accountUid, accountUid); + output.writeString(FieldNames.token, token); } if ((bitField0_ & 0x00000004) != 0) { - output.writeString(FieldNames.token, token); + output.writeString(FieldNames.accountUid, accountUid); } output.endObject(); } @@ -394,11 +394,10 @@ public final class PlayerGetTokenCsReqOuterClass { } break; } - case -803342621: - case 866492222: { - if (input.isAtField(FieldNames.accountUid)) { + case 110541305: { + if (input.isAtField(FieldNames.token)) { if (!input.trySkipNullValue()) { - input.readString(accountUid); + input.readString(token); bitField0_ |= 0x00000002; } } else { @@ -406,10 +405,11 @@ public final class PlayerGetTokenCsReqOuterClass { } break; } - case 110541305: { - if (input.isAtField(FieldNames.token)) { + case -803342621: + case 866492222: { + if (input.isAtField(FieldNames.accountUid)) { if (!input.trySkipNullValue()) { - input.readString(token); + input.readString(accountUid); bitField0_ |= 0x00000004; } } else { @@ -472,9 +472,9 @@ public final class PlayerGetTokenCsReqOuterClass { static class FieldNames { static final FieldName platformType = FieldName.forField("platformType", "platform_type"); - static final FieldName accountUid = FieldName.forField("accountUid", "account_uid"); - static final FieldName token = FieldName.forField("token"); + + static final FieldName accountUid = FieldName.forField("accountUid", "account_uid"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java index 28329e5..e80aa28 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerGetTokenScRspOuterClass.java @@ -20,27 +20,27 @@ public final class PlayerGetTokenScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 15; */ private long secretKeySeed; /** - * optional uint32 retcode = 3; - */ - private int retcode; - - /** - * optional uint32 uid = 6; + * optional uint32 uid = 3; */ private int uid; /** - * optional .BlackInfo black_info = 13; + * optional uint32 retcode = 12; + */ + private int retcode; + + /** + * optional .BlackInfo black_info = 2; */ private final BlackInfoOuterClass.BlackInfo blackInfo = BlackInfoOuterClass.BlackInfo.newInstance(); /** - * optional string msg = 11; + * optional string msg = 8; */ private final Utf8String msg = Utf8String.newEmptyInstance(); @@ -55,7 +55,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 15; * @return whether the secretKeySeed field is set */ public boolean hasSecretKeySeed() { @@ -63,7 +63,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 15; * @return this */ public PlayerGetTokenScRsp clearSecretKeySeed() { @@ -73,7 +73,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 15; * @return the secretKeySeed */ public long getSecretKeySeed() { @@ -81,7 +81,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint64 secret_key_seed = 7; + * optional uint64 secret_key_seed = 15; * @param value the secretKeySeed to set * @return this */ @@ -92,62 +92,25 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 retcode = 3; - * @return whether the retcode field is set + * optional uint32 uid = 3; + * @return whether the uid field is set */ - public boolean hasRetcode() { + public boolean hasUid() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 retcode = 3; - * @return this - */ - public PlayerGetTokenScRsp 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 PlayerGetTokenScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; - retcode = value; - return this; - } - - /** - * optional uint32 uid = 6; - * @return whether the uid field is set - */ - public boolean hasUid() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 uid = 6; + * optional uint32 uid = 3; * @return this */ public PlayerGetTokenScRsp clearUid() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; uid = 0; return this; } /** - * optional uint32 uid = 6; + * optional uint32 uid = 3; * @return the uid */ public int getUid() { @@ -155,18 +118,55 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional uint32 uid = 6; + * optional uint32 uid = 3; * @param value the uid to set * @return this */ public PlayerGetTokenScRsp setUid(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; uid = value; return this; } /** - * optional .BlackInfo black_info = 13; + * optional uint32 retcode = 12; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 retcode = 12; + * @return this + */ + public PlayerGetTokenScRsp clearRetcode() { + bitField0_ &= ~0x00000004; + 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 PlayerGetTokenScRsp setRetcode(final int value) { + bitField0_ |= 0x00000004; + retcode = value; + return this; + } + + /** + * optional .BlackInfo black_info = 2; * @return whether the blackInfo field is set */ public boolean hasBlackInfo() { @@ -174,7 +174,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 13; + * optional .BlackInfo black_info = 2; * @return this */ public PlayerGetTokenScRsp clearBlackInfo() { @@ -184,7 +184,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 13; + * optional .BlackInfo black_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. @@ -198,7 +198,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 13; + * optional .BlackInfo black_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 @@ -212,7 +212,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional .BlackInfo black_info = 13; + * optional .BlackInfo black_info = 2; * @param value the blackInfo to set * @return this */ @@ -223,7 +223,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @return whether the msg field is set */ public boolean hasMsg() { @@ -231,7 +231,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @return this */ public PlayerGetTokenScRsp clearMsg() { @@ -241,7 +241,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @return the msg */ public String getMsg() { @@ -249,7 +249,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @return internal {@code Utf8String} representation of msg for reading */ public Utf8String getMsgBytes() { @@ -257,7 +257,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @return internal {@code Utf8String} representation of msg for modifications */ public Utf8String getMutableMsgBytes() { @@ -266,7 +266,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @param value the msg to set * @return this */ @@ -277,7 +277,7 @@ public final class PlayerGetTokenScRspOuterClass { } /** - * optional string msg = 11; + * optional string msg = 8; * @param value the msg to set * @return this */ @@ -293,8 +293,8 @@ public final class PlayerGetTokenScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; secretKeySeed = other.secretKeySeed; - retcode = other.retcode; uid = other.uid; + retcode = other.retcode; blackInfo.copyFrom(other.blackInfo); msg.copyFrom(other.msg); } @@ -310,12 +310,12 @@ public final class PlayerGetTokenScRspOuterClass { if (other.hasSecretKeySeed()) { setSecretKeySeed(other.secretKeySeed); } - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasUid()) { setUid(other.uid); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasBlackInfo()) { getMutableBlackInfo().mergeFrom(other.blackInfo); } @@ -333,8 +333,8 @@ public final class PlayerGetTokenScRspOuterClass { cachedSize = -1; bitField0_ = 0; secretKeySeed = 0L; - retcode = 0; uid = 0; + retcode = 0; blackInfo.clear(); msg.clear(); return this; @@ -363,8 +363,8 @@ public final class PlayerGetTokenScRspOuterClass { PlayerGetTokenScRsp other = (PlayerGetTokenScRsp) o; return bitField0_ == other.bitField0_ && (!hasSecretKeySeed() || secretKeySeed == other.secretKeySeed) - && (!hasRetcode() || retcode == other.retcode) && (!hasUid() || uid == other.uid) + && (!hasRetcode() || retcode == other.retcode) && (!hasBlackInfo() || blackInfo.equals(other.blackInfo)) && (!hasMsg() || msg.equals(other.msg)); } @@ -372,23 +372,23 @@ public final class PlayerGetTokenScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 120); output.writeUInt64NoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); output.writeUInt32NoTag(uid); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 18); output.writeMessageNoTag(blackInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 66); output.writeStringNoTag(msg); } } @@ -400,10 +400,10 @@ public final class PlayerGetTokenScRspOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(blackInfo); @@ -421,7 +421,7 @@ public final class PlayerGetTokenScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 120: { // secretKeySeed secretKeySeed = input.readUInt64(); bitField0_ |= 0x00000001; @@ -431,33 +431,33 @@ public final class PlayerGetTokenScRspOuterClass { } } case 24: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { // uid uid = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { + if (tag != 96) { break; } } - case 106: { + case 96: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { // blackInfo input.readMessage(blackInfo); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 90) { + if (tag != 66) { break; } } - case 90: { + case 66: { // msg input.readString(msg); bitField0_ |= 0x00000010; @@ -487,10 +487,10 @@ public final class PlayerGetTokenScRspOuterClass { output.writeUInt64(FieldNames.secretKeySeed, secretKeySeed); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.uid, uid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.uid, uid); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.blackInfo, blackInfo); @@ -520,10 +520,10 @@ public final class PlayerGetTokenScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 115792: { + if (input.isAtField(FieldNames.uid)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + uid = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -531,10 +531,10 @@ public final class PlayerGetTokenScRspOuterClass { } break; } - case 115792: { - if (input.isAtField(FieldNames.uid)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - uid = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -620,10 +620,10 @@ public final class PlayerGetTokenScRspOuterClass { static class FieldNames { static final FieldName secretKeySeed = FieldName.forField("secretKeySeed", "secret_key_seed"); - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName uid = FieldName.forField("uid"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName blackInfo = FieldName.forField("blackInfo", "black_info"); static final FieldName msg = FieldName.forField("msg"); diff --git a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatCsReqOuterClass.java index 538aec4..7dc9fd6 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 = 8; + * optional uint64 client_time_ms = 11; */ private long clientTimeMs; @@ -34,7 +34,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 11; * @return whether the clientTimeMs field is set */ public boolean hasClientTimeMs() { @@ -42,7 +42,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 11; * @return this */ public PlayerHeartbeatCsReq clearClientTimeMs() { @@ -52,7 +52,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 11; * @return the clientTimeMs */ public long getClientTimeMs() { @@ -60,7 +60,7 @@ public final class PlayerHeartbeatCsReqOuterClass { } /** - * optional uint64 client_time_ms = 8; + * optional uint64 client_time_ms = 11; * @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) 64); + output.writeRawByte((byte) 88); output.writeUInt64NoTag(clientTimeMs); } } @@ -150,7 +150,7 @@ public final class PlayerHeartbeatCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 88: { // 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 a8343cc..24b7213 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerHeartbeatScRspOuterClass.java @@ -19,17 +19,17 @@ public final class PlayerHeartbeatScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 client_time_ms = 6; - */ - private long clientTimeMs; - - /** - * optional uint64 server_time_ms = 15; + * optional uint64 server_time_ms = 3; */ private long serverTimeMs; /** - * optional uint32 retcode = 10; + * optional uint64 client_time_ms = 11; + */ + private long clientTimeMs; + + /** + * optional uint32 retcode = 13; */ private int retcode; @@ -44,62 +44,25 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 client_time_ms = 6; - * @return whether the clientTimeMs field is set + * optional uint64 server_time_ms = 3; + * @return whether the serverTimeMs field is set */ - public boolean hasClientTimeMs() { + public boolean hasServerTimeMs() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint64 client_time_ms = 6; - * @return this - */ - public PlayerHeartbeatScRsp clearClientTimeMs() { - bitField0_ &= ~0x00000001; - clientTimeMs = 0L; - return this; - } - - /** - * optional uint64 client_time_ms = 6; - * @return the clientTimeMs - */ - public long getClientTimeMs() { - return clientTimeMs; - } - - /** - * optional uint64 client_time_ms = 6; - * @param value the clientTimeMs to set - * @return this - */ - public PlayerHeartbeatScRsp setClientTimeMs(final long value) { - bitField0_ |= 0x00000001; - clientTimeMs = value; - return this; - } - - /** - * 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; + * optional uint64 server_time_ms = 3; * @return this */ public PlayerHeartbeatScRsp clearServerTimeMs() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; serverTimeMs = 0L; return this; } /** - * optional uint64 server_time_ms = 15; + * optional uint64 server_time_ms = 3; * @return the serverTimeMs */ public long getServerTimeMs() { @@ -107,18 +70,55 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint64 server_time_ms = 15; + * optional uint64 server_time_ms = 3; * @param value the serverTimeMs to set * @return this */ public PlayerHeartbeatScRsp setServerTimeMs(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; serverTimeMs = value; return this; } /** - * optional uint32 retcode = 10; + * optional uint64 client_time_ms = 11; + * @return whether the clientTimeMs field is set + */ + public boolean hasClientTimeMs() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint64 client_time_ms = 11; + * @return this + */ + public PlayerHeartbeatScRsp clearClientTimeMs() { + bitField0_ &= ~0x00000002; + clientTimeMs = 0L; + return this; + } + + /** + * optional uint64 client_time_ms = 11; + * @return the clientTimeMs + */ + public long getClientTimeMs() { + return clientTimeMs; + } + + /** + * optional uint64 client_time_ms = 11; + * @param value the clientTimeMs to set + * @return this + */ + public PlayerHeartbeatScRsp setClientTimeMs(final long value) { + bitField0_ |= 0x00000002; + clientTimeMs = value; + return this; + } + + /** + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -126,7 +126,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 13; * @return this */ public PlayerHeartbeatScRsp clearRetcode() { @@ -136,7 +136,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -144,7 +144,7 @@ public final class PlayerHeartbeatScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 13; * @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_; - clientTimeMs = other.clientTimeMs; serverTimeMs = other.serverTimeMs; + clientTimeMs = other.clientTimeMs; retcode = other.retcode; } return this; @@ -172,12 +172,12 @@ public final class PlayerHeartbeatScRspOuterClass { return this; } cachedSize = -1; - if (other.hasClientTimeMs()) { - setClientTimeMs(other.clientTimeMs); - } if (other.hasServerTimeMs()) { setServerTimeMs(other.serverTimeMs); } + if (other.hasClientTimeMs()) { + setClientTimeMs(other.clientTimeMs); + } if (other.hasRetcode()) { setRetcode(other.retcode); } @@ -191,8 +191,8 @@ public final class PlayerHeartbeatScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - clientTimeMs = 0L; serverTimeMs = 0L; + clientTimeMs = 0L; retcode = 0; return this; } @@ -217,23 +217,23 @@ public final class PlayerHeartbeatScRspOuterClass { } PlayerHeartbeatScRsp other = (PlayerHeartbeatScRsp) o; return bitField0_ == other.bitField0_ - && (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs) && (!hasServerTimeMs() || serverTimeMs == other.serverTimeMs) + && (!hasClientTimeMs() || clientTimeMs == other.clientTimeMs) && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt64NoTag(clientTimeMs); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt64NoTag(serverTimeMs); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt64NoTag(clientTimeMs); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 104); 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(clientTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt64SizeNoTag(serverTimeMs); + size += 1 + ProtoSink.computeUInt64SizeNoTag(clientTimeMs); } 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 48: { - // clientTimeMs - clientTimeMs = input.readUInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 24: { // serverTimeMs serverTimeMs = input.readUInt64(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { + // clientTimeMs + clientTimeMs = input.readUInt64(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // 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.clientTimeMs, clientTimeMs); + output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt64(FieldNames.serverTimeMs, serverTimeMs); + output.writeUInt64(FieldNames.clientTimeMs, clientTimeMs); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); @@ -323,11 +323,11 @@ public final class PlayerHeartbeatScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class PlayerHeartbeatScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class PlayerHeartbeatScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_time_ms"); - static final FieldName serverTimeMs = FieldName.forField("serverTimeMs", "server_time_ms"); + static final FieldName clientTimeMs = FieldName.forField("clientTimeMs", "client_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 2d5ffc0..e87bf6f 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayerLoginScRspOuterClass.java @@ -19,7 +19,7 @@ public final class PlayerLoginScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 7; */ private long serverTimestampMs; @@ -29,22 +29,22 @@ public final class PlayerLoginScRspOuterClass { private long loginRandom; /** - * optional uint32 stamina = 2; + * optional uint32 stamina = 1; */ private int stamina; /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional sint32 cur_timezone = 13; + * optional sint32 cur_timezone = 12; */ private int curTimezone; /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_info = 9; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); @@ -59,7 +59,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 7; * @return whether the serverTimestampMs field is set */ public boolean hasServerTimestampMs() { @@ -67,7 +67,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 7; * @return this */ public PlayerLoginScRsp clearServerTimestampMs() { @@ -77,7 +77,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 7; * @return the serverTimestampMs */ public long getServerTimestampMs() { @@ -85,7 +85,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint64 server_timestamp_ms = 8; + * optional uint64 server_timestamp_ms = 7; * @param value the serverTimestampMs to set * @return this */ @@ -133,7 +133,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 2; + * optional uint32 stamina = 1; * @return whether the stamina field is set */ public boolean hasStamina() { @@ -141,7 +141,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 2; + * optional uint32 stamina = 1; * @return this */ public PlayerLoginScRsp clearStamina() { @@ -151,7 +151,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 2; + * optional uint32 stamina = 1; * @return the stamina */ public int getStamina() { @@ -159,7 +159,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 stamina = 2; + * optional uint32 stamina = 1; * @param value the stamina to set * @return this */ @@ -170,7 +170,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -178,7 +178,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @return this */ public PlayerLoginScRsp clearRetcode() { @@ -188,7 +188,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -196,7 +196,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -207,7 +207,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 13; + * optional sint32 cur_timezone = 12; * @return whether the curTimezone field is set */ public boolean hasCurTimezone() { @@ -215,7 +215,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 13; + * optional sint32 cur_timezone = 12; * @return this */ public PlayerLoginScRsp clearCurTimezone() { @@ -225,7 +225,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 13; + * optional sint32 cur_timezone = 12; * @return the curTimezone */ public int getCurTimezone() { @@ -233,7 +233,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional sint32 cur_timezone = 13; + * optional sint32 cur_timezone = 12; * @param value the curTimezone to set * @return this */ @@ -244,7 +244,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_info = 9; * @return whether the basicInfo field is set */ public boolean hasBasicInfo() { @@ -252,7 +252,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_info = 9; * @return this */ public PlayerLoginScRsp clearBasicInfo() { @@ -262,7 +262,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_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. @@ -276,7 +276,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_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 @@ -290,7 +290,7 @@ public final class PlayerLoginScRspOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 7; + * optional .PlayerBasicInfo basic_info = 9; * @param value the basicInfo to set * @return this */ @@ -390,7 +390,7 @@ public final class PlayerLoginScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 56); output.writeUInt64NoTag(serverTimestampMs); } if ((bitField0_ & 0x00000002) != 0) { @@ -398,19 +398,19 @@ public final class PlayerLoginScRspOuterClass { output.writeUInt64NoTag(loginRandom); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 96); output.writeSInt32NoTag(curTimezone); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 74); output.writeMessageNoTag(basicInfo); } } @@ -446,7 +446,7 @@ public final class PlayerLoginScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 56: { // serverTimestampMs serverTimestampMs = input.readUInt64(); bitField0_ |= 0x00000001; @@ -460,38 +460,38 @@ public final class PlayerLoginScRspOuterClass { loginRandom = input.readUInt64(); 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 != 40) { - break; - } - } - case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { + case 96: { // curTimezone curTimezone = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 58) { + if (tag != 74) { break; } } - case 58: { + case 74: { // basicInfo input.readMessage(basicInfo); bitField0_ |= 0x00000020; diff --git a/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayerRecordInfoOuterClass.java index b867ba2..81a377c 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 GBNLDJIPEEK = 1; + * optional uint32 LAAOICJFOPI = 1; */ - private int gBNLDJIPEEK; + private int lAAOICJFOPI; /** - * optional uint32 FKBLOGEAFJJ = 2; + * optional uint32 PDHAFOAOMPB = 2; */ - private int fKBLOGEAFJJ; + private int pDHAFOAOMPB; /** - * optional uint32 GDHMMFELCDH = 3; + * optional uint32 DKDINDMGEJH = 5; */ - private int gDHMMFELCDH; + private int dKDINDMGEJH; /** - * optional uint32 MODAPIGJNNJ = 5; + * optional uint32 BFGDPMKBHNB = 6; */ - private int mODAPIGJNNJ; + private int bFGDPMKBHNB; /** - * optional uint32 HFJEBEENDDH = 7; + * optional uint32 JJOHCDLEDMO = 11; */ - private int hFJEBEENDDH; + private int jJOHCDLEDMO; /** - * optional uint32 KOKKGADOAGL = 12; + * optional uint32 EEJCCFCIGDF = 12; */ - private int kOKKGADOAGL; + private int eEJCCFCIGDF; /** - * optional uint32 ODLMOCDBJHP = 13; + * optional uint32 PNIAMOINNJF = 13; */ - private int oDLMOCDBJHP; + private int pNIAMOINNJF; /** - * optional uint32 NDKOPEJBGAE = 15; + * optional uint32 IPOCLBEJIAF = 14; */ - private int nDKOPEJBGAE; + private int iPOCLBEJIAF; /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_info = 7; */ private final PlayerCollectionInfoOuterClass.PlayerCollectionInfo collectionInfo = PlayerCollectionInfoOuterClass.PlayerCollectionInfo.newInstance(); @@ -74,303 +74,303 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional uint32 GBNLDJIPEEK = 1; - * @return whether the gBNLDJIPEEK field is set + * optional uint32 LAAOICJFOPI = 1; + * @return whether the lAAOICJFOPI field is set */ - public boolean hasGBNLDJIPEEK() { + public boolean hasLAAOICJFOPI() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 GBNLDJIPEEK = 1; + * optional uint32 LAAOICJFOPI = 1; * @return this */ - public PlayerRecordInfo clearGBNLDJIPEEK() { + public PlayerRecordInfo clearLAAOICJFOPI() { bitField0_ &= ~0x00000001; - gBNLDJIPEEK = 0; + lAAOICJFOPI = 0; return this; } /** - * optional uint32 GBNLDJIPEEK = 1; - * @return the gBNLDJIPEEK + * optional uint32 LAAOICJFOPI = 1; + * @return the lAAOICJFOPI */ - public int getGBNLDJIPEEK() { - return gBNLDJIPEEK; + public int getLAAOICJFOPI() { + return lAAOICJFOPI; } /** - * optional uint32 GBNLDJIPEEK = 1; - * @param value the gBNLDJIPEEK to set + * optional uint32 LAAOICJFOPI = 1; + * @param value the lAAOICJFOPI to set * @return this */ - public PlayerRecordInfo setGBNLDJIPEEK(final int value) { + public PlayerRecordInfo setLAAOICJFOPI(final int value) { bitField0_ |= 0x00000001; - gBNLDJIPEEK = value; + lAAOICJFOPI = value; return this; } /** - * optional uint32 FKBLOGEAFJJ = 2; - * @return whether the fKBLOGEAFJJ field is set + * optional uint32 PDHAFOAOMPB = 2; + * @return whether the pDHAFOAOMPB field is set */ - public boolean hasFKBLOGEAFJJ() { + public boolean hasPDHAFOAOMPB() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 FKBLOGEAFJJ = 2; + * optional uint32 PDHAFOAOMPB = 2; * @return this */ - public PlayerRecordInfo clearFKBLOGEAFJJ() { + public PlayerRecordInfo clearPDHAFOAOMPB() { bitField0_ &= ~0x00000002; - fKBLOGEAFJJ = 0; + pDHAFOAOMPB = 0; return this; } /** - * optional uint32 FKBLOGEAFJJ = 2; - * @return the fKBLOGEAFJJ + * optional uint32 PDHAFOAOMPB = 2; + * @return the pDHAFOAOMPB */ - public int getFKBLOGEAFJJ() { - return fKBLOGEAFJJ; + public int getPDHAFOAOMPB() { + return pDHAFOAOMPB; } /** - * optional uint32 FKBLOGEAFJJ = 2; - * @param value the fKBLOGEAFJJ to set + * optional uint32 PDHAFOAOMPB = 2; + * @param value the pDHAFOAOMPB to set * @return this */ - public PlayerRecordInfo setFKBLOGEAFJJ(final int value) { + public PlayerRecordInfo setPDHAFOAOMPB(final int value) { bitField0_ |= 0x00000002; - fKBLOGEAFJJ = value; + pDHAFOAOMPB = value; return this; } /** - * optional uint32 GDHMMFELCDH = 3; - * @return whether the gDHMMFELCDH field is set + * optional uint32 DKDINDMGEJH = 5; + * @return whether the dKDINDMGEJH field is set */ - public boolean hasGDHMMFELCDH() { + public boolean hasDKDINDMGEJH() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 GDHMMFELCDH = 3; + * optional uint32 DKDINDMGEJH = 5; * @return this */ - public PlayerRecordInfo clearGDHMMFELCDH() { + public PlayerRecordInfo clearDKDINDMGEJH() { bitField0_ &= ~0x00000004; - gDHMMFELCDH = 0; + dKDINDMGEJH = 0; return this; } /** - * optional uint32 GDHMMFELCDH = 3; - * @return the gDHMMFELCDH + * optional uint32 DKDINDMGEJH = 5; + * @return the dKDINDMGEJH */ - public int getGDHMMFELCDH() { - return gDHMMFELCDH; + public int getDKDINDMGEJH() { + return dKDINDMGEJH; } /** - * optional uint32 GDHMMFELCDH = 3; - * @param value the gDHMMFELCDH to set + * optional uint32 DKDINDMGEJH = 5; + * @param value the dKDINDMGEJH to set * @return this */ - public PlayerRecordInfo setGDHMMFELCDH(final int value) { + public PlayerRecordInfo setDKDINDMGEJH(final int value) { bitField0_ |= 0x00000004; - gDHMMFELCDH = value; + dKDINDMGEJH = value; return this; } /** - * optional uint32 MODAPIGJNNJ = 5; - * @return whether the mODAPIGJNNJ field is set + * optional uint32 BFGDPMKBHNB = 6; + * @return whether the bFGDPMKBHNB field is set */ - public boolean hasMODAPIGJNNJ() { + public boolean hasBFGDPMKBHNB() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 MODAPIGJNNJ = 5; + * optional uint32 BFGDPMKBHNB = 6; * @return this */ - public PlayerRecordInfo clearMODAPIGJNNJ() { + public PlayerRecordInfo clearBFGDPMKBHNB() { bitField0_ &= ~0x00000008; - mODAPIGJNNJ = 0; + bFGDPMKBHNB = 0; return this; } /** - * optional uint32 MODAPIGJNNJ = 5; - * @return the mODAPIGJNNJ + * optional uint32 BFGDPMKBHNB = 6; + * @return the bFGDPMKBHNB */ - public int getMODAPIGJNNJ() { - return mODAPIGJNNJ; + public int getBFGDPMKBHNB() { + return bFGDPMKBHNB; } /** - * optional uint32 MODAPIGJNNJ = 5; - * @param value the mODAPIGJNNJ to set + * optional uint32 BFGDPMKBHNB = 6; + * @param value the bFGDPMKBHNB to set * @return this */ - public PlayerRecordInfo setMODAPIGJNNJ(final int value) { + public PlayerRecordInfo setBFGDPMKBHNB(final int value) { bitField0_ |= 0x00000008; - mODAPIGJNNJ = value; + bFGDPMKBHNB = value; return this; } /** - * optional uint32 HFJEBEENDDH = 7; - * @return whether the hFJEBEENDDH field is set + * optional uint32 JJOHCDLEDMO = 11; + * @return whether the jJOHCDLEDMO field is set */ - public boolean hasHFJEBEENDDH() { + public boolean hasJJOHCDLEDMO() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 HFJEBEENDDH = 7; + * optional uint32 JJOHCDLEDMO = 11; * @return this */ - public PlayerRecordInfo clearHFJEBEENDDH() { + public PlayerRecordInfo clearJJOHCDLEDMO() { bitField0_ &= ~0x00000010; - hFJEBEENDDH = 0; + jJOHCDLEDMO = 0; return this; } /** - * optional uint32 HFJEBEENDDH = 7; - * @return the hFJEBEENDDH + * optional uint32 JJOHCDLEDMO = 11; + * @return the jJOHCDLEDMO */ - public int getHFJEBEENDDH() { - return hFJEBEENDDH; + public int getJJOHCDLEDMO() { + return jJOHCDLEDMO; } /** - * optional uint32 HFJEBEENDDH = 7; - * @param value the hFJEBEENDDH to set + * optional uint32 JJOHCDLEDMO = 11; + * @param value the jJOHCDLEDMO to set * @return this */ - public PlayerRecordInfo setHFJEBEENDDH(final int value) { + public PlayerRecordInfo setJJOHCDLEDMO(final int value) { bitField0_ |= 0x00000010; - hFJEBEENDDH = value; + jJOHCDLEDMO = value; return this; } /** - * optional uint32 KOKKGADOAGL = 12; - * @return whether the kOKKGADOAGL field is set + * optional uint32 EEJCCFCIGDF = 12; + * @return whether the eEJCCFCIGDF field is set */ - public boolean hasKOKKGADOAGL() { + public boolean hasEEJCCFCIGDF() { return (bitField0_ & 0x00000020) != 0; } /** - * optional uint32 KOKKGADOAGL = 12; + * optional uint32 EEJCCFCIGDF = 12; * @return this */ - public PlayerRecordInfo clearKOKKGADOAGL() { + public PlayerRecordInfo clearEEJCCFCIGDF() { bitField0_ &= ~0x00000020; - kOKKGADOAGL = 0; + eEJCCFCIGDF = 0; return this; } /** - * optional uint32 KOKKGADOAGL = 12; - * @return the kOKKGADOAGL + * optional uint32 EEJCCFCIGDF = 12; + * @return the eEJCCFCIGDF */ - public int getKOKKGADOAGL() { - return kOKKGADOAGL; + public int getEEJCCFCIGDF() { + return eEJCCFCIGDF; } /** - * optional uint32 KOKKGADOAGL = 12; - * @param value the kOKKGADOAGL to set + * optional uint32 EEJCCFCIGDF = 12; + * @param value the eEJCCFCIGDF to set * @return this */ - public PlayerRecordInfo setKOKKGADOAGL(final int value) { + public PlayerRecordInfo setEEJCCFCIGDF(final int value) { bitField0_ |= 0x00000020; - kOKKGADOAGL = value; + eEJCCFCIGDF = value; return this; } /** - * optional uint32 ODLMOCDBJHP = 13; - * @return whether the oDLMOCDBJHP field is set + * optional uint32 PNIAMOINNJF = 13; + * @return whether the pNIAMOINNJF field is set */ - public boolean hasODLMOCDBJHP() { + public boolean hasPNIAMOINNJF() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 ODLMOCDBJHP = 13; + * optional uint32 PNIAMOINNJF = 13; * @return this */ - public PlayerRecordInfo clearODLMOCDBJHP() { + public PlayerRecordInfo clearPNIAMOINNJF() { bitField0_ &= ~0x00000040; - oDLMOCDBJHP = 0; + pNIAMOINNJF = 0; return this; } /** - * optional uint32 ODLMOCDBJHP = 13; - * @return the oDLMOCDBJHP + * optional uint32 PNIAMOINNJF = 13; + * @return the pNIAMOINNJF */ - public int getODLMOCDBJHP() { - return oDLMOCDBJHP; + public int getPNIAMOINNJF() { + return pNIAMOINNJF; } /** - * optional uint32 ODLMOCDBJHP = 13; - * @param value the oDLMOCDBJHP to set + * optional uint32 PNIAMOINNJF = 13; + * @param value the pNIAMOINNJF to set * @return this */ - public PlayerRecordInfo setODLMOCDBJHP(final int value) { + public PlayerRecordInfo setPNIAMOINNJF(final int value) { bitField0_ |= 0x00000040; - oDLMOCDBJHP = value; + pNIAMOINNJF = value; return this; } /** - * optional uint32 NDKOPEJBGAE = 15; - * @return whether the nDKOPEJBGAE field is set + * optional uint32 IPOCLBEJIAF = 14; + * @return whether the iPOCLBEJIAF field is set */ - public boolean hasNDKOPEJBGAE() { + public boolean hasIPOCLBEJIAF() { return (bitField0_ & 0x00000080) != 0; } /** - * optional uint32 NDKOPEJBGAE = 15; + * optional uint32 IPOCLBEJIAF = 14; * @return this */ - public PlayerRecordInfo clearNDKOPEJBGAE() { + public PlayerRecordInfo clearIPOCLBEJIAF() { bitField0_ &= ~0x00000080; - nDKOPEJBGAE = 0; + iPOCLBEJIAF = 0; return this; } /** - * optional uint32 NDKOPEJBGAE = 15; - * @return the nDKOPEJBGAE + * optional uint32 IPOCLBEJIAF = 14; + * @return the iPOCLBEJIAF */ - public int getNDKOPEJBGAE() { - return nDKOPEJBGAE; + public int getIPOCLBEJIAF() { + return iPOCLBEJIAF; } /** - * optional uint32 NDKOPEJBGAE = 15; - * @param value the nDKOPEJBGAE to set + * optional uint32 IPOCLBEJIAF = 14; + * @param value the iPOCLBEJIAF to set * @return this */ - public PlayerRecordInfo setNDKOPEJBGAE(final int value) { + public PlayerRecordInfo setIPOCLBEJIAF(final int value) { bitField0_ |= 0x00000080; - nDKOPEJBGAE = value; + iPOCLBEJIAF = value; return this; } /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_info = 7; * @return whether the collectionInfo field is set */ public boolean hasCollectionInfo() { @@ -378,7 +378,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_info = 7; * @return this */ public PlayerRecordInfo clearCollectionInfo() { @@ -388,7 +388,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_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. @@ -402,7 +402,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_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 @@ -416,7 +416,7 @@ public final class PlayerRecordInfoOuterClass { } /** - * optional .PlayerCollectionInfo collection_info = 4; + * optional .PlayerCollectionInfo collection_info = 7; * @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_; - gBNLDJIPEEK = other.gBNLDJIPEEK; - fKBLOGEAFJJ = other.fKBLOGEAFJJ; - gDHMMFELCDH = other.gDHMMFELCDH; - mODAPIGJNNJ = other.mODAPIGJNNJ; - hFJEBEENDDH = other.hFJEBEENDDH; - kOKKGADOAGL = other.kOKKGADOAGL; - oDLMOCDBJHP = other.oDLMOCDBJHP; - nDKOPEJBGAE = other.nDKOPEJBGAE; + lAAOICJFOPI = other.lAAOICJFOPI; + pDHAFOAOMPB = other.pDHAFOAOMPB; + dKDINDMGEJH = other.dKDINDMGEJH; + bFGDPMKBHNB = other.bFGDPMKBHNB; + jJOHCDLEDMO = other.jJOHCDLEDMO; + eEJCCFCIGDF = other.eEJCCFCIGDF; + pNIAMOINNJF = other.pNIAMOINNJF; + iPOCLBEJIAF = other.iPOCLBEJIAF; collectionInfo.copyFrom(other.collectionInfo); } return this; @@ -451,29 +451,29 @@ public final class PlayerRecordInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGBNLDJIPEEK()) { - setGBNLDJIPEEK(other.gBNLDJIPEEK); + if (other.hasLAAOICJFOPI()) { + setLAAOICJFOPI(other.lAAOICJFOPI); } - if (other.hasFKBLOGEAFJJ()) { - setFKBLOGEAFJJ(other.fKBLOGEAFJJ); + if (other.hasPDHAFOAOMPB()) { + setPDHAFOAOMPB(other.pDHAFOAOMPB); } - if (other.hasGDHMMFELCDH()) { - setGDHMMFELCDH(other.gDHMMFELCDH); + if (other.hasDKDINDMGEJH()) { + setDKDINDMGEJH(other.dKDINDMGEJH); } - if (other.hasMODAPIGJNNJ()) { - setMODAPIGJNNJ(other.mODAPIGJNNJ); + if (other.hasBFGDPMKBHNB()) { + setBFGDPMKBHNB(other.bFGDPMKBHNB); } - if (other.hasHFJEBEENDDH()) { - setHFJEBEENDDH(other.hFJEBEENDDH); + if (other.hasJJOHCDLEDMO()) { + setJJOHCDLEDMO(other.jJOHCDLEDMO); } - if (other.hasKOKKGADOAGL()) { - setKOKKGADOAGL(other.kOKKGADOAGL); + if (other.hasEEJCCFCIGDF()) { + setEEJCCFCIGDF(other.eEJCCFCIGDF); } - if (other.hasODLMOCDBJHP()) { - setODLMOCDBJHP(other.oDLMOCDBJHP); + if (other.hasPNIAMOINNJF()) { + setPNIAMOINNJF(other.pNIAMOINNJF); } - if (other.hasNDKOPEJBGAE()) { - setNDKOPEJBGAE(other.nDKOPEJBGAE); + if (other.hasIPOCLBEJIAF()) { + setIPOCLBEJIAF(other.iPOCLBEJIAF); } if (other.hasCollectionInfo()) { getMutableCollectionInfo().mergeFrom(other.collectionInfo); @@ -488,14 +488,14 @@ public final class PlayerRecordInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - gBNLDJIPEEK = 0; - fKBLOGEAFJJ = 0; - gDHMMFELCDH = 0; - mODAPIGJNNJ = 0; - hFJEBEENDDH = 0; - kOKKGADOAGL = 0; - oDLMOCDBJHP = 0; - nDKOPEJBGAE = 0; + lAAOICJFOPI = 0; + pDHAFOAOMPB = 0; + dKDINDMGEJH = 0; + bFGDPMKBHNB = 0; + jJOHCDLEDMO = 0; + eEJCCFCIGDF = 0; + pNIAMOINNJF = 0; + iPOCLBEJIAF = 0; collectionInfo.clear(); return this; } @@ -521,14 +521,14 @@ public final class PlayerRecordInfoOuterClass { } PlayerRecordInfo other = (PlayerRecordInfo) o; return bitField0_ == other.bitField0_ - && (!hasGBNLDJIPEEK() || gBNLDJIPEEK == other.gBNLDJIPEEK) - && (!hasFKBLOGEAFJJ() || fKBLOGEAFJJ == other.fKBLOGEAFJJ) - && (!hasGDHMMFELCDH() || gDHMMFELCDH == other.gDHMMFELCDH) - && (!hasMODAPIGJNNJ() || mODAPIGJNNJ == other.mODAPIGJNNJ) - && (!hasHFJEBEENDDH() || hFJEBEENDDH == other.hFJEBEENDDH) - && (!hasKOKKGADOAGL() || kOKKGADOAGL == other.kOKKGADOAGL) - && (!hasODLMOCDBJHP() || oDLMOCDBJHP == other.oDLMOCDBJHP) - && (!hasNDKOPEJBGAE() || nDKOPEJBGAE == other.nDKOPEJBGAE) + && (!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) && (!hasCollectionInfo() || collectionInfo.equals(other.collectionInfo)); } @@ -536,38 +536,38 @@ public final class PlayerRecordInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(gBNLDJIPEEK); + output.writeUInt32NoTag(lAAOICJFOPI); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(fKBLOGEAFJJ); + output.writeUInt32NoTag(pDHAFOAOMPB); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(gDHMMFELCDH); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(dKDINDMGEJH); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(mODAPIGJNNJ); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(bFGDPMKBHNB); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(hFJEBEENDDH); + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(jJOHCDLEDMO); } if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(kOKKGADOAGL); + output.writeUInt32NoTag(eEJCCFCIGDF); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(oDLMOCDBJHP); + output.writeUInt32NoTag(pNIAMOINNJF); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(nDKOPEJBGAE); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(iPOCLBEJIAF); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 58); 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(gBNLDJIPEEK); + size += 1 + ProtoSink.computeUInt32SizeNoTag(lAAOICJFOPI); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fKBLOGEAFJJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pDHAFOAOMPB); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gDHMMFELCDH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dKDINDMGEJH); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mODAPIGJNNJ); + size += 1 + ProtoSink.computeUInt32SizeNoTag(bFGDPMKBHNB); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(hFJEBEENDDH); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jJOHCDLEDMO); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(kOKKGADOAGL); + size += 1 + ProtoSink.computeUInt32SizeNoTag(eEJCCFCIGDF); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(oDLMOCDBJHP); + size += 1 + ProtoSink.computeUInt32SizeNoTag(pNIAMOINNJF); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nDKOPEJBGAE); + size += 1 + ProtoSink.computeUInt32SizeNoTag(iPOCLBEJIAF); } if ((bitField0_ & 0x00000100) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(collectionInfo); @@ -613,8 +613,8 @@ public final class PlayerRecordInfoOuterClass { while (true) { switch (tag) { case 8: { - // gBNLDJIPEEK - gBNLDJIPEEK = input.readUInt32(); + // lAAOICJFOPI + lAAOICJFOPI = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 16) { @@ -622,35 +622,35 @@ public final class PlayerRecordInfoOuterClass { } } case 16: { - // fKBLOGEAFJJ - fKBLOGEAFJJ = input.readUInt32(); + // pDHAFOAOMPB + pDHAFOAOMPB = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // gDHMMFELCDH - gDHMMFELCDH = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 40) { break; } } case 40: { - // mODAPIGJNNJ - mODAPIGJNNJ = input.readUInt32(); - bitField0_ |= 0x00000008; + // dKDINDMGEJH + dKDINDMGEJH = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { - // hFJEBEENDDH - hFJEBEENDDH = input.readUInt32(); + case 48: { + // bFGDPMKBHNB + bFGDPMKBHNB = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // jJOHCDLEDMO + jJOHCDLEDMO = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 96) { @@ -658,8 +658,8 @@ public final class PlayerRecordInfoOuterClass { } } case 96: { - // kOKKGADOAGL - kOKKGADOAGL = input.readUInt32(); + // eEJCCFCIGDF + eEJCCFCIGDF = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 104) { @@ -667,24 +667,24 @@ public final class PlayerRecordInfoOuterClass { } } case 104: { - // oDLMOCDBJHP - oDLMOCDBJHP = input.readUInt32(); + // pNIAMOINNJF + pNIAMOINNJF = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { - // nDKOPEJBGAE - nDKOPEJBGAE = input.readUInt32(); + case 112: { + // iPOCLBEJIAF + iPOCLBEJIAF = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 34) { + if (tag != 58) { break; } } - case 34: { + case 58: { // 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.gBNLDJIPEEK, gBNLDJIPEEK); + output.writeUInt32(FieldNames.lAAOICJFOPI, lAAOICJFOPI); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.fKBLOGEAFJJ, fKBLOGEAFJJ); + output.writeUInt32(FieldNames.pDHAFOAOMPB, pDHAFOAOMPB); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.gDHMMFELCDH, gDHMMFELCDH); + output.writeUInt32(FieldNames.dKDINDMGEJH, dKDINDMGEJH); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.mODAPIGJNNJ, mODAPIGJNNJ); + output.writeUInt32(FieldNames.bFGDPMKBHNB, bFGDPMKBHNB); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.hFJEBEENDDH, hFJEBEENDDH); + output.writeUInt32(FieldNames.jJOHCDLEDMO, jJOHCDLEDMO); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.kOKKGADOAGL, kOKKGADOAGL); + output.writeUInt32(FieldNames.eEJCCFCIGDF, eEJCCFCIGDF); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.oDLMOCDBJHP, oDLMOCDBJHP); + output.writeUInt32(FieldNames.pNIAMOINNJF, pNIAMOINNJF); } if ((bitField0_ & 0x00000080) != 0) { - output.writeUInt32(FieldNames.nDKOPEJBGAE, nDKOPEJBGAE); + output.writeUInt32(FieldNames.iPOCLBEJIAF, iPOCLBEJIAF); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.collectionInfo, collectionInfo); @@ -747,10 +747,10 @@ public final class PlayerRecordInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -643278235: { - if (input.isAtField(FieldNames.gBNLDJIPEEK)) { + case 2056730927: { + if (input.isAtField(FieldNames.lAAOICJFOPI)) { if (!input.trySkipNullValue()) { - gBNLDJIPEEK = input.readUInt32(); + lAAOICJFOPI = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -758,10 +758,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case 682247267: { - if (input.isAtField(FieldNames.fKBLOGEAFJJ)) { + case 2145492571: { + if (input.isAtField(FieldNames.pDHAFOAOMPB)) { if (!input.trySkipNullValue()) { - fKBLOGEAFJJ = input.readUInt32(); + pDHAFOAOMPB = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -769,10 +769,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -2054403291: { - if (input.isAtField(FieldNames.gDHMMFELCDH)) { + case -1238047833: { + if (input.isAtField(FieldNames.dKDINDMGEJH)) { if (!input.trySkipNullValue()) { - gDHMMFELCDH = input.readUInt32(); + dKDINDMGEJH = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -780,10 +780,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -161665553: { - if (input.isAtField(FieldNames.mODAPIGJNNJ)) { + case -177381337: { + if (input.isAtField(FieldNames.bFGDPMKBHNB)) { if (!input.trySkipNullValue()) { - mODAPIGJNNJ = input.readUInt32(); + bFGDPMKBHNB = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -791,10 +791,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -1528111293: { - if (input.isAtField(FieldNames.hFJEBEENDDH)) { + case -261903405: { + if (input.isAtField(FieldNames.jJOHCDLEDMO)) { if (!input.trySkipNullValue()) { - hFJEBEENDDH = input.readUInt32(); + jJOHCDLEDMO = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -802,10 +802,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -11041379: { - if (input.isAtField(FieldNames.kOKKGADOAGL)) { + case 1487775335: { + if (input.isAtField(FieldNames.eEJCCFCIGDF)) { if (!input.trySkipNullValue()) { - kOKKGADOAGL = input.readUInt32(); + eEJCCFCIGDF = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -813,10 +813,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -497090198: { - if (input.isAtField(FieldNames.oDLMOCDBJHP)) { + case 297820685: { + if (input.isAtField(FieldNames.pNIAMOINNJF)) { if (!input.trySkipNullValue()) { - oDLMOCDBJHP = input.readUInt32(); + pNIAMOINNJF = input.readUInt32(); bitField0_ |= 0x00000040; } } else { @@ -824,10 +824,10 @@ public final class PlayerRecordInfoOuterClass { } break; } - case -1046698300: { - if (input.isAtField(FieldNames.nDKOPEJBGAE)) { + case -434121192: { + if (input.isAtField(FieldNames.iPOCLBEJIAF)) { if (!input.trySkipNullValue()) { - nDKOPEJBGAE = input.readUInt32(); + iPOCLBEJIAF = 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 gBNLDJIPEEK = FieldName.forField("GBNLDJIPEEK"); + static final FieldName lAAOICJFOPI = FieldName.forField("LAAOICJFOPI"); - static final FieldName fKBLOGEAFJJ = FieldName.forField("FKBLOGEAFJJ"); + static final FieldName pDHAFOAOMPB = FieldName.forField("PDHAFOAOMPB"); - static final FieldName gDHMMFELCDH = FieldName.forField("GDHMMFELCDH"); + static final FieldName dKDINDMGEJH = FieldName.forField("DKDINDMGEJH"); - static final FieldName mODAPIGJNNJ = FieldName.forField("MODAPIGJNNJ"); + static final FieldName bFGDPMKBHNB = FieldName.forField("BFGDPMKBHNB"); - static final FieldName hFJEBEENDDH = FieldName.forField("HFJEBEENDDH"); + static final FieldName jJOHCDLEDMO = FieldName.forField("JJOHCDLEDMO"); - static final FieldName kOKKGADOAGL = FieldName.forField("KOKKGADOAGL"); + static final FieldName eEJCCFCIGDF = FieldName.forField("EEJCCFCIGDF"); - static final FieldName oDLMOCDBJHP = FieldName.forField("ODLMOCDBJHP"); + static final FieldName pNIAMOINNJF = FieldName.forField("PNIAMOINNJF"); - static final FieldName nDKOPEJBGAE = FieldName.forField("NDKOPEJBGAE"); + static final FieldName iPOCLBEJIAF = FieldName.forField("IPOCLBEJIAF"); 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 f1dde93..4c68af8 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 = 1571; + * optional uint32 total_achievement_exp = 1725; */ private int totalAchievementExp; /** - * optional .AvatarSync avatar_sync = 3; - */ - private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); - - /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; */ private final PlayerBasicInfoOuterClass.PlayerBasicInfo basicInfo = PlayerBasicInfoOuterClass.PlayerBasicInfo.newInstance(); /** - * optional .MissionSync mission_sync = 8; + * optional .AvatarSync avatar_sync = 5; + */ + private final AvatarSyncOuterClass.AvatarSync avatarSync = AvatarSyncOuterClass.AvatarSync.newInstance(); + + /** + * optional .MissionSync mission_sync = 9; */ private final MissionSyncOuterClass.MissionSync missionSync = MissionSyncOuterClass.MissionSync.newInstance(); /** - * optional .BoardDataSync board_data_sync = 1050; + * optional .BoardDataSync board_data_sync = 1665; */ private final BoardDataSyncOuterClass.BoardDataSync boardDataSync = BoardDataSyncOuterClass.BoardDataSync.newInstance(); /** - * repeated uint32 del_relic_list = 2; - */ - private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 1; */ private final RepeatedInt delEquipmentList = RepeatedInt.newEmptyInstance(); /** - * repeated .Equipment equipment_list = 4; + * repeated uint32 del_relic_list = 13; */ - private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + private final RepeatedInt delRelicList = RepeatedInt.newEmptyInstance(); /** - * repeated .Material material_list = 7; - */ - private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; */ private final RepeatedMessage basicTypeInfoList = RepeatedMessage.newEmptyInstance(HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo.getFactory()); /** - * repeated .Relic relic_list = 14; + * repeated .Equipment equipment_list = 3; + */ + private final RepeatedMessage equipmentList = RepeatedMessage.newEmptyInstance(EquipmentOuterClass.Equipment.getFactory()); + + /** + * repeated .Relic relic_list = 6; */ private final RepeatedMessage relicList = RepeatedMessage.newEmptyInstance(RelicOuterClass.Relic.getFactory()); + /** + * repeated .Material material_list = 14; + */ + private final RepeatedMessage materialList = RepeatedMessage.newEmptyInstance(MaterialOuterClass.Material.getFactory()); + private PlayerSyncScNotify() { } @@ -86,7 +86,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1571; + * optional uint32 total_achievement_exp = 1725; * @return whether the totalAchievementExp field is set */ public boolean hasTotalAchievementExp() { @@ -94,7 +94,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1571; + * optional uint32 total_achievement_exp = 1725; * @return this */ public PlayerSyncScNotify clearTotalAchievementExp() { @@ -104,7 +104,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1571; + * optional uint32 total_achievement_exp = 1725; * @return the totalAchievementExp */ public int getTotalAchievementExp() { @@ -112,7 +112,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional uint32 total_achievement_exp = 1571; + * optional uint32 total_achievement_exp = 1725; * @param value the totalAchievementExp to set * @return this */ @@ -123,82 +123,25 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .AvatarSync avatar_sync = 3; - * @return whether the avatarSync field is set + * optional .PlayerBasicInfo basic_info = 4; + * @return whether the basicInfo field is set */ - public boolean hasAvatarSync() { + public boolean hasBasicInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .AvatarSync avatar_sync = 3; - * @return this - */ - public PlayerSyncScNotify clearAvatarSync() { - bitField0_ &= ~0x00000002; - avatarSync.clear(); - return this; - } - - /** - * optional .AvatarSync avatar_sync = 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 #getMutableAvatarSync()} if you want to modify it. - * - * @return internal storage object for reading - */ - public AvatarSyncOuterClass.AvatarSync getAvatarSync() { - return avatarSync; - } - - /** - * optional .AvatarSync avatar_sync = 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 AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() { - bitField0_ |= 0x00000002; - return avatarSync; - } - - /** - * optional .AvatarSync avatar_sync = 3; - * @param value the avatarSync to set - * @return this - */ - public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync value) { - bitField0_ |= 0x00000002; - avatarSync.copyFrom(value); - return this; - } - - /** - * optional .PlayerBasicInfo basic_info = 6; - * @return whether the basicInfo field is set - */ - public boolean hasBasicInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * @return this */ public PlayerSyncScNotify clearBasicInfo() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; basicInfo.clear(); return this; } /** - * optional .PlayerBasicInfo basic_info = 6; + * 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. @@ -212,7 +155,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .PlayerBasicInfo basic_info = 6; + * 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 @@ -221,23 +164,80 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public PlayerBasicInfoOuterClass.PlayerBasicInfo getMutableBasicInfo() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return basicInfo; } /** - * optional .PlayerBasicInfo basic_info = 6; + * optional .PlayerBasicInfo basic_info = 4; * @param value the basicInfo to set * @return this */ public PlayerSyncScNotify setBasicInfo(final PlayerBasicInfoOuterClass.PlayerBasicInfo value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; basicInfo.copyFrom(value); return this; } /** - * optional .MissionSync mission_sync = 8; + * optional .AvatarSync avatar_sync = 5; + * @return whether the avatarSync field is set + */ + public boolean hasAvatarSync() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .AvatarSync avatar_sync = 5; + * @return this + */ + public PlayerSyncScNotify clearAvatarSync() { + bitField0_ &= ~0x00000004; + avatarSync.clear(); + return this; + } + + /** + * optional .AvatarSync avatar_sync = 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 #getMutableAvatarSync()} if you want to modify it. + * + * @return internal storage object for reading + */ + public AvatarSyncOuterClass.AvatarSync getAvatarSync() { + return avatarSync; + } + + /** + * optional .AvatarSync avatar_sync = 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 AvatarSyncOuterClass.AvatarSync getMutableAvatarSync() { + bitField0_ |= 0x00000004; + return avatarSync; + } + + /** + * optional .AvatarSync avatar_sync = 5; + * @param value the avatarSync to set + * @return this + */ + public PlayerSyncScNotify setAvatarSync(final AvatarSyncOuterClass.AvatarSync value) { + bitField0_ |= 0x00000004; + avatarSync.copyFrom(value); + return this; + } + + /** + * optional .MissionSync mission_sync = 9; * @return whether the missionSync field is set */ public boolean hasMissionSync() { @@ -245,7 +245,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 8; + * optional .MissionSync mission_sync = 9; * @return this */ public PlayerSyncScNotify clearMissionSync() { @@ -255,7 +255,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 8; + * optional .MissionSync mission_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. @@ -269,7 +269,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 8; + * optional .MissionSync mission_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 @@ -283,7 +283,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .MissionSync mission_sync = 8; + * optional .MissionSync mission_sync = 9; * @param value the missionSync to set * @return this */ @@ -294,7 +294,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1050; + * optional .BoardDataSync board_data_sync = 1665; * @return whether the boardDataSync field is set */ public boolean hasBoardDataSync() { @@ -302,7 +302,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1050; + * optional .BoardDataSync board_data_sync = 1665; * @return this */ public PlayerSyncScNotify clearBoardDataSync() { @@ -312,7 +312,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * optional .BoardDataSync board_data_sync = 1050; + * optional .BoardDataSync board_data_sync = 1665; * * This 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 = 1050; + * optional .BoardDataSync board_data_sync = 1665; * * 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 = 1050; + * optional .BoardDataSync board_data_sync = 1665; * @param value the boardDataSync to set * @return this */ @@ -351,93 +351,25 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_relic_list = 2; - * @return whether the delRelicList field is set + * repeated uint32 del_equipment_list = 1; + * @return whether the delEquipmentList field is set */ - public boolean hasDelRelicList() { + public boolean hasDelEquipmentList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated uint32 del_relic_list = 2; - * @return this - */ - public PlayerSyncScNotify clearDelRelicList() { - bitField0_ &= ~0x00000020; - delRelicList.clear(); - return this; - } - - /** - * repeated uint32 del_relic_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 #getMutableDelRelicList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getDelRelicList() { - return delRelicList; - } - - /** - * repeated uint32 del_relic_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 RepeatedInt getMutableDelRelicList() { - bitField0_ |= 0x00000020; - return delRelicList; - } - - /** - * repeated uint32 del_relic_list = 2; - * @param value the delRelicList to add - * @return this - */ - public PlayerSyncScNotify addDelRelicList(final int value) { - bitField0_ |= 0x00000020; - delRelicList.add(value); - return this; - } - - /** - * repeated uint32 del_relic_list = 2; - * @param values the delRelicList to add - * @return this - */ - public PlayerSyncScNotify addAllDelRelicList(final int... values) { - bitField0_ |= 0x00000020; - delRelicList.addAll(values); - return this; - } - - /** - * repeated uint32 del_equipment_list = 13; - * @return whether the delEquipmentList field is set - */ - public boolean hasDelEquipmentList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 1; * @return this */ public PlayerSyncScNotify clearDelEquipmentList() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; delEquipmentList.clear(); return this; } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_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. @@ -451,7 +383,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_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 @@ -460,188 +392,120 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableDelEquipmentList() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return delEquipmentList; } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 1; * @param value the delEquipmentList to add * @return this */ public PlayerSyncScNotify addDelEquipmentList(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; delEquipmentList.add(value); return this; } /** - * repeated uint32 del_equipment_list = 13; + * repeated uint32 del_equipment_list = 1; * @param values the delEquipmentList to add * @return this */ public PlayerSyncScNotify addAllDelEquipmentList(final int... values) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; delEquipmentList.addAll(values); return this; } /** - * repeated .Equipment equipment_list = 4; - * @return whether the equipmentList field is set + * repeated uint32 del_relic_list = 13; + * @return whether the delRelicList field is set */ - public boolean hasEquipmentList() { + public boolean hasDelRelicList() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * repeated uint32 del_relic_list = 13; + * @return this + */ + public PlayerSyncScNotify clearDelRelicList() { + bitField0_ &= ~0x00000040; + delRelicList.clear(); + return this; + } + + /** + * repeated uint32 del_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 #getMutableDelRelicList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getDelRelicList() { + return delRelicList; + } + + /** + * repeated uint32 del_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 RepeatedInt getMutableDelRelicList() { + bitField0_ |= 0x00000040; + return delRelicList; + } + + /** + * repeated uint32 del_relic_list = 13; + * @param value the delRelicList to add + * @return this + */ + public PlayerSyncScNotify addDelRelicList(final int value) { + bitField0_ |= 0x00000040; + delRelicList.add(value); + return this; + } + + /** + * repeated uint32 del_relic_list = 13; + * @param values the delRelicList to add + * @return this + */ + public PlayerSyncScNotify addAllDelRelicList(final int... values) { + bitField0_ |= 0x00000040; + delRelicList.addAll(values); + return this; + } + + /** + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; + * @return whether the basicTypeInfoList field is set + */ + public boolean hasBasicTypeInfoList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated .Equipment equipment_list = 4; - * @return this - */ - public PlayerSyncScNotify clearEquipmentList() { - bitField0_ &= ~0x00000080; - equipmentList.clear(); - return this; - } - - /** - * repeated .Equipment 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. - * - * Use {@link #getMutableEquipmentList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getEquipmentList() { - return equipmentList; - } - - /** - * repeated .Equipment 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableEquipmentList() { - bitField0_ |= 0x00000080; - return equipmentList; - } - - /** - * repeated .Equipment equipment_list = 4; - * @param value the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addEquipmentList(final EquipmentOuterClass.Equipment value) { - bitField0_ |= 0x00000080; - equipmentList.add(value); - return this; - } - - /** - * repeated .Equipment equipment_list = 4; - * @param values the equipmentList to add - * @return this - */ - public PlayerSyncScNotify addAllEquipmentList(final EquipmentOuterClass.Equipment... values) { - bitField0_ |= 0x00000080; - equipmentList.addAll(values); - return this; - } - - /** - * repeated .Material material_list = 7; - * @return whether the materialList field is set - */ - public boolean hasMaterialList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated .Material material_list = 7; - * @return this - */ - public PlayerSyncScNotify clearMaterialList() { - bitField0_ &= ~0x00000100; - materialList.clear(); - return this; - } - - /** - * repeated .Material material_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 #getMutableMaterialList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMaterialList() { - return materialList; - } - - /** - * repeated .Material material_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 getMutableMaterialList() { - bitField0_ |= 0x00000100; - return materialList; - } - - /** - * repeated .Material material_list = 7; - * @param value the materialList to add - * @return this - */ - public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { - bitField0_ |= 0x00000100; - materialList.add(value); - return this; - } - - /** - * repeated .Material material_list = 7; - * @param values the materialList to add - * @return this - */ - public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { - bitField0_ |= 0x00000100; - materialList.addAll(values); - return this; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; - * @return whether the basicTypeInfoList field is set - */ - public boolean hasBasicTypeInfoList() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @return this */ public PlayerSyncScNotify clearBasicTypeInfoList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000080; basicTypeInfoList.clear(); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * 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. @@ -655,7 +519,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * 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 @@ -665,54 +529,122 @@ public final class PlayerSyncScNotifyOuterClass { */ public RepeatedMessage getMutableBasicTypeInfoList( ) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; return basicTypeInfoList; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @param value the basicTypeInfoList to add * @return this */ public PlayerSyncScNotify addBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; basicTypeInfoList.add(value); return this; } /** - * repeated .HeroBasicTypeInfo basic_type_info_list = 11; + * repeated .HeroBasicTypeInfo basic_type_info_list = 2; * @param values the basicTypeInfoList to add * @return this */ public PlayerSyncScNotify addAllBasicTypeInfoList( final HeroBasicTypeInfoOuterClass.HeroBasicTypeInfo... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000080; basicTypeInfoList.addAll(values); return this; } /** - * repeated .Relic relic_list = 14; - * @return whether the relicList field is set + * repeated .Equipment equipment_list = 3; + * @return whether the equipmentList field is set */ - public boolean hasRelicList() { - return (bitField0_ & 0x00000400) != 0; + public boolean hasEquipmentList() { + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .Relic relic_list = 14; + * 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; * @return this */ public PlayerSyncScNotify clearRelicList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; relicList.clear(); return this; } /** - * repeated .Relic relic_list = 14; + * repeated .Relic relic_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. @@ -726,7 +658,7 @@ public final class PlayerSyncScNotifyOuterClass { } /** - * repeated .Relic relic_list = 14; + * repeated .Relic relic_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 @@ -735,48 +667,116 @@ public final class PlayerSyncScNotifyOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRelicList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return relicList; } /** - * repeated .Relic relic_list = 14; + * repeated .Relic relic_list = 6; * @param value the relicList to add * @return this */ public PlayerSyncScNotify addRelicList(final RelicOuterClass.Relic value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; relicList.add(value); return this; } /** - * repeated .Relic relic_list = 14; + * repeated .Relic relic_list = 6; * @param values the relicList to add * @return this */ public PlayerSyncScNotify addAllRelicList(final RelicOuterClass.Relic... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; relicList.addAll(values); return this; } + /** + * repeated .Material material_list = 14; + * @return whether the materialList field is set + */ + public boolean hasMaterialList() { + return (bitField0_ & 0x00000400) != 0; + } + + /** + * repeated .Material material_list = 14; + * @return this + */ + public PlayerSyncScNotify clearMaterialList() { + bitField0_ &= ~0x00000400; + materialList.clear(); + return this; + } + + /** + * repeated .Material material_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 #getMutableMaterialList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMaterialList() { + return materialList; + } + + /** + * repeated .Material material_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 getMutableMaterialList() { + bitField0_ |= 0x00000400; + return materialList; + } + + /** + * repeated .Material material_list = 14; + * @param value the materialList to add + * @return this + */ + public PlayerSyncScNotify addMaterialList(final MaterialOuterClass.Material value) { + bitField0_ |= 0x00000400; + materialList.add(value); + return this; + } + + /** + * repeated .Material material_list = 14; + * @param values the materialList to add + * @return this + */ + public PlayerSyncScNotify addAllMaterialList(final MaterialOuterClass.Material... values) { + bitField0_ |= 0x00000400; + materialList.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; - avatarSync.copyFrom(other.avatarSync); basicInfo.copyFrom(other.basicInfo); + avatarSync.copyFrom(other.avatarSync); missionSync.copyFrom(other.missionSync); boardDataSync.copyFrom(other.boardDataSync); - delRelicList.copyFrom(other.delRelicList); delEquipmentList.copyFrom(other.delEquipmentList); - equipmentList.copyFrom(other.equipmentList); - materialList.copyFrom(other.materialList); + delRelicList.copyFrom(other.delRelicList); basicTypeInfoList.copyFrom(other.basicTypeInfoList); + equipmentList.copyFrom(other.equipmentList); relicList.copyFrom(other.relicList); + materialList.copyFrom(other.materialList); } return this; } @@ -790,36 +790,36 @@ public final class PlayerSyncScNotifyOuterClass { if (other.hasTotalAchievementExp()) { setTotalAchievementExp(other.totalAchievementExp); } - if (other.hasAvatarSync()) { - getMutableAvatarSync().mergeFrom(other.avatarSync); - } if (other.hasBasicInfo()) { getMutableBasicInfo().mergeFrom(other.basicInfo); } + if (other.hasAvatarSync()) { + getMutableAvatarSync().mergeFrom(other.avatarSync); + } if (other.hasMissionSync()) { getMutableMissionSync().mergeFrom(other.missionSync); } if (other.hasBoardDataSync()) { getMutableBoardDataSync().mergeFrom(other.boardDataSync); } - if (other.hasDelRelicList()) { - getMutableDelRelicList().addAll(other.delRelicList); - } if (other.hasDelEquipmentList()) { getMutableDelEquipmentList().addAll(other.delEquipmentList); } - if (other.hasEquipmentList()) { - getMutableEquipmentList().addAll(other.equipmentList); - } - if (other.hasMaterialList()) { - getMutableMaterialList().addAll(other.materialList); + 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); + } return this; } @@ -831,16 +831,16 @@ public final class PlayerSyncScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; totalAchievementExp = 0; - avatarSync.clear(); basicInfo.clear(); + avatarSync.clear(); missionSync.clear(); boardDataSync.clear(); - delRelicList.clear(); delEquipmentList.clear(); - equipmentList.clear(); - materialList.clear(); + delRelicList.clear(); basicTypeInfoList.clear(); + equipmentList.clear(); relicList.clear(); + materialList.clear(); return this; } @@ -851,16 +851,16 @@ public final class PlayerSyncScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarSync.clearQuick(); basicInfo.clearQuick(); + avatarSync.clearQuick(); missionSync.clearQuick(); boardDataSync.clearQuick(); - delRelicList.clear(); delEquipmentList.clear(); - equipmentList.clearQuick(); - materialList.clearQuick(); + delRelicList.clear(); basicTypeInfoList.clearQuick(); + equipmentList.clearQuick(); relicList.clearQuick(); + materialList.clearQuick(); return this; } @@ -875,76 +875,76 @@ public final class PlayerSyncScNotifyOuterClass { PlayerSyncScNotify other = (PlayerSyncScNotify) o; return bitField0_ == other.bitField0_ && (!hasTotalAchievementExp() || totalAchievementExp == other.totalAchievementExp) - && (!hasAvatarSync() || avatarSync.equals(other.avatarSync)) && (!hasBasicInfo() || basicInfo.equals(other.basicInfo)) + && (!hasAvatarSync() || avatarSync.equals(other.avatarSync)) && (!hasMissionSync() || missionSync.equals(other.missionSync)) && (!hasBoardDataSync() || boardDataSync.equals(other.boardDataSync)) - && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) && (!hasDelEquipmentList() || delEquipmentList.equals(other.delEquipmentList)) - && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) - && (!hasMaterialList() || materialList.equals(other.materialList)) + && (!hasDelRelicList() || delRelicList.equals(other.delRelicList)) && (!hasBasicTypeInfoList() || basicTypeInfoList.equals(other.basicTypeInfoList)) - && (!hasRelicList() || relicList.equals(other.relicList)); + && (!hasEquipmentList() || equipmentList.equals(other.equipmentList)) + && (!hasRelicList() || relicList.equals(other.relicList)) + && (!hasMaterialList() || materialList.equals(other.materialList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 25240); + output.writeRawLittleEndian16((short) 27624); output.writeUInt32NoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(avatarSync); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 34); output.writeMessageNoTag(basicInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(avatarSync); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(missionSync); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawLittleEndian16((short) 16850); + output.writeRawLittleEndian16((short) 26762); output.writeMessageNoTag(boardDataSync); } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < delRelicList.length(); i++) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(delRelicList.array()[i]); - } - } - if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < delEquipmentList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(delEquipmentList.array()[i]); } } + if ((bitField0_ & 0x00000040) != 0) { + for (int i = 0; i < delRelicList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(delRelicList.array()[i]); + } + } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < equipmentList.length(); i++) { - output.writeRawByte((byte) 34); - output.writeMessageNoTag(equipmentList.get(i)); - } - } - if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < materialList.length(); i++) { - output.writeRawByte((byte) 58); - output.writeMessageNoTag(materialList.get(i)); - } - } - if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < basicTypeInfoList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 18); output.writeMessageNoTag(basicTypeInfoList.get(i)); } } - if ((bitField0_ & 0x00000400) != 0) { + 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) 114); + output.writeRawByte((byte) 50); output.writeMessageNoTag(relicList.get(i)); } } + if ((bitField0_ & 0x00000400) != 0) { + for (int i = 0; i < materialList.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(materialList.get(i)); + } + } } @Override @@ -954,10 +954,10 @@ public final class PlayerSyncScNotifyOuterClass { size += 2 + ProtoSink.computeUInt32SizeNoTag(totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); + size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(basicInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(avatarSync); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(missionSync); @@ -966,23 +966,23 @@ public final class PlayerSyncScNotifyOuterClass { size += 2 + ProtoSink.computeMessageSizeNoTag(boardDataSync); } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); - } - if ((bitField0_ & 0x00000040) != 0) { size += (1 * delEquipmentList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delEquipmentList); } + if ((bitField0_ & 0x00000040) != 0) { + size += (1 * delRelicList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(delRelicList); + } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * equipmentList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentList); - } - if ((bitField0_ & 0x00000100) != 0) { - size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); - } - if ((bitField0_ & 0x00000200) != 0) { size += (1 * basicTypeInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(basicTypeInfoList); } - if ((bitField0_ & 0x00000400) != 0) { + 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) { + size += (1 * materialList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(materialList); + } return size; } @@ -993,54 +993,54 @@ public final class PlayerSyncScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 12568: { + case 13800: { // totalAchievementExp totalAchievementExp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { - // avatarSync - input.readMessage(avatarSync); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { + case 34: { // basicInfo input.readMessage(basicInfo); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 66) { + if (tag != 42) { break; } } - case 66: { + case 42: { + // avatarSync + input.readMessage(avatarSync); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // missionSync input.readMessage(missionSync); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 8402) { + if (tag != 13322) { break; } } - case 8402: { + case 13322: { // boardDataSync input.readMessage(boardDataSync); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 10) { break; } } - case 18: { - // delRelicList [packed=true] - input.readPackedUInt32(delRelicList, tag); + case 10: { + // delEquipmentList [packed=true] + input.readPackedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 106) { @@ -1048,41 +1048,41 @@ public final class PlayerSyncScNotifyOuterClass { } } case 106: { - // delEquipmentList [packed=true] - input.readPackedUInt32(delEquipmentList, tag); + // delRelicList [packed=true] + input.readPackedUInt32(delRelicList, tag); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 34) { + if (tag != 18) { break; } } - case 34: { - // equipmentList - tag = input.readRepeatedMessage(equipmentList, tag); - bitField0_ |= 0x00000080; - if (tag != 58) { - break; - } - } - case 58: { - // materialList - tag = input.readRepeatedMessage(materialList, tag); - bitField0_ |= 0x00000100; - if (tag != 90) { - break; - } - } - case 90: { + case 18: { // basicTypeInfoList tag = input.readRepeatedMessage(basicTypeInfoList, tag); + bitField0_ |= 0x00000080; + if (tag != 26) { + break; + } + } + case 26: { + // equipmentList + tag = input.readRepeatedMessage(equipmentList, tag); + bitField0_ |= 0x00000100; + if (tag != 50) { + break; + } + } + case 50: { + // relicList + tag = input.readRepeatedMessage(relicList, tag); bitField0_ |= 0x00000200; if (tag != 114) { break; } } case 114: { - // relicList - tag = input.readRepeatedMessage(relicList, tag); + // materialList + tag = input.readRepeatedMessage(materialList, tag); bitField0_ |= 0x00000400; if (tag != 0) { break; @@ -1098,15 +1098,15 @@ public final class PlayerSyncScNotifyOuterClass { tag = input.readTag(); break; } - case 16: { - // delRelicList [packed=false] - tag = input.readRepeatedUInt32(delRelicList, tag); + case 8: { + // delEquipmentList [packed=false] + tag = input.readRepeatedUInt32(delEquipmentList, tag); bitField0_ |= 0x00000020; break; } case 104: { - // delEquipmentList [packed=false] - tag = input.readRepeatedUInt32(delEquipmentList, tag); + // delRelicList [packed=false] + tag = input.readRepeatedUInt32(delRelicList, tag); bitField0_ |= 0x00000040; break; } @@ -1121,10 +1121,10 @@ public final class PlayerSyncScNotifyOuterClass { output.writeUInt32(FieldNames.totalAchievementExp, totalAchievementExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.avatarSync, avatarSync); + output.writeMessage(FieldNames.basicInfo, basicInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.basicInfo, basicInfo); + output.writeMessage(FieldNames.avatarSync, avatarSync); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.missionSync, missionSync); @@ -1133,23 +1133,23 @@ public final class PlayerSyncScNotifyOuterClass { output.writeMessage(FieldNames.boardDataSync, boardDataSync); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedUInt32(FieldNames.delEquipmentList, delEquipmentList); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRepeatedUInt32(FieldNames.delRelicList, delRelicList); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); - } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.materialList, materialList); - } - if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.basicTypeInfoList, basicTypeInfoList); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000100) != 0) { + output.writeRepeatedMessage(FieldNames.equipmentList, equipmentList); + } + if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.relicList, relicList); } + if ((bitField0_ & 0x00000400) != 0) { + output.writeRepeatedMessage(FieldNames.materialList, materialList); + } output.endObject(); } @@ -1172,11 +1172,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_ |= 0x00000002; } } else { @@ -1184,11 +1184,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_ |= 0x00000004; } } else { @@ -1220,11 +1220,11 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case 1380069094: - case 1336083102: { - if (input.isAtField(FieldNames.delRelicList)) { + case -2124519167: + case -1682718877: { + if (input.isAtField(FieldNames.delEquipmentList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(delRelicList); + input.readRepeatedUInt32(delEquipmentList); bitField0_ |= 0x00000020; } } else { @@ -1232,11 +1232,11 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case -2124519167: - case -1682718877: { - if (input.isAtField(FieldNames.delEquipmentList)) { + case 1380069094: + case 1336083102: { + if (input.isAtField(FieldNames.delRelicList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(delEquipmentList); + input.readRepeatedUInt32(delRelicList); bitField0_ |= 0x00000040; } } else { @@ -1244,36 +1244,24 @@ public final class PlayerSyncScNotifyOuterClass { } break; } - case 2007143244: - case 2109525167: { - if (input.isAtField(FieldNames.equipmentList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(equipmentList); - bitField0_ |= 0x00000080; - } - } else { - input.skipUnknownField(); - } - break; - } - case -2115854747: - case -1149360970: { - if (input.isAtField(FieldNames.materialList)) { - if (!input.trySkipNullValue()) { - input.readRepeatedMessage(materialList); - bitField0_ |= 0x00000100; - } - } else { - input.skipUnknownField(); - } - break; - } case -344592620: case -1315699973: { if (input.isAtField(FieldNames.basicTypeInfoList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(basicTypeInfoList); - bitField0_ |= 0x00000200; + 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(); @@ -1285,6 +1273,18 @@ public final class PlayerSyncScNotifyOuterClass { if (input.isAtField(FieldNames.relicList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(relicList); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2115854747: + case -1149360970: { + if (input.isAtField(FieldNames.materialList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(materialList); bitField0_ |= 0x00000400; } } else { @@ -1347,25 +1347,25 @@ public final class PlayerSyncScNotifyOuterClass { static class FieldNames { static final FieldName totalAchievementExp = FieldName.forField("totalAchievementExp", "total_achievement_exp"); - static final FieldName avatarSync = FieldName.forField("avatarSync", "avatar_sync"); - static final FieldName basicInfo = FieldName.forField("basicInfo", "basic_info"); + static final FieldName avatarSync = FieldName.forField("avatarSync", "avatar_sync"); + static final FieldName missionSync = FieldName.forField("missionSync", "mission_sync"); static final FieldName boardDataSync = FieldName.forField("boardDataSync", "board_data_sync"); - static final FieldName delRelicList = FieldName.forField("delRelicList", "del_relic_list"); - static final FieldName delEquipmentList = FieldName.forField("delEquipmentList", "del_equipment_list"); - static final FieldName equipmentList = FieldName.forField("equipmentList", "equipment_list"); - - static final FieldName materialList = FieldName.forField("materialList", "material_list"); + 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java b/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java index 84bb80f..c3ef7c4 100644 --- a/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PlayingStateOuterClass.java @@ -37,7 +37,17 @@ public final class PlayingStateOuterClass { /** * PLAYING_CHALLENGE_STORY = 5; */ - PLAYING_CHALLENGE_STORY("PLAYING_CHALLENGE_STORY", 5); + PLAYING_CHALLENGE_STORY("PLAYING_CHALLENGE_STORY", 5), + + /** + * PLAYING_CHALLENGE_BOSS = 6; + */ + PLAYING_CHALLENGE_BOSS("PLAYING_CHALLENGE_BOSS", 6), + + /** + * PLAYING_ROGUE_TOURN = 7; + */ + PLAYING_ROGUE_TOURN("PLAYING_ROGUE_TOURN", 7); /** * PLAYING_STATE_NONE = 0; @@ -69,6 +79,16 @@ public final class PlayingStateOuterClass { */ public static final int PLAYING_CHALLENGE_STORY_VALUE = 5; + /** + * PLAYING_CHALLENGE_BOSS = 6; + */ + public static final int PLAYING_CHALLENGE_BOSS_VALUE = 6; + + /** + * PLAYING_ROGUE_TOURN = 7; + */ + public static final int PLAYING_ROGUE_TOURN_VALUE = 7; + private final String name; private final int number; @@ -122,7 +142,7 @@ public final class PlayingStateOuterClass { enum PlayingStateConverter implements ProtoEnum.EnumConverter { INSTANCE; - private static final PlayingState[] lookup = new PlayingState[6]; + private static final PlayingState[] lookup = new PlayingState[8]; static { lookup[0] = PLAYING_STATE_NONE; @@ -131,6 +151,8 @@ public final class PlayingStateOuterClass { lookup[3] = PLAYING_ROGUE_CHESS_NOUS; lookup[4] = PLAYING_CHALLENGE_MEMORY; lookup[5] = PLAYING_CHALLENGE_STORY; + lookup[6] = PLAYING_CHALLENGE_BOSS; + lookup[7] = PLAYING_ROGUE_TOURN; } @Override @@ -154,6 +176,9 @@ public final class PlayingStateOuterClass { if (ProtoUtil.isEqual("PLAYING_ROGUE_CHESS", value)) { return PLAYING_ROGUE_CHESS; } + if (ProtoUtil.isEqual("PLAYING_ROGUE_TOURN", value)) { + return PLAYING_ROGUE_TOURN; + } break; } case 20: { @@ -162,6 +187,12 @@ public final class PlayingStateOuterClass { } break; } + case 22: { + if (ProtoUtil.isEqual("PLAYING_CHALLENGE_BOSS", value)) { + return PLAYING_CHALLENGE_BOSS; + } + break; + } case 23: { if (ProtoUtil.isEqual("PLAYING_CHALLENGE_STORY", value)) { return PLAYING_CHALLENGE_STORY; diff --git a/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/PromoteAvatarCsReqOuterClass.java index 67753a6..7e3e095 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 = 7; + * optional uint32 base_avatar_id = 9; */ private int baseAvatarId; /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -40,7 +40,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 9; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -48,7 +48,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 9; * @return this */ public PromoteAvatarCsReq clearBaseAvatarId() { @@ -58,7 +58,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 9; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -66,7 +66,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 7; + * optional uint32 base_avatar_id = 9; * @param value the baseAvatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -85,7 +85,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @return this */ public PromoteAvatarCsReq clearItemList() { @@ -95,7 +95,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost 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. @@ -109,7 +109,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost 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 @@ -123,7 +123,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @param value the itemList to add * @return this */ @@ -134,7 +134,7 @@ public final class PromoteAvatarCsReqOuterClass { } /** - * repeated .ItemCost item_list = 13; + * repeated .ItemCost item_list = 7; * @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) 56); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 58); output.writeMessageNoTag(itemList.get(i)); } } @@ -240,16 +240,16 @@ public final class PromoteAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 72: { // baseAvatarId baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 58) { break; } } - case 106: { + case 58: { // 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 1d4cbb8..e0e6fdc 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 = 6; + * optional uint32 equipment_unique_id = 10; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 12; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 10; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 10; * @return this */ public PromoteEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 10; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 6; + * optional uint32 equipment_unique_id = 10; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 12; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 12; * @return this */ public PromoteEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class PromoteEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 13; + * optional .ItemCostList item_cost_list = 12; * @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) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 98); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class PromoteEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 80: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 98) { break; } } - case 106: { + case 98: { // 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 e2729da..0ec25b8 100644 --- a/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropAeonInfoOuterClass.java @@ -19,17 +19,17 @@ public final class PropAeonInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 dialogue_group_id = 9; - */ - private int dialogueGroupId; - - /** - * optional uint32 add_exp = 10; + * optional uint32 add_exp = 4; */ private int addExp; /** - * optional uint32 aeon_id = 12; + * optional uint32 dialogue_group_id = 11; + */ + private int dialogueGroupId; + + /** + * optional uint32 aeon_id = 13; */ private int aeonId; @@ -44,62 +44,25 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 dialogue_group_id = 9; - * @return whether the dialogueGroupId field is set + * optional uint32 add_exp = 4; + * @return whether the addExp field is set */ - public boolean hasDialogueGroupId() { + public boolean hasAddExp() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 dialogue_group_id = 9; - * @return this - */ - public PropAeonInfo clearDialogueGroupId() { - bitField0_ &= ~0x00000001; - dialogueGroupId = 0; - return this; - } - - /** - * optional uint32 dialogue_group_id = 9; - * @return the dialogueGroupId - */ - public int getDialogueGroupId() { - return dialogueGroupId; - } - - /** - * optional uint32 dialogue_group_id = 9; - * @param value the dialogueGroupId to set - * @return this - */ - public PropAeonInfo setDialogueGroupId(final int value) { - bitField0_ |= 0x00000001; - dialogueGroupId = value; - return this; - } - - /** - * optional uint32 add_exp = 10; - * @return whether the addExp field is set - */ - public boolean hasAddExp() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 add_exp = 10; + * optional uint32 add_exp = 4; * @return this */ public PropAeonInfo clearAddExp() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; addExp = 0; return this; } /** - * optional uint32 add_exp = 10; + * optional uint32 add_exp = 4; * @return the addExp */ public int getAddExp() { @@ -107,18 +70,55 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 add_exp = 10; + * optional uint32 add_exp = 4; * @param value the addExp to set * @return this */ public PropAeonInfo setAddExp(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; addExp = value; return this; } /** - * optional uint32 aeon_id = 12; + * optional uint32 dialogue_group_id = 11; + * @return whether the dialogueGroupId field is set + */ + public boolean hasDialogueGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 dialogue_group_id = 11; + * @return this + */ + public PropAeonInfo clearDialogueGroupId() { + bitField0_ &= ~0x00000002; + dialogueGroupId = 0; + return this; + } + + /** + * optional uint32 dialogue_group_id = 11; + * @return the dialogueGroupId + */ + public int getDialogueGroupId() { + return dialogueGroupId; + } + + /** + * optional uint32 dialogue_group_id = 11; + * @param value the dialogueGroupId to set + * @return this + */ + public PropAeonInfo setDialogueGroupId(final int value) { + bitField0_ |= 0x00000002; + dialogueGroupId = value; + return this; + } + + /** + * optional uint32 aeon_id = 13; * @return whether the aeonId field is set */ public boolean hasAeonId() { @@ -126,7 +126,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 12; + * optional uint32 aeon_id = 13; * @return this */ public PropAeonInfo clearAeonId() { @@ -136,7 +136,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 12; + * optional uint32 aeon_id = 13; * @return the aeonId */ public int getAeonId() { @@ -144,7 +144,7 @@ public final class PropAeonInfoOuterClass { } /** - * optional uint32 aeon_id = 12; + * optional uint32 aeon_id = 13; * @param value the aeonId to set * @return this */ @@ -159,8 +159,8 @@ public final class PropAeonInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - dialogueGroupId = other.dialogueGroupId; addExp = other.addExp; + dialogueGroupId = other.dialogueGroupId; aeonId = other.aeonId; } return this; @@ -172,12 +172,12 @@ public final class PropAeonInfoOuterClass { return this; } cachedSize = -1; - if (other.hasDialogueGroupId()) { - setDialogueGroupId(other.dialogueGroupId); - } if (other.hasAddExp()) { setAddExp(other.addExp); } + if (other.hasDialogueGroupId()) { + setDialogueGroupId(other.dialogueGroupId); + } if (other.hasAeonId()) { setAeonId(other.aeonId); } @@ -191,8 +191,8 @@ public final class PropAeonInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - dialogueGroupId = 0; addExp = 0; + dialogueGroupId = 0; aeonId = 0; return this; } @@ -217,23 +217,23 @@ public final class PropAeonInfoOuterClass { } PropAeonInfo other = (PropAeonInfo) o; return bitField0_ == other.bitField0_ - && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasAddExp() || addExp == other.addExp) + && (!hasDialogueGroupId() || dialogueGroupId == other.dialogueGroupId) && (!hasAeonId() || aeonId == other.aeonId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(dialogueGroupId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(addExp); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(dialogueGroupId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(aeonId); } } @@ -242,10 +242,10 @@ public final class PropAeonInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(addExp); + size += 1 + ProtoSink.computeUInt32SizeNoTag(dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); @@ -260,25 +260,25 @@ public final class PropAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // dialogueGroupId - dialogueGroupId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 32: { // addExp addExp = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 88) { break; } } - case 96: { + case 88: { + // dialogueGroupId + dialogueGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // aeonId aeonId = input.readUInt32(); bitField0_ |= 0x00000004; @@ -305,10 +305,10 @@ public final class PropAeonInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); + output.writeUInt32(FieldNames.addExp, addExp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.addExp, addExp); + output.writeUInt32(FieldNames.dialogueGroupId, dialogueGroupId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.aeonId, aeonId); @@ -323,11 +323,11 @@ public final class PropAeonInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1758320386: - case 1899979106: { - if (input.isAtField(FieldNames.dialogueGroupId)) { + case -1422538308: + case -1148257921: { + if (input.isAtField(FieldNames.addExp)) { if (!input.trySkipNullValue()) { - dialogueGroupId = input.readUInt32(); + addExp = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -335,11 +335,11 @@ public final class PropAeonInfoOuterClass { } break; } - case -1422538308: - case -1148257921: { - if (input.isAtField(FieldNames.addExp)) { + case 1758320386: + case 1899979106: { + if (input.isAtField(FieldNames.dialogueGroupId)) { if (!input.trySkipNullValue()) { - addExp = input.readUInt32(); + dialogueGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class PropAeonInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); - static final FieldName addExp = FieldName.forField("addExp", "add_exp"); + static final FieldName dialogueGroupId = FieldName.forField("dialogueGroupId", "dialogue_group_id"); + static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java index cccd7c9..1d28286 100644 --- a/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/PropExtraInfoOuterClass.java @@ -24,7 +24,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 14; */ private final PropRogueInfoOuterClass.PropRogueInfo rogueInfo = PropRogueInfoOuterClass.PropRogueInfo.newInstance(); @@ -55,7 +55,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 14; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { @@ -68,7 +68,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 14; * @return this */ public PropExtraInfo clearRogueInfo() { @@ -83,7 +83,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo 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. @@ -102,7 +102,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo 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 @@ -121,7 +121,7 @@ public final class PropExtraInfoOuterClass { * PropChessInfo chess_rogue_info = 4; * * - * optional .PropRogueInfo rogue_info = 11; + * optional .PropRogueInfo rogue_info = 14; * @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) 90); + output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueInfo); } } @@ -212,7 +212,7 @@ public final class PropExtraInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 114: { // 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 bc8e23f..338ddfa 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 = 6; + * optional uint32 site_id = 3; */ private int siteId; /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 12; */ private int roomId; @@ -39,7 +39,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 6; + * optional uint32 site_id = 3; * @return whether the siteId field is set */ public boolean hasSiteId() { @@ -47,7 +47,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 6; + * optional uint32 site_id = 3; * @return this */ public PropRogueInfo clearSiteId() { @@ -57,7 +57,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 6; + * optional uint32 site_id = 3; * @return the siteId */ public int getSiteId() { @@ -65,7 +65,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 site_id = 6; + * optional uint32 site_id = 3; * @param value the siteId to set * @return this */ @@ -76,7 +76,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 12; * @return whether the roomId field is set */ public boolean hasRoomId() { @@ -84,7 +84,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 12; * @return this */ public PropRogueInfo clearRoomId() { @@ -94,7 +94,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 12; * @return the roomId */ public int getRoomId() { @@ -102,7 +102,7 @@ public final class PropRogueInfoOuterClass { } /** - * optional uint32 room_id = 11; + * optional uint32 room_id = 12; * @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) 48); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(roomId); } } @@ -205,16 +205,16 @@ public final class PropRogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 24: { // siteId siteId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 96) { break; } } - case 88: { + case 96: { // 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 afd07fe..1e7ce9f 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 = 4; + * optional int64 finish_time = 3; */ private long finishTime; /** - * optional uint32 progress = 1; - */ - private int progress; - - /** - * optional uint32 id = 14; + * optional uint32 id = 1; */ private int id; /** - * optional .QuestStatus status = 8; + * optional uint32 progress = 9; + */ + private int progress; + + /** + * optional .QuestStatus status = 13; */ private int status; @@ -49,7 +49,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return whether the finishTime field is set */ public boolean hasFinishTime() { @@ -57,7 +57,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return this */ public Quest clearFinishTime() { @@ -67,7 +67,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @return the finishTime */ public long getFinishTime() { @@ -75,7 +75,7 @@ public final class QuestOuterClass { } /** - * optional int64 finish_time = 4; + * optional int64 finish_time = 3; * @param value the finishTime to set * @return this */ @@ -86,62 +86,25 @@ public final class QuestOuterClass { } /** - * optional uint32 progress = 1; - * @return whether the progress field is set + * optional uint32 id = 1; + * @return whether the id field is set */ - public boolean hasProgress() { + public boolean hasId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 progress = 1; - * @return this - */ - public Quest clearProgress() { - bitField0_ &= ~0x00000002; - progress = 0; - return this; - } - - /** - * optional uint32 progress = 1; - * @return the progress - */ - public int getProgress() { - return progress; - } - - /** - * optional uint32 progress = 1; - * @param value the progress to set - * @return this - */ - public Quest setProgress(final int value) { - bitField0_ |= 0x00000002; - progress = value; - return this; - } - - /** - * optional uint32 id = 14; - * @return whether the id field is set - */ - public boolean hasId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 id = 14; + * optional uint32 id = 1; * @return this */ public Quest clearId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; id = 0; return this; } /** - * optional uint32 id = 14; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -149,18 +112,55 @@ public final class QuestOuterClass { } /** - * optional uint32 id = 14; + * optional uint32 id = 1; * @param value the id to set * @return this */ public Quest setId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; id = value; return this; } /** - * optional .QuestStatus status = 8; + * optional uint32 progress = 9; + * @return whether the progress field is set + */ + public boolean hasProgress() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 progress = 9; + * @return this + */ + public Quest clearProgress() { + bitField0_ &= ~0x00000004; + progress = 0; + return this; + } + + /** + * optional uint32 progress = 9; + * @return the progress + */ + public int getProgress() { + return progress; + } + + /** + * optional uint32 progress = 9; + * @param value the progress to set + * @return this + */ + public Quest setProgress(final int value) { + bitField0_ |= 0x00000004; + progress = value; + return this; + } + + /** + * optional .QuestStatus status = 13; * @return whether the status field is set */ public boolean hasStatus() { @@ -168,7 +168,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 8; + * optional .QuestStatus status = 13; * @return this */ public Quest clearStatus() { @@ -178,7 +178,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 8; + * optional .QuestStatus status = 13; * @return the status */ public QuestStatusOuterClass.QuestStatus getStatus() { @@ -211,7 +211,7 @@ public final class QuestOuterClass { } /** - * optional .QuestStatus status = 8; + * optional .QuestStatus status = 13; * @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; - progress = other.progress; id = other.id; + progress = other.progress; status = other.status; } return this; @@ -243,12 +243,12 @@ public final class QuestOuterClass { if (other.hasFinishTime()) { setFinishTime(other.finishTime); } - if (other.hasProgress()) { - setProgress(other.progress); - } if (other.hasId()) { setId(other.id); } + if (other.hasProgress()) { + setProgress(other.progress); + } if (other.hasStatus()) { setStatusValue(other.status); } @@ -263,8 +263,8 @@ public final class QuestOuterClass { cachedSize = -1; bitField0_ = 0; finishTime = 0L; - progress = 0; id = 0; + progress = 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) - && (!hasProgress() || progress == other.progress) && (!hasId() || id == other.id) + && (!hasProgress() || progress == other.progress) && (!hasStatus() || status == other.status); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 24); output.writeInt64NoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(progress); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); output.writeUInt32NoTag(id); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(progress); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } } @@ -322,10 +322,10 @@ public final class QuestOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(finishTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(id); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(status); @@ -340,7 +340,7 @@ public final class QuestOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 24: { // finishTime finishTime = input.readInt64(); bitField0_ |= 0x00000001; @@ -350,24 +350,24 @@ public final class QuestOuterClass { } } case 8: { - // progress - progress = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // id id = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 64) { + if (tag != 72) { break; } } - case 64: { + case 72: { + // progress + progress = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { // 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.progress, progress); + output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.id, id); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.status, status, QuestStatusOuterClass.QuestStatus.converter()); @@ -430,10 +430,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_ |= 0x00000002; } } else { @@ -441,10 +441,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_ |= 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 progress = FieldName.forField("progress"); - static final FieldName id = FieldName.forField("id"); + static final FieldName progress = FieldName.forField("progress"); + 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 b88fd14..0d75d50 100644 --- a/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/QuitLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public final class QuitLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 plane_id = 6; - */ - private int planeId; - - /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 5; */ private int baseAvatarId; /** - * optional uint32 index = 13; + * optional uint32 index = 10; */ private int index; /** - * optional .ExtraLineupType extra_lineup_type = 8; + * optional uint32 plane_id = 15; */ - private int extraLineupType; + private int planeId; /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 6; */ private int avatarType; /** - * optional bool is_virtual = 1; + * optional .ExtraLineupType extra_lineup_type = 7; + */ + private int extraLineupType; + + /** + * optional bool is_virtual = 14; */ private boolean isVirtual; @@ -59,62 +59,25 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 6; - * @return whether the planeId field is set + * optional uint32 base_avatar_id = 5; + * @return whether the baseAvatarId field is set */ - public boolean hasPlaneId() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 plane_id = 6; - * @return this - */ - public QuitLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000001; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 6; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 6; - * @param value the planeId to set - * @return this - */ - public QuitLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000001; - planeId = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 12; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 5; * @return this */ public QuitLineupCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 5; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -122,36 +85,36 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 12; + * optional uint32 base_avatar_id = 5; * @param value the baseAvatarId to set * @return this */ public QuitLineupCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } /** - * optional uint32 index = 13; + * optional uint32 index = 10; * @return whether the index field is set */ public boolean hasIndex() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 index = 13; + * optional uint32 index = 10; * @return this */ public QuitLineupCsReq clearIndex() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; index = 0; return this; } /** - * optional uint32 index = 13; + * optional uint32 index = 10; * @return the index */ public int getIndex() { @@ -159,99 +122,73 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional uint32 index = 13; + * optional uint32 index = 10; * @param value the index to set * @return this */ public QuitLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; index = value; return this; } /** - * optional .ExtraLineupType extra_lineup_type = 8; - * @return whether the extraLineupType field is set + * optional uint32 plane_id = 15; + * @return whether the planeId field is set */ - public boolean hasExtraLineupType() { + public boolean hasPlaneId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 plane_id = 15; + * @return this + */ + public QuitLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000004; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 15; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 15; + * @param value the planeId to set + * @return this + */ + public QuitLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000004; + planeId = value; + return this; + } + + /** + * optional .AvatarType avatar_type = 6; + * @return whether the avatarType field is set + */ + public boolean hasAvatarType() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .ExtraLineupType extra_lineup_type = 8; - * @return this - */ - public QuitLineupCsReq clearExtraLineupType() { - bitField0_ &= ~0x00000008; - extraLineupType = 0; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 8; - * @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 QuitLineupCsReq#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 QuitLineupCsReq#getExtraLineupType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public QuitLineupCsReq setExtraLineupTypeValue(final int value) { - bitField0_ |= 0x00000008; - extraLineupType = value; - return this; - } - - /** - * optional .ExtraLineupType extra_lineup_type = 8; - * @param value the extraLineupType to set - * @return this - */ - public QuitLineupCsReq setExtraLineupType( - final ExtraLineupTypeOuterClass.ExtraLineupType value) { - bitField0_ |= 0x00000008; - extraLineupType = value.getNumber(); - return this; - } - - /** - * optional .AvatarType avatar_type = 9; - * @return whether the avatarType field is set - */ - public boolean hasAvatarType() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 6; * @return this */ public QuitLineupCsReq clearAvatarType() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; avatarType = 0; return this; } /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 6; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -278,24 +215,87 @@ public final class QuitLineupCsReqOuterClass { * @return this */ public QuitLineupCsReq setAvatarTypeValue(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; avatarType = value; return this; } /** - * optional .AvatarType avatar_type = 9; + * optional .AvatarType avatar_type = 6; * @param value the avatarType to set * @return this */ public QuitLineupCsReq setAvatarType(final AvatarTypeOuterClass.AvatarType value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; avatarType = value.getNumber(); return this; } /** - * optional bool is_virtual = 1; + * 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 QuitLineupCsReq 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 QuitLineupCsReq#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 QuitLineupCsReq#getExtraLineupType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public QuitLineupCsReq 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 QuitLineupCsReq setExtraLineupType( + final ExtraLineupTypeOuterClass.ExtraLineupType value) { + bitField0_ |= 0x00000010; + extraLineupType = value.getNumber(); + return this; + } + + /** + * optional bool is_virtual = 14; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -303,7 +303,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 14; * @return this */ public QuitLineupCsReq clearIsVirtual() { @@ -313,7 +313,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 14; * @return the isVirtual */ public boolean getIsVirtual() { @@ -321,7 +321,7 @@ public final class QuitLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 14; * @param value the isVirtual to set * @return this */ @@ -336,11 +336,11 @@ public final class QuitLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - planeId = other.planeId; baseAvatarId = other.baseAvatarId; index = other.index; - extraLineupType = other.extraLineupType; + planeId = other.planeId; avatarType = other.avatarType; + extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; } return this; @@ -352,21 +352,21 @@ public final class QuitLineupCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPlaneId()) { - setPlaneId(other.planeId); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } if (other.hasIndex()) { setIndex(other.index); } - if (other.hasExtraLineupType()) { - setExtraLineupTypeValue(other.extraLineupType); + if (other.hasPlaneId()) { + setPlaneId(other.planeId); } if (other.hasAvatarType()) { setAvatarTypeValue(other.avatarType); } + if (other.hasExtraLineupType()) { + setExtraLineupTypeValue(other.extraLineupType); + } if (other.hasIsVirtual()) { setIsVirtual(other.isVirtual); } @@ -380,11 +380,11 @@ public final class QuitLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - planeId = 0; baseAvatarId = 0; index = 0; - extraLineupType = 0; + planeId = 0; avatarType = 0; + extraLineupType = 0; isVirtual = false; return this; } @@ -409,38 +409,38 @@ public final class QuitLineupCsReqOuterClass { } QuitLineupCsReq other = (QuitLineupCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPlaneId() || planeId == other.planeId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasIndex() || index == other.index) - && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) + && (!hasPlaneId() || planeId == other.planeId) && (!hasAvatarType() || avatarType == other.avatarType) + && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 80); output.writeUInt32NoTag(index); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); - output.writeEnumNoTag(extraLineupType); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(planeId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); output.writeEnumNoTag(avatarType); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 56); + output.writeEnumNoTag(extraLineupType); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 112); output.writeBoolNoTag(isVirtual); } } @@ -449,19 +449,19 @@ public final class QuitLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); + size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(avatarType); + size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { size += 2; @@ -476,58 +476,58 @@ public final class QuitLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // planeId - planeId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 40: { // baseAvatarId baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 80) { break; } } - case 104: { + case 80: { // index index = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { - // extraLineupType - final int value = input.readInt32(); - if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { - extraLineupType = value; - bitField0_ |= 0x00000008; - } - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 48: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { avatarType = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 8) { + if (tag != 56) { break; } } - case 8: { + case 56: { + // extraLineupType + final int value = input.readInt32(); + if (ExtraLineupTypeOuterClass.ExtraLineupType.forNumber(value) != null) { + extraLineupType = value; + bitField0_ |= 0x00000010; + } + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -554,19 +554,19 @@ public final class QuitLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.index, index); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.planeId, planeId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); } if ((bitField0_ & 0x00000010) != 0) { - output.writeEnum(FieldNames.avatarType, avatarType, AvatarTypeOuterClass.AvatarType.converter()); + output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.isVirtual, isVirtual); @@ -581,24 +581,12 @@ public final class QuitLineupCsReqOuterClass { } 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 118022725: case -1756826157: { if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -609,24 +597,19 @@ public final class QuitLineupCsReqOuterClass { if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { index = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case -468135527: - case -1144475077: { - if (input.isAtField(FieldNames.extraLineupType)) { + case -493896553: + case 1869097438: { + if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { - final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); - if (value != null) { - extraLineupType = value.getNumber(); - bitField0_ |= 0x00000008; - } else { - input.skipUnknownEnumValue(); - } + planeId = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -640,6 +623,23 @@ public final class QuitLineupCsReqOuterClass { final AvatarTypeOuterClass.AvatarType value = input.readEnum(AvatarTypeOuterClass.AvatarType.converter()); if (value != null) { avatarType = value.getNumber(); + bitField0_ |= 0x00000008; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -468135527: + case -1144475077: { + if (input.isAtField(FieldNames.extraLineupType)) { + if (!input.trySkipNullValue()) { + final ExtraLineupTypeOuterClass.ExtraLineupType value = input.readEnum(ExtraLineupTypeOuterClass.ExtraLineupType.converter()); + if (value != null) { + extraLineupType = value.getNumber(); bitField0_ |= 0x00000010; } else { input.skipUnknownEnumValue(); @@ -715,16 +715,16 @@ public final class QuitLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName index = FieldName.forField("index"); - static final FieldName extraLineupType = FieldName.forField("extraLineupType", "extra_lineup_type"); + 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 isVirtual = FieldName.forField("isVirtual", "is_virtual"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java index a432daf..8e46967 100644 --- a/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RankUpAvatarCsReqOuterClass.java @@ -19,17 +19,21 @@ public final class RankUpAvatarCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 9; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional uint32 equip_avatar_id = 3; */ - private int baseAvatarId; + private int equipAvatarId; /** - * optional uint32 rank = 11; + * optional uint32 rank = 13; */ private int rank; /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 5; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -44,44 +48,60 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 9; - * @return whether the baseAvatarId field is set + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional uint32 equip_avatar_id = 3; + * @return whether the equipAvatarId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 9; + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional uint32 equip_avatar_id = 3; * @return this */ - public RankUpAvatarCsReq clearBaseAvatarId() { + public RankUpAvatarCsReq clearEquipAvatarId() { bitField0_ &= ~0x00000001; - baseAvatarId = 0; + equipAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 9; - * @return the baseAvatarId + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional uint32 equip_avatar_id = 3; + * @return the equipAvatarId */ - public int getBaseAvatarId() { - return baseAvatarId; + public int getEquipAvatarId() { + return equipAvatarId; } /** - * optional uint32 base_avatar_id = 9; - * @param value the baseAvatarId to set + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * + * optional uint32 equip_avatar_id = 3; + * @param value the equipAvatarId to set * @return this */ - public RankUpAvatarCsReq setBaseAvatarId(final int value) { + public RankUpAvatarCsReq setEquipAvatarId(final int value) { bitField0_ |= 0x00000001; - baseAvatarId = value; + equipAvatarId = value; return this; } /** - * optional uint32 rank = 11; + * optional uint32 rank = 13; * @return whether the rank field is set */ public boolean hasRank() { @@ -89,7 +109,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 13; * @return this */ public RankUpAvatarCsReq clearRank() { @@ -99,7 +119,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 13; * @return the rank */ public int getRank() { @@ -107,7 +127,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional uint32 rank = 11; + * optional uint32 rank = 13; * @param value the rank to set * @return this */ @@ -118,7 +138,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 5; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -126,7 +146,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 5; * @return this */ public RankUpAvatarCsReq clearItemCostList() { @@ -136,7 +156,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_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 +170,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_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 +184,7 @@ public final class RankUpAvatarCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 4; + * optional .ItemCostList item_cost_list = 5; * @param value the itemCostList to set * @return this */ @@ -179,7 +199,7 @@ public final class RankUpAvatarCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; + equipAvatarId = other.equipAvatarId; rank = other.rank; itemCostList.copyFrom(other.itemCostList); } @@ -192,8 +212,8 @@ public final class RankUpAvatarCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasEquipAvatarId()) { + setEquipAvatarId(other.equipAvatarId); } if (other.hasRank()) { setRank(other.rank); @@ -211,7 +231,7 @@ public final class RankUpAvatarCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; + equipAvatarId = 0; rank = 0; itemCostList.clear(); return this; @@ -238,7 +258,7 @@ public final class RankUpAvatarCsReqOuterClass { } RankUpAvatarCsReq other = (RankUpAvatarCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasRank() || rank == other.rank) && (!hasItemCostList() || itemCostList.equals(other.itemCostList)); } @@ -246,15 +266,15 @@ public final class RankUpAvatarCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(rank); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 42); output.writeMessageNoTag(itemCostList); } } @@ -263,7 +283,7 @@ public final class RankUpAvatarCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rank); @@ -281,25 +301,25 @@ public final class RankUpAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 24: { + // equipAvatarId + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // rank rank = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 34) { + if (tag != 42) { break; } } - case 34: { + case 42: { // itemCostList input.readMessage(itemCostList); bitField0_ |= 0x00000004; @@ -326,7 +346,7 @@ public final class RankUpAvatarCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.rank, rank); @@ -344,11 +364,11 @@ public final class RankUpAvatarCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 169047204: + case 33057906: { + if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -432,7 +452,7 @@ public final class RankUpAvatarCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); static final FieldName rank = FieldName.forField("rank"); diff --git a/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RankUpEquipmentCsReqOuterClass.java index 721688b..63bfcc1 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 = 3; + * optional uint32 equipment_unique_id = 2; */ private int equipmentUniqueId; /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 9; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 3; + * optional uint32 equipment_unique_id = 2; * @return whether the equipmentUniqueId field is set */ public boolean hasEquipmentUniqueId() { @@ -47,7 +47,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 3; + * optional uint32 equipment_unique_id = 2; * @return this */ public RankUpEquipmentCsReq clearEquipmentUniqueId() { @@ -57,7 +57,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 3; + * optional uint32 equipment_unique_id = 2; * @return the equipmentUniqueId */ public int getEquipmentUniqueId() { @@ -65,7 +65,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional uint32 equipment_unique_id = 3; + * optional uint32 equipment_unique_id = 2; * @param value the equipmentUniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 9; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 9; * @return this */ public RankUpEquipmentCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class RankUpEquipmentCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 9; * @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) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(equipmentUniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 74); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class RankUpEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // equipmentUniqueId equipmentUniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 74) { break; } } - case 42: { + case 74: { // 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 48ba932..67d5311 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 = 12; + * optional uint32 stage_id = 1; */ private int stageId; @@ -34,7 +34,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 1; * @return whether the stageId field is set */ public boolean hasStageId() { @@ -42,7 +42,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 1; * @return this */ public ReEnterLastElementStageCsReq clearStageId() { @@ -52,7 +52,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 1; * @return the stageId */ public int getStageId() { @@ -60,7 +60,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { } /** - * optional uint32 stage_id = 12; + * optional uint32 stage_id = 1; * @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) 96); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(stageId); } } @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 8: { // 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 788a9c9..3a76e2b 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 stage_id = 8; - */ - private int stageId; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 10; + * optional uint32 stage_id = 13; + */ + private int stageId; + + /** + * optional .SceneBattleInfo battle_info = 8; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,62 +44,25 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 stage_id = 8; - * @return whether the stageId field is set + * optional uint32 retcode = 3; + * @return whether the retcode field is set */ - public boolean hasStageId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 8; - * @return this - */ - public ReEnterLastElementStageScRsp clearStageId() { - bitField0_ &= ~0x00000001; - stageId = 0; - return this; - } - - /** - * optional uint32 stage_id = 8; - * @return the stageId - */ - public int getStageId() { - return stageId; - } - - /** - * optional uint32 stage_id = 8; - * @param value the stageId to set - * @return this - */ - public ReEnterLastElementStageScRsp setStageId(final int value) { - bitField0_ |= 0x00000001; - stageId = 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 = 3; * @return this */ public ReEnterLastElementStageScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 3; * @param value the retcode to set * @return this */ public ReEnterLastElementStageScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .SceneBattleInfo battle_info = 10; + * optional uint32 stage_id = 13; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 stage_id = 13; + * @return this + */ + public ReEnterLastElementStageScRsp clearStageId() { + bitField0_ &= ~0x00000002; + stageId = 0; + return this; + } + + /** + * optional uint32 stage_id = 13; + * @return the stageId + */ + public int getStageId() { + return stageId; + } + + /** + * optional uint32 stage_id = 13; + * @param value the stageId to set + * @return this + */ + public ReEnterLastElementStageScRsp setStageId(final int value) { + bitField0_ |= 0x00000002; + stageId = value; + return this; + } + + /** + * optional .SceneBattleInfo battle_info = 8; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 8; * @return this */ public ReEnterLastElementStageScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_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. @@ -150,7 +150,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_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 @@ -164,7 +164,7 @@ public final class ReEnterLastElementStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 10; + * optional .SceneBattleInfo battle_info = 8; * @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_; - stageId = other.stageId; retcode = other.retcode; + stageId = other.stageId; battleInfo.copyFrom(other.battleInfo); } return this; @@ -193,12 +193,12 @@ public final class ReEnterLastElementStageScRspOuterClass { return this; } cachedSize = -1; - if (other.hasStageId()) { - setStageId(other.stageId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasStageId()) { + setStageId(other.stageId); + } if (other.hasBattleInfo()) { getMutableBattleInfo().mergeFrom(other.battleInfo); } @@ -212,8 +212,8 @@ public final class ReEnterLastElementStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - stageId = 0; retcode = 0; + stageId = 0; battleInfo.clear(); return this; } @@ -239,23 +239,23 @@ public final class ReEnterLastElementStageScRspOuterClass { } ReEnterLastElementStageScRsp other = (ReEnterLastElementStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) && (!hasRetcode() || retcode == other.retcode) + && (!hasStageId() || stageId == other.stageId) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(stageId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(stageId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 66); 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(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } 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 64: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { + case 24: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 82) { + if (tag != 104) { break; } } - case 82: { + case 104: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 66) { + break; + } + } + case 66: { // 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.stageId, stageId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.battleInfo, battleInfo); @@ -345,11 +345,10 @@ public final class ReEnterLastElementStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class ReEnterLastElementStageScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -435,10 +435,10 @@ public final class ReEnterLastElementStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + 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 3d807a2..6a9dde1 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 = 11; + * optional uint32 trigger_entity_id = 9; */ private int triggerEntityId; /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 10; */ private final MotionInfoOuterClass.MotionInfo triggerMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 1; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -51,7 +51,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 11; + * optional uint32 trigger_entity_id = 9; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -59,7 +59,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 11; + * optional uint32 trigger_entity_id = 9; * @return this */ public RefreshTriggerByClientCsReq clearTriggerEntityId() { @@ -69,7 +69,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 11; + * optional uint32 trigger_entity_id = 9; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -77,7 +77,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional uint32 trigger_entity_id = 11; + * optional uint32 trigger_entity_id = 9; * @param value the triggerEntityId to set * @return this */ @@ -88,7 +88,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 10; * @return whether the triggerMotion field is set */ public boolean hasTriggerMotion() { @@ -96,7 +96,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 10; * @return this */ public RefreshTriggerByClientCsReq clearTriggerMotion() { @@ -106,7 +106,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 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. @@ -120,7 +120,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 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 @@ -134,7 +134,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional .MotionInfo trigger_motion = 15; + * optional .MotionInfo trigger_motion = 10; * @param value the triggerMotion to set * @return this */ @@ -146,7 +146,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -154,7 +154,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @return this */ public RefreshTriggerByClientCsReq clearTriggerName() { @@ -164,7 +164,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @return the triggerName */ public String getTriggerName() { @@ -172,7 +172,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -180,7 +180,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -189,7 +189,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @param value the triggerName to set * @return this */ @@ -200,7 +200,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * optional string trigger_name = 9; + * optional string trigger_name = 14; * @param value the triggerName to set * @return this */ @@ -211,7 +211,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 1; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -219,7 +219,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 1; * @return this */ public RefreshTriggerByClientCsReq clearTriggerTargetIdList() { @@ -229,7 +229,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_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. @@ -243,7 +243,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_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 @@ -257,7 +257,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 1; * @param value the triggerTargetIdList to add * @return this */ @@ -268,7 +268,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { } /** - * repeated uint32 trigger_target_id_list = 4; + * repeated uint32 trigger_target_id_list = 1; * @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) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 82); output.writeMessageNoTag(triggerMotion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 114); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -402,34 +402,34 @@ public final class RefreshTriggerByClientCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 72: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 82) { break; } } - case 122: { + case 82: { // triggerMotion input.readMessage(triggerMotion); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 74) { + if (tag != 114) { break; } } - case 74: { + case 114: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 10) { break; } } - case 34: { + case 10: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000008; @@ -448,7 +448,7 @@ public final class RefreshTriggerByClientCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 8: { // 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 1289f7d..0b9fb38 100644 --- a/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RefreshTriggerByClientScNotifyOuterClass.java @@ -21,17 +21,17 @@ public final class RefreshTriggerByClientScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 trigger_entity_id = 2; + * optional uint32 trigger_entity_id = 13; */ private int triggerEntityId; /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_id_list = 4; */ private final RepeatedInt triggerTargetIdList = RepeatedInt.newEmptyInstance(); @@ -46,7 +46,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 2; + * optional uint32 trigger_entity_id = 13; * @return whether the triggerEntityId field is set */ public boolean hasTriggerEntityId() { @@ -54,7 +54,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 2; + * optional uint32 trigger_entity_id = 13; * @return this */ public RefreshTriggerByClientScNotify clearTriggerEntityId() { @@ -64,7 +64,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 2; + * optional uint32 trigger_entity_id = 13; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -72,7 +72,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional uint32 trigger_entity_id = 2; + * optional uint32 trigger_entity_id = 13; * @param value the triggerEntityId to set * @return this */ @@ -83,7 +83,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -91,7 +91,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @return this */ public RefreshTriggerByClientScNotify clearTriggerName() { @@ -101,7 +101,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @return the triggerName */ public String getTriggerName() { @@ -109,7 +109,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -117,7 +117,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -126,7 +126,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @param value the triggerName to set * @return this */ @@ -137,7 +137,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 9; * @param value the triggerName to set * @return this */ @@ -148,7 +148,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_id_list = 4; * @return whether the triggerTargetIdList field is set */ public boolean hasTriggerTargetIdList() { @@ -156,7 +156,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_id_list = 4; * @return this */ public RefreshTriggerByClientScNotify clearTriggerTargetIdList() { @@ -166,7 +166,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_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. @@ -180,7 +180,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_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 @@ -194,7 +194,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_id_list = 4; * @param value the triggerTargetIdList to add * @return this */ @@ -205,7 +205,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { } /** - * repeated uint32 trigger_target_id_list = 6; + * repeated uint32 trigger_target_id_list = 4; * @param values the triggerTargetIdList to add * @return this */ @@ -288,16 +288,16 @@ public final class RefreshTriggerByClientScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 74); output.writeStringNoTag(triggerName); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < triggerTargetIdList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(triggerTargetIdList.array()[i]); } } @@ -325,25 +325,25 @@ public final class RefreshTriggerByClientScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 104: { // triggerEntityId triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // triggerName + input.readString(triggerName); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // triggerName - input.readString(triggerName); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { // triggerTargetIdList [packed=true] input.readPackedUInt32(triggerTargetIdList, tag); bitField0_ |= 0x00000004; @@ -362,7 +362,7 @@ public final class RefreshTriggerByClientScNotifyOuterClass { tag = input.readTag(); break; } - case 48: { + case 32: { // 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 3448908..cac9fa8 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 retcode = 11; - */ - private int retcode; - - /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 trigger_entity_id = 4; */ private int triggerEntityId; /** - * optional bool refresh_trigger = 10; + * optional uint32 retcode = 9; + */ + private int retcode; + + /** + * optional bool refresh_trigger = 5; */ private boolean refreshTrigger; /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; */ private final Utf8String triggerName = Utf8String.newEmptyInstance(); @@ -50,62 +50,25 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 retcode = 11; - * @return whether the retcode field is set + * optional uint32 trigger_entity_id = 4; + * @return whether the triggerEntityId field is set */ - public boolean hasRetcode() { + public boolean hasTriggerEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 11; - * @return this - */ - public RefreshTriggerByClientScRsp 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 RefreshTriggerByClientScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 trigger_entity_id = 13; - * @return whether the triggerEntityId field is set - */ - public boolean hasTriggerEntityId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 trigger_entity_id = 4; * @return this */ public RefreshTriggerByClientScRsp clearTriggerEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; triggerEntityId = 0; return this; } /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 trigger_entity_id = 4; * @return the triggerEntityId */ public int getTriggerEntityId() { @@ -113,18 +76,55 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional uint32 trigger_entity_id = 13; + * optional uint32 trigger_entity_id = 4; * @param value the triggerEntityId to set * @return this */ public RefreshTriggerByClientScRsp setTriggerEntityId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; triggerEntityId = value; return this; } /** - * optional bool refresh_trigger = 10; + * 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 RefreshTriggerByClientScRsp 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 RefreshTriggerByClientScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional bool refresh_trigger = 5; * @return whether the refreshTrigger field is set */ public boolean hasRefreshTrigger() { @@ -132,7 +132,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 10; + * optional bool refresh_trigger = 5; * @return this */ public RefreshTriggerByClientScRsp clearRefreshTrigger() { @@ -142,7 +142,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 10; + * optional bool refresh_trigger = 5; * @return the refreshTrigger */ public boolean getRefreshTrigger() { @@ -150,7 +150,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional bool refresh_trigger = 10; + * optional bool refresh_trigger = 5; * @param value the refreshTrigger to set * @return this */ @@ -161,7 +161,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @return whether the triggerName field is set */ public boolean hasTriggerName() { @@ -169,7 +169,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @return this */ public RefreshTriggerByClientScRsp clearTriggerName() { @@ -179,7 +179,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @return the triggerName */ public String getTriggerName() { @@ -187,7 +187,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @return internal {@code Utf8String} representation of triggerName for reading */ public Utf8String getTriggerNameBytes() { @@ -195,7 +195,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @return internal {@code Utf8String} representation of triggerName for modifications */ public Utf8String getMutableTriggerNameBytes() { @@ -204,7 +204,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @param value the triggerName to set * @return this */ @@ -215,7 +215,7 @@ public final class RefreshTriggerByClientScRspOuterClass { } /** - * optional string trigger_name = 4; + * optional string trigger_name = 11; * @param value the triggerName to set * @return this */ @@ -230,8 +230,8 @@ public final class RefreshTriggerByClientScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; triggerEntityId = other.triggerEntityId; + retcode = other.retcode; refreshTrigger = other.refreshTrigger; triggerName.copyFrom(other.triggerName); } @@ -244,12 +244,12 @@ public final class RefreshTriggerByClientScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasTriggerEntityId()) { setTriggerEntityId(other.triggerEntityId); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasRefreshTrigger()) { setRefreshTrigger(other.refreshTrigger); } @@ -266,8 +266,8 @@ public final class RefreshTriggerByClientScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; triggerEntityId = 0; + retcode = 0; refreshTrigger = false; triggerName.clear(); return this; @@ -294,8 +294,8 @@ public final class RefreshTriggerByClientScRspOuterClass { } RefreshTriggerByClientScRsp other = (RefreshTriggerByClientScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasTriggerEntityId() || triggerEntityId == other.triggerEntityId) + && (!hasRetcode() || retcode == other.retcode) && (!hasRefreshTrigger() || refreshTrigger == other.refreshTrigger) && (!hasTriggerName() || triggerName.equals(other.triggerName)); } @@ -303,19 +303,19 @@ public final class RefreshTriggerByClientScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(triggerEntityId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 40); output.writeBoolNoTag(refreshTrigger); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 90); output.writeStringNoTag(triggerName); } } @@ -324,10 +324,10 @@ public final class RefreshTriggerByClientScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(triggerEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -345,34 +345,34 @@ public final class RefreshTriggerByClientScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 32: { // triggerEntityId triggerEntityId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 72) { break; } } - case 80: { + case 72: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { // refreshTrigger refreshTrigger = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 34) { + if (tag != 90) { break; } } - case 34: { + case 90: { // triggerName input.readString(triggerName); bitField0_ |= 0x00000008; @@ -399,10 +399,10 @@ public final class RefreshTriggerByClientScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.triggerEntityId, triggerEntityId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.refreshTrigger, refreshTrigger); @@ -420,10 +420,11 @@ public final class RefreshTriggerByClientScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 242025014: + case -2081789648: { + if (input.isAtField(FieldNames.triggerEntityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + triggerEntityId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -431,11 +432,10 @@ public final class RefreshTriggerByClientScRspOuterClass { } break; } - case 242025014: - case -2081789648: { - if (input.isAtField(FieldNames.triggerEntityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - triggerEntityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -521,10 +521,10 @@ public final class RefreshTriggerByClientScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName triggerEntityId = FieldName.forField("triggerEntityId", "trigger_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName refreshTrigger = FieldName.forField("refreshTrigger", "refresh_trigger"); static final FieldName triggerName = FieldName.forField("triggerName", "trigger_name"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java index fa12ffe..73d3b19 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicArchiveOuterClass.java @@ -19,12 +19,12 @@ public final class RelicArchiveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 relic_id = 11; + * optional uint32 relic_id = 4; */ private int relicId; /** - * optional uint32 slot = 12; + * optional uint32 slot = 10; */ private int slot; @@ -39,7 +39,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 11; + * optional uint32 relic_id = 4; * @return whether the relicId field is set */ public boolean hasRelicId() { @@ -47,7 +47,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 11; + * optional uint32 relic_id = 4; * @return this */ public RelicArchive clearRelicId() { @@ -57,7 +57,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 11; + * optional uint32 relic_id = 4; * @return the relicId */ public int getRelicId() { @@ -65,7 +65,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 relic_id = 11; + * optional uint32 relic_id = 4; * @param value the relicId to set * @return this */ @@ -76,7 +76,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 slot = 12; + * optional uint32 slot = 10; * @return whether the slot field is set */ public boolean hasSlot() { @@ -84,7 +84,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 slot = 12; + * optional uint32 slot = 10; * @return this */ public RelicArchive clearSlot() { @@ -94,7 +94,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 slot = 12; + * optional uint32 slot = 10; * @return the slot */ public int getSlot() { @@ -102,7 +102,7 @@ public final class RelicArchiveOuterClass { } /** - * optional uint32 slot = 12; + * optional uint32 slot = 10; * @param value the slot to set * @return this */ @@ -177,11 +177,11 @@ public final class RelicArchiveOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(relicId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(slot); } } @@ -205,16 +205,16 @@ public final class RelicArchiveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // relicId relicId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 80) { break; } } - case 96: { + case 80: { // slot slot = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java index 01b7281..2bec9cd 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicOuterClass.java @@ -20,52 +20,47 @@ public final class RelicOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 unique_id = 2; - */ - private int uniqueId; - - /** - * optional uint32 level = 8; - */ - private int level; - - /** - * optional uint32 exp = 9; - */ - private int exp; - - /** - * optional uint32 base_avatar_id = 10; - */ - private int baseAvatarId; - - /** - * optional uint32 tid = 13; - */ - private int tid; - - /** - * optional uint32 equip_avatar_id = 14; - */ - private int equipAvatarId; - - /** - * optional uint32 main_affix_id = 15; + * optional uint32 main_affix_id = 1; */ private int mainAffixId; /** - * optional bool is_discarded = 1; + * optional uint32 exp = 2; + */ + private int exp; + + /** + * optional uint32 unique_id = 3; + */ + private int uniqueId; + + /** + * optional uint32 tid = 6; + */ + private int tid; + + /** + * optional uint32 level = 9; + */ + private int level; + + /** + * optional uint32 equip_avatar_id = 15; + */ + private int equipAvatarId; + + /** + * optional bool is_discarded = 5; */ private boolean isDiscarded; /** - * optional bool is_protected = 4; + * optional bool is_protected = 11; */ private boolean isProtected; /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_list = 14; */ private final RepeatedMessage subAffixList = RepeatedMessage.newEmptyInstance(RelicAffixOuterClass.RelicAffix.getFactory()); @@ -80,99 +75,62 @@ public final class RelicOuterClass { } /** - * optional uint32 unique_id = 2; - * @return whether the uniqueId field is set + * optional uint32 main_affix_id = 1; + * @return whether the mainAffixId field is set */ - public boolean hasUniqueId() { + public boolean hasMainAffixId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unique_id = 2; + * optional uint32 main_affix_id = 1; * @return this */ - public Relic clearUniqueId() { + public Relic clearMainAffixId() { bitField0_ &= ~0x00000001; - uniqueId = 0; + mainAffixId = 0; return this; } /** - * optional uint32 unique_id = 2; - * @return the uniqueId + * optional uint32 main_affix_id = 1; + * @return the mainAffixId */ - public int getUniqueId() { - return uniqueId; + public int getMainAffixId() { + return mainAffixId; } /** - * optional uint32 unique_id = 2; - * @param value the uniqueId to set + * optional uint32 main_affix_id = 1; + * @param value the mainAffixId to set * @return this */ - public Relic setUniqueId(final int value) { + public Relic setMainAffixId(final int value) { bitField0_ |= 0x00000001; - uniqueId = value; + mainAffixId = value; return this; } /** - * optional uint32 level = 8; - * @return whether the level field is set + * optional uint32 exp = 2; + * @return whether the exp field is set */ - public boolean hasLevel() { + public boolean hasExp() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 level = 8; - * @return this - */ - public Relic 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 Relic setLevel(final int value) { - bitField0_ |= 0x00000002; - level = value; - return this; - } - - /** - * optional uint32 exp = 9; - * @return whether the exp field is set - */ - public boolean hasExp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 exp = 9; + * optional uint32 exp = 2; * @return this */ public Relic clearExp() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; exp = 0; return this; } /** - * optional uint32 exp = 9; + * optional uint32 exp = 2; * @return the exp */ public int getExp() { @@ -180,73 +138,73 @@ public final class RelicOuterClass { } /** - * optional uint32 exp = 9; + * optional uint32 exp = 2; * @param value the exp to set * @return this */ public Relic setExp(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; exp = value; return this; } /** - * optional uint32 base_avatar_id = 10; - * @return whether the baseAvatarId field is set + * optional uint32 unique_id = 3; + * @return whether the uniqueId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasUniqueId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 unique_id = 3; + * @return this + */ + public Relic clearUniqueId() { + bitField0_ &= ~0x00000004; + uniqueId = 0; + return this; + } + + /** + * optional uint32 unique_id = 3; + * @return the uniqueId + */ + public int getUniqueId() { + return uniqueId; + } + + /** + * optional uint32 unique_id = 3; + * @param value the uniqueId to set + * @return this + */ + public Relic setUniqueId(final int value) { + bitField0_ |= 0x00000004; + uniqueId = value; + return this; + } + + /** + * optional uint32 tid = 6; + * @return whether the tid field is set + */ + public boolean hasTid() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 base_avatar_id = 10; - * @return this - */ - public Relic clearBaseAvatarId() { - bitField0_ &= ~0x00000008; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 10; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 10; - * @param value the baseAvatarId to set - * @return this - */ - public Relic setBaseAvatarId(final int value) { - bitField0_ |= 0x00000008; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 tid = 13; - * @return whether the tid field is set - */ - public boolean hasTid() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 tid = 13; + * optional uint32 tid = 6; * @return this */ public Relic clearTid() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; tid = 0; return this; } /** - * optional uint32 tid = 13; + * optional uint32 tid = 6; * @return the tid */ public int getTid() { @@ -254,18 +212,55 @@ public final class RelicOuterClass { } /** - * optional uint32 tid = 13; + * optional uint32 tid = 6; * @param value the tid to set * @return this */ public Relic setTid(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tid = value; return this; } /** - * optional uint32 equip_avatar_id = 14; + * 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() { @@ -273,7 +268,7 @@ public final class RelicOuterClass { } /** - * optional uint32 equip_avatar_id = 14; + * optional uint32 equip_avatar_id = 15; * @return this */ public Relic clearEquipAvatarId() { @@ -283,7 +278,7 @@ public final class RelicOuterClass { } /** - * optional uint32 equip_avatar_id = 14; + * optional uint32 equip_avatar_id = 15; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -291,7 +286,7 @@ public final class RelicOuterClass { } /** - * optional uint32 equip_avatar_id = 14; + * optional uint32 equip_avatar_id = 15; * @param value the equipAvatarId to set * @return this */ @@ -302,62 +297,25 @@ public final class RelicOuterClass { } /** - * optional uint32 main_affix_id = 15; - * @return whether the mainAffixId field is set + * optional bool is_discarded = 5; + * @return whether the isDiscarded field is set */ - public boolean hasMainAffixId() { + public boolean hasIsDiscarded() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 main_affix_id = 15; - * @return this - */ - public Relic clearMainAffixId() { - bitField0_ &= ~0x00000040; - mainAffixId = 0; - return this; - } - - /** - * optional uint32 main_affix_id = 15; - * @return the mainAffixId - */ - public int getMainAffixId() { - return mainAffixId; - } - - /** - * optional uint32 main_affix_id = 15; - * @param value the mainAffixId to set - * @return this - */ - public Relic setMainAffixId(final int value) { - bitField0_ |= 0x00000040; - mainAffixId = value; - return this; - } - - /** - * optional bool is_discarded = 1; - * @return whether the isDiscarded field is set - */ - public boolean hasIsDiscarded() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * optional bool is_discarded = 1; + * optional bool is_discarded = 5; * @return this */ public Relic clearIsDiscarded() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; isDiscarded = false; return this; } /** - * optional bool is_discarded = 1; + * optional bool is_discarded = 5; * @return the isDiscarded */ public boolean getIsDiscarded() { @@ -365,36 +323,36 @@ public final class RelicOuterClass { } /** - * optional bool is_discarded = 1; + * optional bool is_discarded = 5; * @param value the isDiscarded to set * @return this */ public Relic setIsDiscarded(final boolean value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; isDiscarded = value; return this; } /** - * optional bool is_protected = 4; + * optional bool is_protected = 11; * @return whether the isProtected field is set */ public boolean hasIsProtected() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000080) != 0; } /** - * optional bool is_protected = 4; + * optional bool is_protected = 11; * @return this */ public Relic clearIsProtected() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; isProtected = false; return this; } /** - * optional bool is_protected = 4; + * optional bool is_protected = 11; * @return the isProtected */ public boolean getIsProtected() { @@ -402,36 +360,36 @@ public final class RelicOuterClass { } /** - * optional bool is_protected = 4; + * optional bool is_protected = 11; * @param value the isProtected to set * @return this */ public Relic setIsProtected(final boolean value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; isProtected = value; return this; } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_list = 14; * @return whether the subAffixList field is set */ public boolean hasSubAffixList() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000100) != 0; } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_list = 14; * @return this */ public Relic clearSubAffixList() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; subAffixList.clear(); return this; } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_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. @@ -445,7 +403,7 @@ public final class RelicOuterClass { } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_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 @@ -454,28 +412,28 @@ public final class RelicOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableSubAffixList() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return subAffixList; } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_list = 14; * @param value the subAffixList to add * @return this */ public Relic addSubAffixList(final RelicAffixOuterClass.RelicAffix value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; subAffixList.add(value); return this; } /** - * repeated .RelicAffix sub_affix_list = 12; + * repeated .RelicAffix sub_affix_list = 14; * @param values the subAffixList to add * @return this */ public Relic addAllSubAffixList(final RelicAffixOuterClass.RelicAffix... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; subAffixList.addAll(values); return this; } @@ -485,13 +443,12 @@ public final class RelicOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - uniqueId = other.uniqueId; - level = other.level; - exp = other.exp; - baseAvatarId = other.baseAvatarId; - tid = other.tid; - equipAvatarId = other.equipAvatarId; mainAffixId = other.mainAffixId; + exp = other.exp; + uniqueId = other.uniqueId; + tid = other.tid; + level = other.level; + equipAvatarId = other.equipAvatarId; isDiscarded = other.isDiscarded; isProtected = other.isProtected; subAffixList.copyFrom(other.subAffixList); @@ -505,27 +462,24 @@ public final class RelicOuterClass { return this; } cachedSize = -1; - if (other.hasUniqueId()) { - setUniqueId(other.uniqueId); - } - if (other.hasLevel()) { - setLevel(other.level); + if (other.hasMainAffixId()) { + setMainAffixId(other.mainAffixId); } if (other.hasExp()) { setExp(other.exp); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); + if (other.hasUniqueId()) { + setUniqueId(other.uniqueId); } if (other.hasTid()) { setTid(other.tid); } + if (other.hasLevel()) { + setLevel(other.level); + } if (other.hasEquipAvatarId()) { setEquipAvatarId(other.equipAvatarId); } - if (other.hasMainAffixId()) { - setMainAffixId(other.mainAffixId); - } if (other.hasIsDiscarded()) { setIsDiscarded(other.isDiscarded); } @@ -545,13 +499,12 @@ public final class RelicOuterClass { } cachedSize = -1; bitField0_ = 0; - uniqueId = 0; - level = 0; - exp = 0; - baseAvatarId = 0; - tid = 0; - equipAvatarId = 0; mainAffixId = 0; + exp = 0; + uniqueId = 0; + tid = 0; + level = 0; + equipAvatarId = 0; isDiscarded = false; isProtected = false; subAffixList.clear(); @@ -579,13 +532,12 @@ public final class RelicOuterClass { } Relic other = (Relic) o; return bitField0_ == other.bitField0_ - && (!hasUniqueId() || uniqueId == other.uniqueId) - && (!hasLevel() || level == other.level) - && (!hasExp() || exp == other.exp) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasTid() || tid == other.tid) - && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasMainAffixId() || mainAffixId == other.mainAffixId) + && (!hasExp() || exp == other.exp) + && (!hasUniqueId() || uniqueId == other.uniqueId) + && (!hasTid() || tid == other.tid) + && (!hasLevel() || level == other.level) + && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) && (!hasIsDiscarded() || isDiscarded == other.isDiscarded) && (!hasIsProtected() || isProtected == other.isProtected) && (!hasSubAffixList() || subAffixList.equals(other.subAffixList)); @@ -594,44 +546,40 @@ public final class RelicOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(uniqueId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(exp); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(baseAvatarId); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(uniqueId); } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(tid); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(level); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(mainAffixId); - } - if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 40); output.writeBoolNoTag(isDiscarded); } - if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 32); + if ((bitField0_ & 0x00000080) != 0) { + output.writeRawByte((byte) 88); output.writeBoolNoTag(isProtected); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < subAffixList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 114); output.writeMessageNoTag(subAffixList.get(i)); } } @@ -641,33 +589,30 @@ public final class RelicOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(uniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(tid); + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mainAffixId); + size += 2; } if ((bitField0_ & 0x00000080) != 0) { size += 2; } if ((bitField0_ & 0x00000100) != 0) { - size += 2; - } - if ((bitField0_ & 0x00000200) != 0) { size += (1 * subAffixList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(subAffixList); } return size; @@ -680,91 +625,82 @@ public final class RelicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // uniqueId - uniqueId = input.readUInt32(); + case 8: { + // mainAffixId + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { - // level - level = input.readUInt32(); + case 16: { + // 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: { - // exp - exp = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // tid - tid = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // equipAvatarId - equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // mainAffixId - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000040; + // equipAvatarId + equipAvatarId = input.readUInt32(); + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 8) { + if (tag != 40) { break; } } - case 8: { + case 40: { // isDiscarded isDiscarded = input.readBool(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 32) { + if (tag != 88) { break; } } - case 32: { + case 88: { // isProtected isProtected = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 98) { + if (tag != 114) { break; } } - case 98: { + case 114: { // subAffixList tag = input.readRepeatedMessage(subAffixList, tag); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; if (tag != 0) { break; } @@ -787,33 +723,30 @@ public final class RelicOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.uniqueId, uniqueId); + output.writeUInt32(FieldNames.mainAffixId, mainAffixId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.exp, exp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.uniqueId, uniqueId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.tid, tid); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.tid, tid); + output.writeUInt32(FieldNames.level, level); } if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } if ((bitField0_ & 0x00000040) != 0) { - output.writeUInt32(FieldNames.mainAffixId, mainAffixId); - } - if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isDiscarded, isDiscarded); } - if ((bitField0_ & 0x00000100) != 0) { + if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isProtected, isProtected); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.subAffixList, subAffixList); } output.endObject(); @@ -826,11 +759,11 @@ public final class RelicOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -294460212: - case -538310583: { - if (input.isAtField(FieldNames.uniqueId)) { + case -1973876974: + case -1426712144: { + if (input.isAtField(FieldNames.mainAffixId)) { if (!input.trySkipNullValue()) { - uniqueId = input.readUInt32(); + mainAffixId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -838,34 +771,23 @@ public final class RelicOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 100893: { if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { exp = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -294460212: + case -538310583: { + if (input.isAtField(FieldNames.uniqueId)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000008; + uniqueId = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -876,6 +798,17 @@ public final class RelicOuterClass { if (input.isAtField(FieldNames.tid)) { if (!input.trySkipNullValue()) { tid = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -895,24 +828,12 @@ public final class RelicOuterClass { } break; } - case -1973876974: - case -1426712144: { - if (input.isAtField(FieldNames.mainAffixId)) { - if (!input.trySkipNullValue()) { - mainAffixId = input.readUInt32(); - bitField0_ |= 0x00000040; - } - } else { - input.skipUnknownField(); - } - break; - } case 1044162483: case -1445363480: { if (input.isAtField(FieldNames.isDiscarded)) { if (!input.trySkipNullValue()) { isDiscarded = input.readBool(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -924,7 +845,7 @@ public final class RelicOuterClass { if (input.isAtField(FieldNames.isProtected)) { if (!input.trySkipNullValue()) { isProtected = input.readBool(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -936,7 +857,7 @@ public final class RelicOuterClass { if (input.isAtField(FieldNames.subAffixList)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(subAffixList); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -995,19 +916,17 @@ public final class RelicOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName uniqueId = FieldName.forField("uniqueId", "unique_id"); - - static final FieldName level = FieldName.forField("level"); + static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); static final FieldName exp = FieldName.forField("exp"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + 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 level = FieldName.forField("level"); - static final FieldName mainAffixId = FieldName.forField("mainAffixId", "main_affix_id"); + static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); static final FieldName isDiscarded = FieldName.forField("isDiscarded", "is_discarded"); diff --git a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java index a46d80c..fce738a 100644 --- a/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RelicParamOuterClass.java @@ -18,16 +18,16 @@ public final class RelicParamOuterClass { public static final class RelicParam extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 relic_unique_id = 5; - */ - private int relicUniqueId; - /** * optional uint32 slot = 13; */ private int slot; + /** + * optional uint32 relic_unique_id = 14; + */ + private int relicUniqueId; + private RelicParam() { } @@ -38,49 +38,12 @@ public final class RelicParamOuterClass { return new RelicParam(); } - /** - * optional uint32 relic_unique_id = 5; - * @return whether the relicUniqueId field is set - */ - public boolean hasRelicUniqueId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 relic_unique_id = 5; - * @return this - */ - public RelicParam 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 RelicParam setRelicUniqueId(final int value) { - bitField0_ |= 0x00000001; - relicUniqueId = value; - return this; - } - /** * optional uint32 slot = 13; * @return whether the slot field is set */ public boolean hasSlot() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -88,7 +51,7 @@ public final class RelicParamOuterClass { * @return this */ public RelicParam clearSlot() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; slot = 0; return this; } @@ -107,18 +70,55 @@ public final class RelicParamOuterClass { * @return this */ public RelicParam 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 RelicParam 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 RelicParam setRelicUniqueId(final int value) { + bitField0_ |= 0x00000002; + relicUniqueId = value; + return this; + } + @Override public RelicParam copyFrom(final RelicParam 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 RelicParamOuterClass { 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 RelicParamOuterClass { } cachedSize = -1; bitField0_ = 0; - relicUniqueId = 0; slot = 0; + relicUniqueId = 0; return this; } @@ -170,30 +170,30 @@ public final class RelicParamOuterClass { } RelicParam other = (RelicParam) 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); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 104); output.writeUInt32NoTag(slot); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(relicUniqueId); + } } @Override 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 RelicParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // relicUniqueId - relicUniqueId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } case 104: { // slot slot = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // relicUniqueId + relicUniqueId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RelicParamOuterClass { 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 RelicParamOuterClass { } 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 RelicParamOuterClass { } 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 RelicParamOuterClass { * 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/RemoveRotaterCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java new file mode 100644 index 0000000..b33c8f8 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RemoveRotaterCsReqOuterClass.java @@ -0,0 +1,281 @@ +// 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 RemoveRotaterCsReqOuterClass { + /** + * Protobuf type {@code RemoveRotaterCsReq} + */ + public static final class RemoveRotaterCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .RotaterData rotater_data = 6; + */ + private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); + + private RemoveRotaterCsReq() { + } + + /** + * @return a new empty instance of {@code RemoveRotaterCsReq} + */ + public static RemoveRotaterCsReq newInstance() { + return new RemoveRotaterCsReq(); + } + + /** + * optional .RotaterData rotater_data = 6; + * @return whether the rotaterData field is set + */ + public boolean hasRotaterData() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .RotaterData rotater_data = 6; + * @return this + */ + public RemoveRotaterCsReq clearRotaterData() { + bitField0_ &= ~0x00000001; + rotaterData.clear(); + return this; + } + + /** + * optional .RotaterData rotater_data = 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 #getMutableRotaterData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotaterDataOuterClass.RotaterData getRotaterData() { + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 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 RotaterDataOuterClass.RotaterData getMutableRotaterData() { + bitField0_ |= 0x00000001; + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 6; + * @param value the rotaterData to set + * @return this + */ + public RemoveRotaterCsReq setRotaterData(final RotaterDataOuterClass.RotaterData value) { + bitField0_ |= 0x00000001; + rotaterData.copyFrom(value); + return this; + } + + @Override + public RemoveRotaterCsReq copyFrom(final RemoveRotaterCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + rotaterData.copyFrom(other.rotaterData); + } + return this; + } + + @Override + public RemoveRotaterCsReq mergeFrom(final RemoveRotaterCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRotaterData()) { + getMutableRotaterData().mergeFrom(other.rotaterData); + } + return this; + } + + @Override + public RemoveRotaterCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rotaterData.clear(); + return this; + } + + @Override + public RemoveRotaterCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rotaterData.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RemoveRotaterCsReq)) { + return false; + } + RemoveRotaterCsReq other = (RemoveRotaterCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 50); + output.writeMessageNoTag(rotaterData); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RemoveRotaterCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 50: { + // rotaterData + input.readMessage(rotaterData); + 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.writeMessage(FieldNames.rotaterData, rotaterData); + } + output.endObject(); + } + + @Override + public RemoveRotaterCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1880563393: + case -1807070094: { + if (input.isAtField(FieldNames.rotaterData)) { + if (!input.trySkipNullValue()) { + input.readMessage(rotaterData); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RemoveRotaterCsReq clone() { + return new RemoveRotaterCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RemoveRotaterCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RemoveRotaterCsReq(), data).checkInitialized(); + } + + public static RemoveRotaterCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RemoveRotaterCsReq(), input).checkInitialized(); + } + + public static RemoveRotaterCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RemoveRotaterCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating RemoveRotaterCsReq messages + */ + public static MessageFactory getFactory() { + return RemoveRotaterCsReqFactory.INSTANCE; + } + + private enum RemoveRotaterCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public RemoveRotaterCsReq create() { + return RemoveRotaterCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java new file mode 100644 index 0000000..15da912 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/RemoveRotaterScRspOuterClass.java @@ -0,0 +1,464 @@ +// 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 RemoveRotaterScRspOuterClass { + /** + * Protobuf type {@code RemoveRotaterScRsp} + */ + public static final class RemoveRotaterScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 2; + */ + private int retcode; + + /** + * optional .RotaterData rotater_data = 13; + */ + private final RotaterDataOuterClass.RotaterData rotaterData = RotaterDataOuterClass.RotaterData.newInstance(); + + /** + * optional .RotatorEnergyInfo energy_info = 15; + */ + private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); + + private RemoveRotaterScRsp() { + } + + /** + * @return a new empty instance of {@code RemoveRotaterScRsp} + */ + public static RemoveRotaterScRsp newInstance() { + return new RemoveRotaterScRsp(); + } + + /** + * optional uint32 retcode = 2; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 2; + * @return this + */ + public RemoveRotaterScRsp 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 RemoveRotaterScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .RotaterData rotater_data = 13; + * @return whether the rotaterData field is set + */ + public boolean hasRotaterData() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .RotaterData rotater_data = 13; + * @return this + */ + public RemoveRotaterScRsp clearRotaterData() { + bitField0_ &= ~0x00000002; + rotaterData.clear(); + return this; + } + + /** + * optional .RotaterData rotater_data = 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 #getMutableRotaterData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotaterDataOuterClass.RotaterData getRotaterData() { + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 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 RotaterDataOuterClass.RotaterData getMutableRotaterData() { + bitField0_ |= 0x00000002; + return rotaterData; + } + + /** + * optional .RotaterData rotater_data = 13; + * @param value the rotaterData to set + * @return this + */ + public RemoveRotaterScRsp setRotaterData(final RotaterDataOuterClass.RotaterData value) { + bitField0_ |= 0x00000002; + rotaterData.copyFrom(value); + return this; + } + + /** + * optional .RotatorEnergyInfo energy_info = 15; + * @return whether the energyInfo field is set + */ + public boolean hasEnergyInfo() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .RotatorEnergyInfo energy_info = 15; + * @return this + */ + public RemoveRotaterScRsp clearEnergyInfo() { + bitField0_ &= ~0x00000004; + energyInfo.clear(); + return this; + } + + /** + * optional .RotatorEnergyInfo energy_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 #getMutableEnergyInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RotatorEnergyInfoOuterClass.RotatorEnergyInfo getEnergyInfo() { + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_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 RotatorEnergyInfoOuterClass.RotatorEnergyInfo getMutableEnergyInfo() { + bitField0_ |= 0x00000004; + return energyInfo; + } + + /** + * optional .RotatorEnergyInfo energy_info = 15; + * @param value the energyInfo to set + * @return this + */ + public RemoveRotaterScRsp setEnergyInfo( + final RotatorEnergyInfoOuterClass.RotatorEnergyInfo value) { + bitField0_ |= 0x00000004; + energyInfo.copyFrom(value); + return this; + } + + @Override + public RemoveRotaterScRsp copyFrom(final RemoveRotaterScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + rotaterData.copyFrom(other.rotaterData); + energyInfo.copyFrom(other.energyInfo); + } + return this; + } + + @Override + public RemoveRotaterScRsp mergeFrom(final RemoveRotaterScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasRotaterData()) { + getMutableRotaterData().mergeFrom(other.rotaterData); + } + if (other.hasEnergyInfo()) { + getMutableEnergyInfo().mergeFrom(other.energyInfo); + } + return this; + } + + @Override + public RemoveRotaterScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + rotaterData.clear(); + energyInfo.clear(); + return this; + } + + @Override + public RemoveRotaterScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + rotaterData.clearQuick(); + energyInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof RemoveRotaterScRsp)) { + return false; + } + RemoveRotaterScRsp other = (RemoveRotaterScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasRotaterData() || rotaterData.equals(other.rotaterData)) + && (!hasEnergyInfo() || energyInfo.equals(other.energyInfo)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 106); + output.writeMessageNoTag(rotaterData); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(energyInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rotaterData); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(energyInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public RemoveRotaterScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 16: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 106) { + break; + } + } + case 106: { + // rotaterData + input.readMessage(rotaterData); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // energyInfo + input.readMessage(energyInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeMessage(FieldNames.rotaterData, rotaterData); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.energyInfo, energyInfo); + } + output.endObject(); + } + + @Override + public RemoveRotaterScRsp 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 1880563393: + case -1807070094: { + if (input.isAtField(FieldNames.rotaterData)) { + if (!input.trySkipNullValue()) { + input.readMessage(rotaterData); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1464698710: + case -1818804219: { + if (input.isAtField(FieldNames.energyInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(energyInfo); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public RemoveRotaterScRsp clone() { + return new RemoveRotaterScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static RemoveRotaterScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new RemoveRotaterScRsp(), data).checkInitialized(); + } + + public static RemoveRotaterScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new RemoveRotaterScRsp(), input).checkInitialized(); + } + + public static RemoveRotaterScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new RemoveRotaterScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating RemoveRotaterScRsp messages + */ + public static MessageFactory getFactory() { + return RemoveRotaterScRspFactory.INSTANCE; + } + + private enum RemoveRotaterScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public RemoveRotaterScRsp create() { + return RemoveRotaterScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName rotaterData = FieldName.forField("rotaterData", "rotater_data"); + + static final FieldName energyInfo = FieldName.forField("energyInfo", "energy_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/ReplaceLineupCsReqOuterClass.java index bd58cf6..c067e8b 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 = 2; + * optional uint32 plane_id = 7; */ private int planeId; - /** - * optional uint32 index = 3; - */ - private int index; - /** * optional uint32 leader_slot = 12; */ private int leaderSlot; + /** + * optional uint32 index = 15; + */ + private int index; + /** * optional .ExtraLineupType extra_lineup_type = 9; */ private int extraLineupType; /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 8; */ private boolean isVirtual; /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 3; */ private final RepeatedMessage slots = RepeatedMessage.newEmptyInstance(LineupSlotDataOuterClass.LineupSlotData.getFactory()); @@ -60,7 +60,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 2; + * optional uint32 plane_id = 7; * @return whether the planeId field is set */ public boolean hasPlaneId() { @@ -68,7 +68,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 2; + * optional uint32 plane_id = 7; * @return this */ public ReplaceLineupCsReq clearPlaneId() { @@ -78,7 +78,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 2; + * optional uint32 plane_id = 7; * @return the planeId */ public int getPlaneId() { @@ -86,7 +86,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional uint32 plane_id = 2; + * optional uint32 plane_id = 7; * @param value the planeId to set * @return this */ @@ -96,49 +96,12 @@ public final class ReplaceLineupCsReqOuterClass { return this; } - /** - * optional uint32 index = 3; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 3; - * @return this - */ - public ReplaceLineupCsReq clearIndex() { - bitField0_ &= ~0x00000002; - index = 0; - return this; - } - - /** - * optional uint32 index = 3; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 3; - * @param value the index to set - * @return this - */ - public ReplaceLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000002; - index = value; - return this; - } - /** * optional uint32 leader_slot = 12; * @return whether the leaderSlot field is set */ public boolean hasLeaderSlot() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -146,7 +109,7 @@ public final class ReplaceLineupCsReqOuterClass { * @return this */ public ReplaceLineupCsReq clearLeaderSlot() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; leaderSlot = 0; return this; } @@ -165,11 +128,48 @@ public final class ReplaceLineupCsReqOuterClass { * @return this */ public ReplaceLineupCsReq setLeaderSlot(final int value) { - bitField0_ |= 0x00000004; + 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; + * @return this + */ + public ReplaceLineupCsReq clearIndex() { + bitField0_ &= ~0x00000004; + 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 ReplaceLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000004; + index = value; + return this; + } + /** * optional .ExtraLineupType extra_lineup_type = 9; * @return whether the extraLineupType field is set @@ -234,7 +234,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 8; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -242,7 +242,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 8; * @return this */ public ReplaceLineupCsReq clearIsVirtual() { @@ -252,7 +252,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 8; * @return the isVirtual */ public boolean getIsVirtual() { @@ -260,7 +260,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * optional bool is_virtual = 10; + * optional bool is_virtual = 8; * @param value the isVirtual to set * @return this */ @@ -271,7 +271,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 3; * @return whether the slots field is set */ public boolean hasSlots() { @@ -279,7 +279,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 3; * @return this */ public ReplaceLineupCsReq clearSlots() { @@ -289,7 +289,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 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. @@ -303,7 +303,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 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 @@ -317,7 +317,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 3; * @param value the slots to add * @return this */ @@ -328,7 +328,7 @@ public final class ReplaceLineupCsReqOuterClass { } /** - * repeated .LineupSlotData slots = 5; + * repeated .LineupSlotData slots = 3; * @param values the slots to add * @return this */ @@ -344,8 +344,8 @@ public final class ReplaceLineupCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; planeId = other.planeId; - index = other.index; leaderSlot = other.leaderSlot; + index = other.index; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; slots.copyFrom(other.slots); @@ -362,12 +362,12 @@ public final class ReplaceLineupCsReqOuterClass { if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasLeaderSlot()) { setLeaderSlot(other.leaderSlot); } + if (other.hasIndex()) { + setIndex(other.index); + } if (other.hasExtraLineupType()) { setExtraLineupTypeValue(other.extraLineupType); } @@ -388,8 +388,8 @@ public final class ReplaceLineupCsReqOuterClass { cachedSize = -1; bitField0_ = 0; planeId = 0; - index = 0; leaderSlot = 0; + index = 0; extraLineupType = 0; isVirtual = false; slots.clear(); @@ -418,8 +418,8 @@ public final class ReplaceLineupCsReqOuterClass { ReplaceLineupCsReq other = (ReplaceLineupCsReq) o; return bitField0_ == other.bitField0_ && (!hasPlaneId() || planeId == other.planeId) - && (!hasIndex() || index == other.index) && (!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) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(index); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); output.writeUInt32NoTag(leaderSlot); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(index); + } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 72); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 64); output.writeBoolNoTag(isVirtual); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < slots.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 26); output.writeMessageNoTag(slots.get(i)); } } @@ -462,10 +462,10 @@ public final class ReplaceLineupCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(extraLineupType); @@ -486,20 +486,11 @@ public final class ReplaceLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // planeId planeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // index - index = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 96) { break; } @@ -507,6 +498,15 @@ public final class ReplaceLineupCsReqOuterClass { case 96: { // leaderSlot leaderSlot = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 72) { @@ -521,20 +521,20 @@ public final class ReplaceLineupCsReqOuterClass { bitField0_ |= 0x00000008; } tag = input.readTag(); - if (tag != 80) { + if (tag != 64) { break; } } - case 80: { + case 64: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 42) { + if (tag != 26) { break; } } - case 42: { + case 26: { // slots tag = input.readRepeatedMessage(slots, tag); bitField0_ |= 0x00000020; @@ -563,10 +563,10 @@ public final class ReplaceLineupCsReqOuterClass { output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.leaderSlot, leaderSlot); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.leaderSlot, leaderSlot); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000008) != 0) { output.writeEnum(FieldNames.extraLineupType, extraLineupType, ExtraLineupTypeOuterClass.ExtraLineupType.converter()); @@ -599,10 +599,11 @@ public final class ReplaceLineupCsReqOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 1191442087: + case -1708713100: { + if (input.isAtField(FieldNames.leaderSlot)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + leaderSlot = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -610,11 +611,10 @@ public final class ReplaceLineupCsReqOuterClass { } break; } - case 1191442087: - case -1708713100: { - if (input.isAtField(FieldNames.leaderSlot)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - leaderSlot = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -717,10 +717,10 @@ public final class ReplaceLineupCsReqOuterClass { static class FieldNames { static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - 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 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 1c41223..8bc15c9 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 = 8; + * optional uint32 num = 13; */ private int num; @@ -34,7 +34,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 8; + * optional uint32 num = 13; * @return whether the num field is set */ public boolean hasNum() { @@ -42,7 +42,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 8; + * optional uint32 num = 13; * @return this */ public ReserveStaminaExchangeCsReq clearNum() { @@ -52,7 +52,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 8; + * optional uint32 num = 13; * @return the num */ public int getNum() { @@ -60,7 +60,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { } /** - * optional uint32 num = 8; + * optional uint32 num = 13; * @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) 64); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(num); } } @@ -150,7 +150,7 @@ public final class ReserveStaminaExchangeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 104: { // 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 81e49ae..83a7f24 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 = 11; + * optional uint32 retcode = 4; */ private int retcode; /** - * optional uint32 num = 12; + * optional uint32 num = 14; */ private int num; @@ -39,7 +39,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return this */ public ReserveStaminaExchangeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 14; * @return whether the num field is set */ public boolean hasNum() { @@ -84,7 +84,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 14; * @return this */ public ReserveStaminaExchangeScRsp clearNum() { @@ -94,7 +94,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 14; * @return the num */ public int getNum() { @@ -102,7 +102,7 @@ public final class ReserveStaminaExchangeScRspOuterClass { } /** - * optional uint32 num = 12; + * optional uint32 num = 14; * @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) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(num); } } @@ -205,16 +205,16 @@ public final class ReserveStaminaExchangeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 112) { break; } } - case 96: { + case 112: { // 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 bf62587..d23c7a9 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 = 2; + * optional uint32 emote = 7; */ private int emote; /** - * optional uint32 to_uid = 3; + * optional uint32 to_uid = 11; */ private int toUid; /** - * optional uint32 from_uid = 11; + * optional uint32 from_uid = 15; */ private int fromUid; /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 4; */ private int chatType; /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 8; */ private int msgType; /** - * optional string text = 9; + * optional string text = 6; */ private final Utf8String text = Utf8String.newEmptyInstance(); @@ -60,7 +60,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 2; + * optional uint32 emote = 7; * @return whether the emote field is set */ public boolean hasEmote() { @@ -68,7 +68,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 2; + * optional uint32 emote = 7; * @return this */ public RevcMsgScNotify clearEmote() { @@ -78,7 +78,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 2; + * optional uint32 emote = 7; * @return the emote */ public int getEmote() { @@ -86,7 +86,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 emote = 2; + * optional uint32 emote = 7; * @param value the emote to set * @return this */ @@ -97,7 +97,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 3; + * optional uint32 to_uid = 11; * @return whether the toUid field is set */ public boolean hasToUid() { @@ -105,7 +105,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 3; + * optional uint32 to_uid = 11; * @return this */ public RevcMsgScNotify clearToUid() { @@ -115,7 +115,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 3; + * optional uint32 to_uid = 11; * @return the toUid */ public int getToUid() { @@ -123,7 +123,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 to_uid = 3; + * optional uint32 to_uid = 11; * @param value the toUid to set * @return this */ @@ -134,7 +134,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 11; + * optional uint32 from_uid = 15; * @return whether the fromUid field is set */ public boolean hasFromUid() { @@ -142,7 +142,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 11; + * optional uint32 from_uid = 15; * @return this */ public RevcMsgScNotify clearFromUid() { @@ -152,7 +152,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 11; + * optional uint32 from_uid = 15; * @return the fromUid */ public int getFromUid() { @@ -160,7 +160,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional uint32 from_uid = 11; + * optional uint32 from_uid = 15; * @param value the fromUid to set * @return this */ @@ -171,7 +171,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 4; * @return whether the chatType field is set */ public boolean hasChatType() { @@ -179,7 +179,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 4; * @return this */ public RevcMsgScNotify clearChatType() { @@ -189,7 +189,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 4; * @return the chatType */ public ChatTypeOuterClass.ChatType getChatType() { @@ -222,7 +222,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .ChatType chat_type = 6; + * optional .ChatType chat_type = 4; * @param value the chatType to set * @return this */ @@ -233,7 +233,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 8; * @return whether the msgType field is set */ public boolean hasMsgType() { @@ -241,7 +241,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 8; * @return this */ public RevcMsgScNotify clearMsgType() { @@ -251,7 +251,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 8; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -284,7 +284,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional .MsgType msg_type = 15; + * optional .MsgType msg_type = 8; * @param value the msgType to set * @return this */ @@ -295,7 +295,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @return whether the text field is set */ public boolean hasText() { @@ -303,7 +303,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @return this */ public RevcMsgScNotify clearText() { @@ -313,7 +313,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @return the text */ public String getText() { @@ -321,7 +321,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @return internal {@code Utf8String} representation of text for reading */ public Utf8String getTextBytes() { @@ -329,7 +329,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @return internal {@code Utf8String} representation of text for modifications */ public Utf8String getMutableTextBytes() { @@ -338,7 +338,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @param value the text to set * @return this */ @@ -349,7 +349,7 @@ public final class RevcMsgScNotifyOuterClass { } /** - * optional string text = 9; + * optional string text = 6; * @param value the text to set * @return this */ @@ -449,27 +449,27 @@ public final class RevcMsgScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(toUid); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(fromUid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 32); output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 64); output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 50); output.writeStringNoTag(text); } } @@ -505,34 +505,34 @@ public final class RevcMsgScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // toUid - toUid = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 88) { break; } } case 88: { + // toUid + toUid = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { // fromUid fromUid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { + if (tag != 32) { break; } } - case 48: { + case 32: { // 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 != 120) { + if (tag != 64) { break; } } - case 120: { + case 64: { // 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 != 74) { + if (tag != 50) { break; } } - case 74: { + case 50: { // text input.readString(text); bitField0_ |= 0x00000020; diff --git a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java index 90e6ff3..c9f64dc 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueActionOuterClass.java @@ -19,37 +19,24 @@ public final class RogueActionOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
- * - * optional .RogueBonusSelectInfo bonus_select_info = 515; + * optional .RogueCommonBuffSelectInfo buff_select_info = 216; + */ + private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); + + /** + * optional .RogueBonusSelectInfo bonus_select_info = 388; */ private final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo bonusSelectInfo = RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo.newInstance(); /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; */ private final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo miracleSelectInfo = RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo.newInstance(); - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - */ - private final RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo buffSelectInfo = RogueCommonBuffSelectInfoOuterClass.RogueCommonBuffSelectInfo.newInstance(); - private RogueAction() { } @@ -66,78 +53,115 @@ public final class RogueActionOuterClass { public RogueAction clearAction() { if (hasAction()) { + clearBuffSelectInfo(); clearBonusSelectInfo(); clearMiracleSelectInfo(); - clearBuffSelectInfo(); } return this; } - private void clearActionOtherBonusSelectInfo() { + private void clearActionOtherBuffSelectInfo() { if ((((bitField0_ & 0x00000006)) != 0)) { + clearBonusSelectInfo(); clearMiracleSelectInfo(); + } + } + + private void clearActionOtherBonusSelectInfo() { + if ((((bitField0_ & 0x00000005)) != 0)) { clearBuffSelectInfo(); + clearMiracleSelectInfo(); } } private void clearActionOtherMiracleSelectInfo() { - if ((((bitField0_ & 0x00000005)) != 0)) { - clearBonusSelectInfo(); - clearBuffSelectInfo(); - } - } - - private void clearActionOtherBuffSelectInfo() { if ((((bitField0_ & 0x00000003)) != 0)) { + clearBuffSelectInfo(); clearBonusSelectInfo(); - clearMiracleSelectInfo(); } } /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
- * - * optional .RogueBonusSelectInfo bonus_select_info = 515; - * @return whether the bonusSelectInfo field is set + * optional .RogueCommonBuffSelectInfo buff_select_info = 216; + * @return whether the buffSelectInfo field is set */ - public boolean hasBonusSelectInfo() { + public boolean hasBuffSelectInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
+ * optional .RogueCommonBuffSelectInfo buff_select_info = 216; + * @return this + */ + public RogueAction clearBuffSelectInfo() { + bitField0_ &= ~0x00000001; + buffSelectInfo.clear(); + return this; + } + + /** + * optional .RogueCommonBuffSelectInfo buff_select_info = 216; * - * optional .RogueBonusSelectInfo bonus_select_info = 515; + * This 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; * @return this */ public RogueAction clearBonusSelectInfo() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; bonusSelectInfo.clear(); return this; } /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
- * - * optional .RogueBonusSelectInfo bonus_select_info = 515; + * optional .RogueBonusSelectInfo bonus_select_info = 388; * * This 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,15 +175,7 @@ public final class RogueActionOuterClass { } /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
- * - * optional .RogueBonusSelectInfo bonus_select_info = 515; + * optional .RogueBonusSelectInfo bonus_select_info = 388; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -169,63 +185,52 @@ public final class RogueActionOuterClass { */ public RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo getMutableBonusSelectInfo() { clearActionOtherBonusSelectInfo(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return bonusSelectInfo; } /** - * 
-     * CELLDKOCJIA DONMAOEJMEF = 618;
-     * RogueMiracleRepairAction IJGDIIAMLOO = 1746;
-     * RogueMiracleDestroyAction BAECAJOMOJM = 1403;
-     * RogueMiracleDropAction CDLPPJNNBIM = 196;
-     * RogueMiracleSelectDestroyedAction PKEFIKCMDOM = 1336;
-     *
- * - * optional .RogueBonusSelectInfo bonus_select_info = 515; + * optional .RogueBonusSelectInfo bonus_select_info = 388; * @param value the bonusSelectInfo to set * @return this */ public RogueAction setBonusSelectInfo( final RogueBonusSelectInfoOuterClass.RogueBonusSelectInfo value) { clearActionOtherBonusSelectInfo(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; bonusSelectInfo.copyFrom(value); return this; } /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; * @return whether the miracleSelectInfo field is set */ public boolean hasMiracleSelectInfo() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000004) != 0; } /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; * @return this */ public RogueAction clearMiracleSelectInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; miracleSelectInfo.clear(); return this; } /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; @@ -243,8 +248,7 @@ public final class RogueActionOuterClass { /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; @@ -257,14 +261,13 @@ public final class RogueActionOuterClass { */ public RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo getMutableMiracleSelectInfo() { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return miracleSelectInfo; } /** * 
-     * RogueBuffDropInfo BMIDONBKJNJ = 590;
-     * RogueBuffEnhanceSelectInfo BDLINKPALNL = 1837;
+     *  REMOVED???
      *
* * optional .RogueMiracleSelectInfo miracle_select_info = 527; @@ -274,100 +277,19 @@ public final class RogueActionOuterClass { public RogueAction setMiracleSelectInfo( final RogueMiracleSelectInfoOuterClass.RogueMiracleSelectInfo value) { clearActionOtherMiracleSelectInfo(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; miracleSelectInfo.copyFrom(value); return this; } - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - * @return whether the buffSelectInfo field is set - */ - public boolean hasBuffSelectInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - * @return this - */ - public RogueAction clearBuffSelectInfo() { - bitField0_ &= ~0x00000004; - buffSelectInfo.clear(); - return this; - } - - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - * - * This 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; - } - - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - * - * 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; - } - - /** - * 
-     *  done
-     *
- * - * optional .RogueCommonBuffSelectInfo buff_select_info = 1454; - * @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; } @@ -378,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; } @@ -397,9 +319,9 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; + buffSelectInfo.clear(); bonusSelectInfo.clear(); miracleSelectInfo.clear(); - buffSelectInfo.clear(); return this; } @@ -410,9 +332,9 @@ public final class RogueActionOuterClass { } cachedSize = -1; bitField0_ = 0; + buffSelectInfo.clearQuick(); bonusSelectInfo.clearQuick(); miracleSelectInfo.clearQuick(); - buffSelectInfo.clearQuick(); return this; } @@ -426,24 +348,24 @@ 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)) - && (!hasBuffSelectInfo() || buffSelectInfo.equals(other.buffSelectInfo)); + && (!hasMiracleSelectInfo() || miracleSelectInfo.equals(other.miracleSelectInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 8346); - output.writeMessageNoTag(bonusSelectInfo); + output.writeRawLittleEndian16((short) 3522); + output.writeMessageNoTag(buffSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 8442); - output.writeMessageNoTag(miracleSelectInfo); + output.writeRawLittleEndian16((short) 6306); + output.writeMessageNoTag(bonusSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawLittleEndian16((short) 23282); - output.writeMessageNoTag(buffSelectInfo); + output.writeRawLittleEndian16((short) 8442); + output.writeMessageNoTag(miracleSelectInfo); } } @@ -451,13 +373,13 @@ public final class RogueActionOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(bonusSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(buffSelectInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(miracleSelectInfo); } return size; } @@ -469,11 +391,21 @@ public final class RogueActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 4122: { + case 1730: { + // buffSelectInfo + clearActionOtherBuffSelectInfo(); + input.readMessage(buffSelectInfo); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 3106) { + break; + } + } + case 3106: { // bonusSelectInfo clearActionOtherBonusSelectInfo(); input.readMessage(bonusSelectInfo); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 4218) { break; @@ -483,16 +415,6 @@ public final class RogueActionOuterClass { // miracleSelectInfo clearActionOtherMiracleSelectInfo(); input.readMessage(miracleSelectInfo); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 11634) { - break; - } - } - case 11634: { - // buffSelectInfo - clearActionOtherBuffSelectInfo(); - input.readMessage(buffSelectInfo); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -517,13 +439,13 @@ public final class RogueActionOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.bonusSelectInfo, bonusSelectInfo); + output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); + output.writeMessage(FieldNames.bonusSelectInfo, bonusSelectInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.buffSelectInfo, buffSelectInfo); + output.writeMessage(FieldNames.miracleSelectInfo, miracleSelectInfo); } output.endObject(); } @@ -535,13 +457,26 @@ 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_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -554,19 +489,6 @@ 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 { @@ -626,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/RogueAeonInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAeonInfoOuterClass.java index b1b5ad3..bc999f4 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_num = 7; - */ - private int unlockAeonNum; - - /** - * optional uint32 unlock_aeon_enhance_num = 11; + * optional uint32 unlock_aeon_enhance_num = 10; */ private int unlockAeonEnhanceNum; /** - * optional bool is_unlocked = 15; + * optional uint32 unlock_aeon_num = 15; + */ + private int unlockAeonNum; + + /** + * optional bool is_unlocked = 6; */ private boolean isUnlocked; /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_id_list = 3; */ private final RepeatedInt aeonIdList = RepeatedInt.newEmptyInstance(); @@ -50,62 +50,25 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_num = 7; - * @return whether the unlockAeonNum field is set + * optional uint32 unlock_aeon_enhance_num = 10; + * @return whether the unlockAeonEnhanceNum field is set */ - public boolean hasUnlockAeonNum() { + public boolean hasUnlockAeonEnhanceNum() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 unlock_aeon_num = 7; - * @return this - */ - public RogueAeonInfo clearUnlockAeonNum() { - bitField0_ &= ~0x00000001; - unlockAeonNum = 0; - return this; - } - - /** - * optional uint32 unlock_aeon_num = 7; - * @return the unlockAeonNum - */ - public int getUnlockAeonNum() { - return unlockAeonNum; - } - - /** - * optional uint32 unlock_aeon_num = 7; - * @param value the unlockAeonNum to set - * @return this - */ - public RogueAeonInfo setUnlockAeonNum(final int value) { - bitField0_ |= 0x00000001; - unlockAeonNum = value; - return this; - } - - /** - * optional uint32 unlock_aeon_enhance_num = 11; - * @return whether the unlockAeonEnhanceNum field is set - */ - public boolean hasUnlockAeonEnhanceNum() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unlock_aeon_enhance_num = 11; + * optional uint32 unlock_aeon_enhance_num = 10; * @return this */ public RogueAeonInfo clearUnlockAeonEnhanceNum() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unlockAeonEnhanceNum = 0; return this; } /** - * optional uint32 unlock_aeon_enhance_num = 11; + * optional uint32 unlock_aeon_enhance_num = 10; * @return the unlockAeonEnhanceNum */ public int getUnlockAeonEnhanceNum() { @@ -113,18 +76,55 @@ public final class RogueAeonInfoOuterClass { } /** - * optional uint32 unlock_aeon_enhance_num = 11; + * optional uint32 unlock_aeon_enhance_num = 10; * @param value the unlockAeonEnhanceNum to set * @return this */ public RogueAeonInfo setUnlockAeonEnhanceNum(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; unlockAeonEnhanceNum = value; return this; } /** - * optional bool is_unlocked = 15; + * optional uint32 unlock_aeon_num = 15; + * @return whether the unlockAeonNum field is set + */ + public boolean hasUnlockAeonNum() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 unlock_aeon_num = 15; + * @return this + */ + public RogueAeonInfo clearUnlockAeonNum() { + bitField0_ &= ~0x00000002; + unlockAeonNum = 0; + return this; + } + + /** + * optional uint32 unlock_aeon_num = 15; + * @return the unlockAeonNum + */ + public int getUnlockAeonNum() { + return unlockAeonNum; + } + + /** + * optional uint32 unlock_aeon_num = 15; + * @param value the unlockAeonNum to set + * @return this + */ + public RogueAeonInfo setUnlockAeonNum(final int value) { + bitField0_ |= 0x00000002; + unlockAeonNum = value; + return this; + } + + /** + * optional bool is_unlocked = 6; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -132,7 +132,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 15; + * optional bool is_unlocked = 6; * @return this */ public RogueAeonInfo clearIsUnlocked() { @@ -142,7 +142,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 15; + * optional bool is_unlocked = 6; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -150,7 +150,7 @@ public final class RogueAeonInfoOuterClass { } /** - * optional bool is_unlocked = 15; + * optional bool is_unlocked = 6; * @param value the isUnlocked to set * @return this */ @@ -161,7 +161,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_id_list = 3; * @return whether the aeonIdList field is set */ public boolean hasAeonIdList() { @@ -169,7 +169,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_id_list = 3; * @return this */ public RogueAeonInfo clearAeonIdList() { @@ -179,7 +179,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_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. @@ -193,7 +193,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_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 @@ -207,7 +207,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_id_list = 3; * @param value the aeonIdList to add * @return this */ @@ -218,7 +218,7 @@ public final class RogueAeonInfoOuterClass { } /** - * repeated uint32 aeon_id_list = 2; + * repeated uint32 aeon_id_list = 3; * @param values the aeonIdList to add * @return this */ @@ -233,8 +233,8 @@ public final class RogueAeonInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - unlockAeonNum = other.unlockAeonNum; unlockAeonEnhanceNum = other.unlockAeonEnhanceNum; + unlockAeonNum = other.unlockAeonNum; isUnlocked = other.isUnlocked; aeonIdList.copyFrom(other.aeonIdList); } @@ -247,12 +247,12 @@ public final class RogueAeonInfoOuterClass { return this; } cachedSize = -1; - if (other.hasUnlockAeonNum()) { - setUnlockAeonNum(other.unlockAeonNum); - } if (other.hasUnlockAeonEnhanceNum()) { setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum); } + if (other.hasUnlockAeonNum()) { + setUnlockAeonNum(other.unlockAeonNum); + } if (other.hasIsUnlocked()) { setIsUnlocked(other.isUnlocked); } @@ -269,8 +269,8 @@ public final class RogueAeonInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - unlockAeonNum = 0; unlockAeonEnhanceNum = 0; + unlockAeonNum = 0; isUnlocked = false; aeonIdList.clear(); return this; @@ -297,8 +297,8 @@ public final class RogueAeonInfoOuterClass { } RogueAeonInfo other = (RogueAeonInfo) o; return bitField0_ == other.bitField0_ - && (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum) && (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum) + && (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum) && (!hasIsUnlocked() || isUnlocked == other.isUnlocked) && (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList)); } @@ -306,20 +306,20 @@ public final class RogueAeonInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(unlockAeonNum); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(unlockAeonEnhanceNum); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); + output.writeUInt32NoTag(unlockAeonNum); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 48); output.writeBoolNoTag(isUnlocked); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < aeonIdList.length(); i++) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(aeonIdList.array()[i]); } } @@ -329,10 +329,10 @@ public final class RogueAeonInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -350,34 +350,34 @@ public final class RogueAeonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // unlockAeonNum - unlockAeonNum = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 80: { // unlockAeonEnhanceNum unlockAeonEnhanceNum = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { break; } } case 120: { + // unlockAeonNum + unlockAeonNum = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { + case 26: { // aeonIdList [packed=true] input.readPackedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -396,7 +396,7 @@ public final class RogueAeonInfoOuterClass { tag = input.readTag(); break; } - case 16: { + case 24: { // aeonIdList [packed=false] tag = input.readRepeatedUInt32(aeonIdList, tag); bitField0_ |= 0x00000008; @@ -410,10 +410,10 @@ public final class RogueAeonInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum); + output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum); + output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isUnlocked, isUnlocked); @@ -431,11 +431,11 @@ public final class RogueAeonInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -281209953: - case -952729371: { - if (input.isAtField(FieldNames.unlockAeonNum)) { + case 1040991167: + case 7773396: { + if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { if (!input.trySkipNullValue()) { - unlockAeonNum = input.readUInt32(); + unlockAeonEnhanceNum = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -443,11 +443,11 @@ public final class RogueAeonInfoOuterClass { } break; } - case 1040991167: - case 7773396: { - if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) { + case -281209953: + case -952729371: { + if (input.isAtField(FieldNames.unlockAeonNum)) { if (!input.trySkipNullValue()) { - unlockAeonEnhanceNum = input.readUInt32(); + unlockAeonNum = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -531,10 +531,10 @@ public final class RogueAeonInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num"); - static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num"); + static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num"); + static final FieldName isUnlocked = FieldName.forField("isUnlocked", "is_unlocked"); static final FieldName aeonIdList = FieldName.forField("aeonIdList", "aeon_id_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueAreaInfoOuterClass.java index 0f50f93..e4b0e13 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 = 15; + * repeated .RogueArea rogue_area = 2; */ private final RepeatedMessage rogueArea = RepeatedMessage.newEmptyInstance(RogueAreaOuterClass.RogueArea.getFactory()); @@ -35,7 +35,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 2; * @return whether the rogueArea field is set */ public boolean hasRogueArea() { @@ -43,7 +43,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 2; * @return this */ public RogueAreaInfo clearRogueArea() { @@ -53,7 +53,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 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 RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 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 RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 2; * @param value the rogueArea to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueAreaInfoOuterClass { } /** - * repeated .RogueArea rogue_area = 15; + * repeated .RogueArea rogue_area = 2; * @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) 122); + output.writeRawByte((byte) 18); output.writeMessageNoTag(rogueArea.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueAreaInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 18: { // 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 8348672..e2ed65b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueAreaOuterClass.java @@ -19,32 +19,32 @@ public final class RogueAreaOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 rogue_area_status = 2; + * optional uint32 rogue_area_status = 1; */ private int rogueAreaStatus; /** - * optional uint32 map_id = 3; + * optional uint32 map_id = 5; */ private int mapId; /** - * optional uint32 rogue_status = 5; - */ - private int rogueStatus; - - /** - * optional uint32 area_id = 8; - */ - private int areaId; - - /** - * optional uint32 cur_reach_room_num = 14; + * optional uint32 cur_reach_room_num = 6; */ private int curReachRoomNum; /** - * optional bool has_taken_rewards = 9; + * optional uint32 rogue_status = 8; + */ + private int rogueStatus; + + /** + * optional uint32 area_id = 9; + */ + private int areaId; + + /** + * optional bool has_taken_rewards = 14; */ private boolean hasTakenRewards; @@ -59,7 +59,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 2; + * optional uint32 rogue_area_status = 1; * @return whether the rogueAreaStatus field is set */ public boolean hasRogueAreaStatus() { @@ -67,7 +67,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 2; + * optional uint32 rogue_area_status = 1; * @return this */ public RogueArea clearRogueAreaStatus() { @@ -77,7 +77,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 2; + * optional uint32 rogue_area_status = 1; * @return the rogueAreaStatus */ public int getRogueAreaStatus() { @@ -85,7 +85,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_area_status = 2; + * optional uint32 rogue_area_status = 1; * @param value the rogueAreaStatus to set * @return this */ @@ -96,7 +96,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 map_id = 3; + * optional uint32 map_id = 5; * @return whether the mapId field is set */ public boolean hasMapId() { @@ -104,7 +104,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 map_id = 3; + * optional uint32 map_id = 5; * @return this */ public RogueArea clearMapId() { @@ -114,7 +114,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 map_id = 3; + * optional uint32 map_id = 5; * @return the mapId */ public int getMapId() { @@ -122,7 +122,7 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 map_id = 3; + * optional uint32 map_id = 5; * @param value the mapId to set * @return this */ @@ -133,99 +133,25 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 rogue_status = 5; - * @return whether the rogueStatus field is set + * optional uint32 cur_reach_room_num = 6; + * @return whether the curReachRoomNum field is set */ - public boolean hasRogueStatus() { + public boolean hasCurReachRoomNum() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 rogue_status = 5; - * @return this - */ - public RogueArea clearRogueStatus() { - bitField0_ &= ~0x00000004; - rogueStatus = 0; - return this; - } - - /** - * optional uint32 rogue_status = 5; - * @return the rogueStatus - */ - public int getRogueStatus() { - return rogueStatus; - } - - /** - * optional uint32 rogue_status = 5; - * @param value the rogueStatus to set - * @return this - */ - public RogueArea setRogueStatus(final int value) { - bitField0_ |= 0x00000004; - rogueStatus = value; - return this; - } - - /** - * optional uint32 area_id = 8; - * @return whether the areaId field is set - */ - public boolean hasAreaId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 area_id = 8; - * @return this - */ - public RogueArea clearAreaId() { - bitField0_ &= ~0x00000008; - areaId = 0; - return this; - } - - /** - * optional uint32 area_id = 8; - * @return the areaId - */ - public int getAreaId() { - return areaId; - } - - /** - * optional uint32 area_id = 8; - * @param value the areaId to set - * @return this - */ - public RogueArea setAreaId(final int value) { - bitField0_ |= 0x00000008; - areaId = value; - return this; - } - - /** - * optional uint32 cur_reach_room_num = 14; - * @return whether the curReachRoomNum field is set - */ - public boolean hasCurReachRoomNum() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 cur_reach_room_num = 14; + * optional uint32 cur_reach_room_num = 6; * @return this */ public RogueArea clearCurReachRoomNum() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; curReachRoomNum = 0; return this; } /** - * optional uint32 cur_reach_room_num = 14; + * optional uint32 cur_reach_room_num = 6; * @return the curReachRoomNum */ public int getCurReachRoomNum() { @@ -233,18 +159,92 @@ public final class RogueAreaOuterClass { } /** - * optional uint32 cur_reach_room_num = 14; + * optional uint32 cur_reach_room_num = 6; * @param value the curReachRoomNum to set * @return this */ public RogueArea setCurReachRoomNum(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; curReachRoomNum = value; return this; } /** - * optional bool has_taken_rewards = 9; + * optional uint32 rogue_status = 8; + * @return whether the rogueStatus field is set + */ + public boolean hasRogueStatus() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 rogue_status = 8; + * @return this + */ + public RogueArea clearRogueStatus() { + bitField0_ &= ~0x00000008; + rogueStatus = 0; + return this; + } + + /** + * optional uint32 rogue_status = 8; + * @return the rogueStatus + */ + public int getRogueStatus() { + return rogueStatus; + } + + /** + * optional uint32 rogue_status = 8; + * @param value the rogueStatus to set + * @return this + */ + public RogueArea setRogueStatus(final int value) { + bitField0_ |= 0x00000008; + rogueStatus = value; + return this; + } + + /** + * optional uint32 area_id = 9; + * @return whether the areaId field is set + */ + public boolean hasAreaId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 area_id = 9; + * @return this + */ + public RogueArea clearAreaId() { + bitField0_ &= ~0x00000010; + areaId = 0; + return this; + } + + /** + * optional uint32 area_id = 9; + * @return the areaId + */ + public int getAreaId() { + return areaId; + } + + /** + * optional uint32 area_id = 9; + * @param value the areaId to set + * @return this + */ + public RogueArea setAreaId(final int value) { + bitField0_ |= 0x00000010; + areaId = value; + return this; + } + + /** + * optional bool has_taken_rewards = 14; * @return whether the hasTakenRewards field is set */ public boolean hasHasTakenRewards() { @@ -252,7 +252,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 9; + * optional bool has_taken_rewards = 14; * @return this */ public RogueArea clearHasTakenRewards() { @@ -262,7 +262,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 9; + * optional bool has_taken_rewards = 14; * @return the hasTakenRewards */ public boolean getHasTakenRewards() { @@ -270,7 +270,7 @@ public final class RogueAreaOuterClass { } /** - * optional bool has_taken_rewards = 9; + * optional bool has_taken_rewards = 14; * @param value the hasTakenRewards to set * @return this */ @@ -287,9 +287,9 @@ public final class RogueAreaOuterClass { bitField0_ = other.bitField0_; rogueAreaStatus = other.rogueAreaStatus; mapId = other.mapId; + curReachRoomNum = other.curReachRoomNum; rogueStatus = other.rogueStatus; areaId = other.areaId; - curReachRoomNum = other.curReachRoomNum; hasTakenRewards = other.hasTakenRewards; } return this; @@ -307,15 +307,15 @@ public final class RogueAreaOuterClass { 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.hasHasTakenRewards()) { setHasTakenRewards(other.hasTakenRewards); } @@ -331,9 +331,9 @@ public final class RogueAreaOuterClass { bitField0_ = 0; rogueAreaStatus = 0; mapId = 0; + curReachRoomNum = 0; rogueStatus = 0; areaId = 0; - curReachRoomNum = 0; hasTakenRewards = false; return this; } @@ -360,36 +360,36 @@ public final class RogueAreaOuterClass { 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) && (!hasHasTakenRewards() || hasTakenRewards == other.hasTakenRewards); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(rogueAreaStatus); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(rogueStatus); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(curReachRoomNum); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(areaId); + output.writeUInt32NoTag(rogueStatus); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(curReachRoomNum); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeBoolNoTag(hasTakenRewards); } } @@ -404,13 +404,13 @@ public final class RogueAreaOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(mapId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueStatus); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curReachRoomNum); + size += 1 + ProtoSink.computeUInt32SizeNoTag(areaId); } if ((bitField0_ & 0x00000020) != 0) { size += 2; @@ -425,27 +425,27 @@ public final class RogueAreaOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 8: { // rogueAreaStatus rogueAreaStatus = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // mapId - mapId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 40) { break; } } case 40: { - // rogueStatus - rogueStatus = input.readUInt32(); + // 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) { @@ -453,24 +453,24 @@ public final class RogueAreaOuterClass { } } case 64: { - // areaId - areaId = input.readUInt32(); + // rogueStatus + rogueStatus = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // curReachRoomNum - curReachRoomNum = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 72) { break; } } case 72: { + // areaId + areaId = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { // hasTakenRewards hasTakenRewards = input.readBool(); bitField0_ |= 0x00000020; @@ -503,13 +503,13 @@ public final class RogueAreaOuterClass { output.writeUInt32(FieldNames.mapId, mapId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.rogueStatus, rogueStatus); + output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.areaId, areaId); + output.writeUInt32(FieldNames.rogueStatus, rogueStatus); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.curReachRoomNum, curReachRoomNum); + output.writeUInt32(FieldNames.areaId, areaId); } if ((bitField0_ & 0x00000020) != 0) { output.writeBool(FieldNames.hasTakenRewards, hasTakenRewards); @@ -548,12 +548,24 @@ public final class RogueAreaOuterClass { } break; } + case 888045080: + case 328196941: { + if (input.isAtField(FieldNames.curReachRoomNum)) { + if (!input.trySkipNullValue()) { + curReachRoomNum = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case -836112788: case 1898767863: { if (input.isAtField(FieldNames.rogueStatus)) { if (!input.trySkipNullValue()) { rogueStatus = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -565,18 +577,6 @@ public final class RogueAreaOuterClass { if (input.isAtField(FieldNames.areaId)) { if (!input.trySkipNullValue()) { areaId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 888045080: - case 328196941: { - if (input.isAtField(FieldNames.curReachRoomNum)) { - if (!input.trySkipNullValue()) { - curReachRoomNum = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -652,12 +652,12 @@ public final class RogueAreaOuterClass { 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 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 643585a..49924cf 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 = 7; + * repeated uint32 base_avatar_id_list = 14; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -43,7 +43,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * @return this */ public RogueAvatarInfo clearBaseAvatarIdList() { @@ -53,7 +53,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -67,7 +67,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -81,7 +81,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * @param value the baseAvatarIdList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueAvatarInfoOuterClass { } /** - * repeated uint32 base_avatar_id_list = 7; + * repeated uint32 base_avatar_id_list = 14; * @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) 56); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueAvatarInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 114: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueAvatarInfoOuterClass { tag = input.readTag(); break; } - case 56: { + case 112: { // 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 8f94628..179f5be 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 = 14; + * repeated uint32 bonus_info = 13; */ private final RepeatedInt bonusInfo = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_info = 13; * @return whether the bonusInfo field is set */ public boolean hasBonusInfo() { @@ -43,7 +43,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_info = 13; * @return this */ public RogueBonusSelectInfo clearBonusInfo() { @@ -53,7 +53,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_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. @@ -67,7 +67,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_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 @@ -81,7 +81,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_info = 13; * @param value the bonusInfo to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBonusSelectInfoOuterClass { } /** - * repeated uint32 bonus_info = 14; + * repeated uint32 bonus_info = 13; * @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) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(bonusInfo.array()[i]); } } @@ -185,7 +185,7 @@ public final class RogueBonusSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 106: { // bonusInfo [packed=true] input.readPackedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class RogueBonusSelectInfoOuterClass { tag = input.readTag(); break; } - case 112: { + case 104: { // bonusInfo [packed=false] tag = input.readRepeatedUInt32(bonusInfo, tag); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueBuffEnhanceInfoOuterClass.java index 2cce8b6..657515a 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 = 10; + * optional float unk_float = 4; */ private float unkFloat; /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 14; */ private int buffId; /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -45,7 +45,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 10; + * optional float unk_float = 4; * @return whether the unkFloat field is set */ public boolean hasUnkFloat() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 10; + * optional float unk_float = 4; * @return this */ public RogueBuffEnhanceInfo clearUnkFloat() { @@ -63,7 +63,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 10; + * optional float unk_float = 4; * @return the unkFloat */ public float getUnkFloat() { @@ -71,7 +71,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional float unk_float = 10; + * optional float unk_float = 4; * @param value the unkFloat to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 14; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -90,7 +90,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 14; * @return this */ public RogueBuffEnhanceInfo clearBuffId() { @@ -100,7 +100,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 14; * @return the buffId */ public int getBuffId() { @@ -108,7 +108,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional uint32 buff_id = 7; + * optional uint32 buff_id = 14; * @param value the buffId to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -127,7 +127,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @return this */ public RogueBuffEnhanceInfo clearItemCostList() { @@ -137,7 +137,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 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. @@ -151,7 +151,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * 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 @@ -165,7 +165,7 @@ public final class RogueBuffEnhanceInfoOuterClass { } /** - * optional .ItemCostList item_cost_list = 3; + * optional .ItemCostList item_cost_list = 1; * @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) 85); + output.writeRawByte((byte) 37); output.writeFloatNoTag(unkFloat); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(itemCostList); } } @@ -282,25 +282,25 @@ public final class RogueBuffEnhanceInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 85: { + case 37: { // unkFloat unkFloat = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 112) { break; } } - case 56: { + case 112: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // 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 1bec44c..20a0821 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 = 10; + * repeated .RogueBuffEnhanceInfo buff_info = 6; */ private final RepeatedMessage buffInfo = RepeatedMessage.newEmptyInstance(RogueBuffEnhanceInfoOuterClass.RogueBuffEnhanceInfo.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo buff_info = 6; * @return whether the buffInfo field is set */ public boolean hasBuffInfo() { @@ -43,7 +43,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo buff_info = 6; * @return this */ public RogueBuffEnhanceShopInfo clearBuffInfo() { @@ -53,7 +53,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo 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. @@ -67,7 +67,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo 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 @@ -82,7 +82,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo buff_info = 6; * @param value the buffInfo to add * @return this */ @@ -94,7 +94,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { } /** - * repeated .RogueBuffEnhanceInfo buff_info = 10; + * repeated .RogueBuffEnhanceInfo buff_info = 6; * @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) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(buffInfo.get(i)); } } @@ -188,7 +188,7 @@ public final class RogueBuffEnhanceShopInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 50: { // 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 7293fac..a8bcf30 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 = 8; + * repeated .RogueBuff maze_buff_list = 1; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueBuffOuterClass.RogueBuff.getFactory()); @@ -35,7 +35,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_list = 1; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -43,7 +43,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_list = 1; * @return this */ public RogueBuffInfo clearMazeBuffList() { @@ -53,7 +53,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_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. @@ -67,7 +67,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_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 @@ -81,7 +81,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_list = 1; * @param value the mazeBuffList to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueBuffInfoOuterClass { } /** - * repeated .RogueBuff maze_buff_list = 8; + * repeated .RogueBuff maze_buff_list = 1; * @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) 66); + output.writeRawByte((byte) 10); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 10: { // 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 5c9f004..e26fc4a 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueBuffOuterClass.java @@ -19,12 +19,12 @@ public final class RogueBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 2; + * optional uint32 buff_id = 7; */ private int buffId; /** - * optional uint32 level = 11; + * optional uint32 level = 8; */ private int level; @@ -39,7 +39,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 buff_id = 2; + * optional uint32 buff_id = 7; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -47,7 +47,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 buff_id = 2; + * optional uint32 buff_id = 7; * @return this */ public RogueBuff clearBuffId() { @@ -57,7 +57,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 buff_id = 2; + * optional uint32 buff_id = 7; * @return the buffId */ public int getBuffId() { @@ -65,7 +65,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 buff_id = 2; + * optional uint32 buff_id = 7; * @param value the buffId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { @@ -84,7 +84,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @return this */ public RogueBuff clearLevel() { @@ -94,7 +94,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -102,7 +102,7 @@ public final class RogueBuffOuterClass { } /** - * optional uint32 level = 11; + * optional uint32 level = 8; * @param value the level to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(level); } } @@ -205,16 +205,16 @@ public final class RogueBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 56: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 64) { break; } } - case 88: { + case 64: { // 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 fbaf6e5..8dae3d6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffOuterClass.java @@ -18,16 +18,16 @@ public final class RogueCommonBuffOuterClass { public static final class RogueCommonBuff extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 buff_id = 3; + */ + private int buffId; + /** * optional uint32 buff_level = 5; */ private int buffLevel; - /** - * optional uint32 buff_id = 15; - */ - private int buffId; - private RogueCommonBuff() { } @@ -38,12 +38,49 @@ public final class RogueCommonBuffOuterClass { return new RogueCommonBuff(); } + /** + * optional uint32 buff_id = 3; + * @return whether the buffId field is set + */ + public boolean hasBuffId() { + 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_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -51,7 +88,7 @@ public final class RogueCommonBuffOuterClass { * @return this */ public RogueCommonBuff clearBuffLevel() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; buffLevel = 0; return this; } @@ -70,45 +107,8 @@ public final class RogueCommonBuffOuterClass { * @return this */ public RogueCommonBuff setBuffLevel(final int value) { - bitField0_ |= 0x00000001; - buffLevel = 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; - * @return this - */ - public RogueCommonBuff clearBuffId() { - bitField0_ &= ~0x00000002; - buffId = 0; - return this; - } - - /** - * optional uint32 buff_id = 15; - * @return the buffId - */ - public int getBuffId() { - return buffId; - } - - /** - * optional uint32 buff_id = 15; - * @param value the buffId to set - * @return this - */ - public RogueCommonBuff setBuffId(final int value) { bitField0_ |= 0x00000002; - buffId = value; + buffLevel = value; return this; } @@ -117,8 +117,8 @@ public final class RogueCommonBuffOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - buffLevel = other.buffLevel; buffId = other.buffId; + buffLevel = other.buffLevel; } return this; } @@ -129,12 +129,12 @@ public final class RogueCommonBuffOuterClass { return this; } cachedSize = -1; - if (other.hasBuffLevel()) { - setBuffLevel(other.buffLevel); - } if (other.hasBuffId()) { setBuffId(other.buffId); } + if (other.hasBuffLevel()) { + setBuffLevel(other.buffLevel); + } return this; } @@ -145,8 +145,8 @@ public final class RogueCommonBuffOuterClass { } cachedSize = -1; bitField0_ = 0; - buffLevel = 0; buffId = 0; + buffLevel = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueCommonBuffOuterClass { } RogueCommonBuff other = (RogueCommonBuff) o; return bitField0_ == other.bitField0_ - && (!hasBuffLevel() || buffLevel == other.buffLevel) - && (!hasBuffId() || buffId == other.buffId); + && (!hasBuffId() || buffId == other.buffId) + && (!hasBuffLevel() || buffLevel == other.buffLevel); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(buffLevel); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(buffId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(buffLevel); } } @@ -190,10 +190,10 @@ public final class RogueCommonBuffOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffLevel); } return size; } @@ -205,18 +205,18 @@ public final class RogueCommonBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // buffLevel - buffLevel = input.readUInt32(); + case 24: { + // buffId + buffId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 40) { break; } } - case 120: { - // buffId - buffId = input.readUInt32(); + case 40: { + // buffLevel + buffLevel = 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.buffLevel, buffLevel); + output.writeUInt32(FieldNames.buffId, buffId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.buffId, buffId); + output.writeUInt32(FieldNames.buffLevel, buffLevel); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueCommonBuffOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueCommonBuffOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueCommonBuffOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName buffLevel = FieldName.forField("buffLevel", "buff_level"); - static final FieldName buffId = FieldName.forField("buffId", "buff_id"); + + static final FieldName buffLevel = FieldName.forField("buffLevel", "buff_level"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java index fae0a20..0c6d509 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCommonBuffSelectInfoOuterClass.java @@ -21,19 +21,19 @@ public final class RogueCommonBuffSelectInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 roll_buff_max_times = 2; - */ - private int rollBuffMaxTimes; - - /** - * optional uint32 roll_buff_free_count = 3; + * optional uint32 roll_buff_free_count = 1; */ private int rollBuffFreeCount; /** - * optional uint32 source_total_count = 5; + * optional uint32 roll_buff_times = 3; */ - private int sourceTotalCount; + private int rollBuffTimes; + + /** + * optional uint32 roll_buff_max_times = 6; + */ + private int rollBuffMaxTimes; /** * optional uint32 source_cur_count = 7; @@ -41,42 +41,42 @@ public final class RogueCommonBuffSelectInfoOuterClass { private int sourceCurCount; /** - * optional uint32 select_buff_source_hint = 10; + * optional uint32 source_total_count = 12; + */ + private int sourceTotalCount; + + /** + * optional uint32 select_buff_source_hint = 15; */ private int selectBuffSourceHint; /** - * optional uint32 roll_buff_times = 11; - */ - private int rollBuffTimes; - - /** - * optional .RogueCommonBuffSelectSource source_type = 13; + * optional .RogueCommonBuffSelectSource source_type = 2; */ private int sourceType; /** - * optional bool can_roll = 6; + * optional bool can_roll = 14; */ private boolean canRoll; /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 4; */ private final ItemCostListOuterClass.ItemCostList rollBuffsCost = ItemCostListOuterClass.ItemCostList.newInstance(); /** - * repeated uint32 first_buff_type_list = 4; - */ - private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance(); - - /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * repeated uint32 handbook_unlock_buff_id_list = 10; */ private final RepeatedInt handbookUnlockBuffIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated uint32 first_buff_type_list = 13; + */ + private final RepeatedInt firstBuffTypeList = RepeatedInt.newEmptyInstance(); + + /** + * repeated .RogueCommonBuff maze_buff_list = 5; */ private final RepeatedMessage mazeBuffList = RepeatedMessage.newEmptyInstance(RogueCommonBuffOuterClass.RogueCommonBuff.getFactory()); @@ -91,62 +91,25 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_max_times = 2; - * @return whether the rollBuffMaxTimes field is set + * optional uint32 roll_buff_free_count = 1; + * @return whether the rollBuffFreeCount field is set */ - public boolean hasRollBuffMaxTimes() { + public boolean hasRollBuffFreeCount() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 roll_buff_max_times = 2; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { - bitField0_ &= ~0x00000001; - rollBuffMaxTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_max_times = 2; - * @return the rollBuffMaxTimes - */ - public int getRollBuffMaxTimes() { - return rollBuffMaxTimes; - } - - /** - * optional uint32 roll_buff_max_times = 2; - * @param value the rollBuffMaxTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) { - bitField0_ |= 0x00000001; - rollBuffMaxTimes = value; - return this; - } - - /** - * optional uint32 roll_buff_free_count = 3; - * @return whether the rollBuffFreeCount field is set - */ - public boolean hasRollBuffFreeCount() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 roll_buff_free_count = 3; + * optional uint32 roll_buff_free_count = 1; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffFreeCount() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rollBuffFreeCount = 0; return this; } /** - * optional uint32 roll_buff_free_count = 3; + * optional uint32 roll_buff_free_count = 1; * @return the rollBuffFreeCount */ public int getRollBuffFreeCount() { @@ -154,50 +117,87 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 roll_buff_free_count = 3; + * optional uint32 roll_buff_free_count = 1; * @param value the rollBuffFreeCount to set * @return this */ public RogueCommonBuffSelectInfo setRollBuffFreeCount(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; rollBuffFreeCount = value; return this; } /** - * optional uint32 source_total_count = 5; - * @return whether the sourceTotalCount field is set + * optional uint32 roll_buff_times = 3; + * @return whether the rollBuffTimes field is set */ - public boolean hasSourceTotalCount() { - return (bitField0_ & 0x00000004) != 0; + public boolean hasRollBuffTimes() { + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 source_total_count = 5; + * optional uint32 roll_buff_times = 3; * @return this */ - public RogueCommonBuffSelectInfo clearSourceTotalCount() { - bitField0_ &= ~0x00000004; - sourceTotalCount = 0; + public RogueCommonBuffSelectInfo clearRollBuffTimes() { + bitField0_ &= ~0x00000002; + rollBuffTimes = 0; return this; } /** - * optional uint32 source_total_count = 5; - * @return the sourceTotalCount + * optional uint32 roll_buff_times = 3; + * @return the rollBuffTimes */ - public int getSourceTotalCount() { - return sourceTotalCount; + public int getRollBuffTimes() { + return rollBuffTimes; } /** - * optional uint32 source_total_count = 5; - * @param value the sourceTotalCount to set + * optional uint32 roll_buff_times = 3; + * @param value the rollBuffTimes to set * @return this */ - public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) { + 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; + * @return this + */ + public RogueCommonBuffSelectInfo clearRollBuffMaxTimes() { + bitField0_ &= ~0x00000004; + rollBuffMaxTimes = 0; + return this; + } + + /** + * optional uint32 roll_buff_max_times = 6; + * @return the rollBuffMaxTimes + */ + public int getRollBuffMaxTimes() { + return rollBuffMaxTimes; + } + + /** + * optional uint32 roll_buff_max_times = 6; + * @param value the rollBuffMaxTimes to set + * @return this + */ + public RogueCommonBuffSelectInfo setRollBuffMaxTimes(final int value) { bitField0_ |= 0x00000004; - sourceTotalCount = value; + rollBuffMaxTimes = value; return this; } @@ -239,25 +239,62 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 10; - * @return whether the selectBuffSourceHint field is set + * optional uint32 source_total_count = 12; + * @return whether the sourceTotalCount field is set */ - public boolean hasSelectBuffSourceHint() { + public boolean hasSourceTotalCount() { return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 select_buff_source_hint = 10; + * optional uint32 source_total_count = 12; + * @return this + */ + public RogueCommonBuffSelectInfo clearSourceTotalCount() { + bitField0_ &= ~0x00000010; + sourceTotalCount = 0; + return this; + } + + /** + * optional uint32 source_total_count = 12; + * @return the sourceTotalCount + */ + public int getSourceTotalCount() { + return sourceTotalCount; + } + + /** + * optional uint32 source_total_count = 12; + * @param value the sourceTotalCount to set + * @return this + */ + public RogueCommonBuffSelectInfo setSourceTotalCount(final int value) { + bitField0_ |= 0x00000010; + sourceTotalCount = value; + return this; + } + + /** + * optional uint32 select_buff_source_hint = 15; + * @return whether the selectBuffSourceHint field is set + */ + public boolean hasSelectBuffSourceHint() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 select_buff_source_hint = 15; * @return this */ public RogueCommonBuffSelectInfo clearSelectBuffSourceHint() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; selectBuffSourceHint = 0; return this; } /** - * optional uint32 select_buff_source_hint = 10; + * optional uint32 select_buff_source_hint = 15; * @return the selectBuffSourceHint */ public int getSelectBuffSourceHint() { @@ -265,55 +302,18 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional uint32 select_buff_source_hint = 10; + * optional uint32 select_buff_source_hint = 15; * @param value the selectBuffSourceHint to set * @return this */ public RogueCommonBuffSelectInfo setSelectBuffSourceHint(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; selectBuffSourceHint = value; return this; } /** - * optional uint32 roll_buff_times = 11; - * @return whether the rollBuffTimes field is set - */ - public boolean hasRollBuffTimes() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional uint32 roll_buff_times = 11; - * @return this - */ - public RogueCommonBuffSelectInfo clearRollBuffTimes() { - bitField0_ &= ~0x00000020; - rollBuffTimes = 0; - return this; - } - - /** - * optional uint32 roll_buff_times = 11; - * @return the rollBuffTimes - */ - public int getRollBuffTimes() { - return rollBuffTimes; - } - - /** - * optional uint32 roll_buff_times = 11; - * @param value the rollBuffTimes to set - * @return this - */ - public RogueCommonBuffSelectInfo setRollBuffTimes(final int value) { - bitField0_ |= 0x00000020; - rollBuffTimes = value; - return this; - } - - /** - * optional .RogueCommonBuffSelectSource source_type = 13; + * optional .RogueCommonBuffSelectSource source_type = 2; * @return whether the sourceType field is set */ public boolean hasSourceType() { @@ -321,7 +321,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 13; + * optional .RogueCommonBuffSelectSource source_type = 2; * @return this */ public RogueCommonBuffSelectInfo clearSourceType() { @@ -331,7 +331,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 13; + * optional .RogueCommonBuffSelectSource source_type = 2; * @return the sourceType */ public RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource getSourceType() { @@ -364,7 +364,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .RogueCommonBuffSelectSource source_type = 13; + * optional .RogueCommonBuffSelectSource source_type = 2; * @param value the sourceType to set * @return this */ @@ -376,7 +376,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 6; + * optional bool can_roll = 14; * @return whether the canRoll field is set */ public boolean hasCanRoll() { @@ -384,7 +384,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 6; + * optional bool can_roll = 14; * @return this */ public RogueCommonBuffSelectInfo clearCanRoll() { @@ -394,7 +394,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 6; + * optional bool can_roll = 14; * @return the canRoll */ public boolean getCanRoll() { @@ -402,7 +402,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional bool can_roll = 6; + * optional bool can_roll = 14; * @param value the canRoll to set * @return this */ @@ -413,7 +413,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 4; * @return whether the rollBuffsCost field is set */ public boolean hasRollBuffsCost() { @@ -421,7 +421,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 4; * @return this */ public RogueCommonBuffSelectInfo clearRollBuffsCost() { @@ -431,7 +431,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 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. @@ -445,7 +445,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 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 @@ -459,7 +459,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * optional .ItemCostList roll_buffs_cost = 14; + * optional .ItemCostList roll_buffs_cost = 4; * @param value the rollBuffsCost to set * @return this */ @@ -471,93 +471,25 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 first_buff_type_list = 4; - * @return whether the firstBuffTypeList field is set + * repeated uint32 handbook_unlock_buff_id_list = 10; + * @return whether the handbookUnlockBuffIdList field is set */ - public boolean hasFirstBuffTypeList() { + public boolean hasHandbookUnlockBuffIdList() { return (bitField0_ & 0x00000200) != 0; } /** - * repeated uint32 first_buff_type_list = 4; - * @return this - */ - public RogueCommonBuffSelectInfo clearFirstBuffTypeList() { - bitField0_ &= ~0x00000200; - firstBuffTypeList.clear(); - return this; - } - - /** - * repeated uint32 first_buff_type_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 #getMutableFirstBuffTypeList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getFirstBuffTypeList() { - return firstBuffTypeList; - } - - /** - * repeated uint32 first_buff_type_list = 4; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedInt getMutableFirstBuffTypeList() { - bitField0_ |= 0x00000200; - return firstBuffTypeList; - } - - /** - * repeated uint32 first_buff_type_list = 4; - * @param value the firstBuffTypeList to add - * @return this - */ - public RogueCommonBuffSelectInfo addFirstBuffTypeList(final int value) { - bitField0_ |= 0x00000200; - firstBuffTypeList.add(value); - return this; - } - - /** - * repeated uint32 first_buff_type_list = 4; - * @param values the firstBuffTypeList to add - * @return this - */ - public RogueCommonBuffSelectInfo addAllFirstBuffTypeList(final int... values) { - bitField0_ |= 0x00000200; - firstBuffTypeList.addAll(values); - return this; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 8; - * @return whether the handbookUnlockBuffIdList field is set - */ - public boolean hasHandbookUnlockBuffIdList() { - return (bitField0_ & 0x00000400) != 0; - } - - /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * repeated uint32 handbook_unlock_buff_id_list = 10; * @return this */ public RogueCommonBuffSelectInfo clearHandbookUnlockBuffIdList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000200; handbookUnlockBuffIdList.clear(); return this; } /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * 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. @@ -571,7 +503,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * 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 @@ -580,34 +512,102 @@ public final class RogueCommonBuffSelectInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableHandbookUnlockBuffIdList() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return handbookUnlockBuffIdList; } /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * repeated uint32 handbook_unlock_buff_id_list = 10; * @param value the handbookUnlockBuffIdList to add * @return this */ public RogueCommonBuffSelectInfo addHandbookUnlockBuffIdList(final int value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; handbookUnlockBuffIdList.add(value); return this; } /** - * repeated uint32 handbook_unlock_buff_id_list = 8; + * repeated uint32 handbook_unlock_buff_id_list = 10; * @param values the handbookUnlockBuffIdList to add * @return this */ public RogueCommonBuffSelectInfo addAllHandbookUnlockBuffIdList(final int... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; handbookUnlockBuffIdList.addAll(values); return this; } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated uint32 first_buff_type_list = 13; + * @return whether the firstBuffTypeList field is set + */ + public boolean hasFirstBuffTypeList() { + return (bitField0_ & 0x00000400) != 0; + } + + /** + * repeated uint32 first_buff_type_list = 13; + * @return this + */ + public RogueCommonBuffSelectInfo clearFirstBuffTypeList() { + bitField0_ &= ~0x00000400; + firstBuffTypeList.clear(); + return this; + } + + /** + * repeated uint32 first_buff_type_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 #getMutableFirstBuffTypeList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getFirstBuffTypeList() { + return firstBuffTypeList; + } + + /** + * repeated uint32 first_buff_type_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 getMutableFirstBuffTypeList() { + bitField0_ |= 0x00000400; + return firstBuffTypeList; + } + + /** + * repeated uint32 first_buff_type_list = 13; + * @param value the firstBuffTypeList to add + * @return this + */ + public RogueCommonBuffSelectInfo addFirstBuffTypeList(final int value) { + bitField0_ |= 0x00000400; + firstBuffTypeList.add(value); + return this; + } + + /** + * repeated uint32 first_buff_type_list = 13; + * @param values the firstBuffTypeList to add + * @return this + */ + public RogueCommonBuffSelectInfo addAllFirstBuffTypeList(final int... values) { + bitField0_ |= 0x00000400; + firstBuffTypeList.addAll(values); + return this; + } + + /** + * repeated .RogueCommonBuff maze_buff_list = 5; * @return whether the mazeBuffList field is set */ public boolean hasMazeBuffList() { @@ -615,7 +615,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated .RogueCommonBuff maze_buff_list = 5; * @return this */ public RogueCommonBuffSelectInfo clearMazeBuffList() { @@ -625,7 +625,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated .RogueCommonBuff maze_buff_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. @@ -639,7 +639,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated .RogueCommonBuff maze_buff_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 @@ -653,7 +653,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated .RogueCommonBuff maze_buff_list = 5; * @param value the mazeBuffList to add * @return this */ @@ -665,7 +665,7 @@ public final class RogueCommonBuffSelectInfoOuterClass { } /** - * repeated .RogueCommonBuff maze_buff_list = 12; + * repeated .RogueCommonBuff maze_buff_list = 5; * @param values the mazeBuffList to add * @return this */ @@ -681,17 +681,17 @@ public final class RogueCommonBuffSelectInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rollBuffMaxTimes = other.rollBuffMaxTimes; rollBuffFreeCount = other.rollBuffFreeCount; - sourceTotalCount = other.sourceTotalCount; - sourceCurCount = other.sourceCurCount; - selectBuffSourceHint = other.selectBuffSourceHint; rollBuffTimes = other.rollBuffTimes; + rollBuffMaxTimes = other.rollBuffMaxTimes; + sourceCurCount = other.sourceCurCount; + sourceTotalCount = other.sourceTotalCount; + selectBuffSourceHint = other.selectBuffSourceHint; sourceType = other.sourceType; canRoll = other.canRoll; rollBuffsCost.copyFrom(other.rollBuffsCost); - firstBuffTypeList.copyFrom(other.firstBuffTypeList); handbookUnlockBuffIdList.copyFrom(other.handbookUnlockBuffIdList); + firstBuffTypeList.copyFrom(other.firstBuffTypeList); mazeBuffList.copyFrom(other.mazeBuffList); } return this; @@ -703,24 +703,24 @@ public final class RogueCommonBuffSelectInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRollBuffMaxTimes()) { - setRollBuffMaxTimes(other.rollBuffMaxTimes); - } if (other.hasRollBuffFreeCount()) { setRollBuffFreeCount(other.rollBuffFreeCount); } - if (other.hasSourceTotalCount()) { - setSourceTotalCount(other.sourceTotalCount); + if (other.hasRollBuffTimes()) { + setRollBuffTimes(other.rollBuffTimes); + } + if (other.hasRollBuffMaxTimes()) { + setRollBuffMaxTimes(other.rollBuffMaxTimes); } if (other.hasSourceCurCount()) { setSourceCurCount(other.sourceCurCount); } + if (other.hasSourceTotalCount()) { + setSourceTotalCount(other.sourceTotalCount); + } if (other.hasSelectBuffSourceHint()) { setSelectBuffSourceHint(other.selectBuffSourceHint); } - if (other.hasRollBuffTimes()) { - setRollBuffTimes(other.rollBuffTimes); - } if (other.hasSourceType()) { setSourceTypeValue(other.sourceType); } @@ -730,12 +730,12 @@ public final class RogueCommonBuffSelectInfoOuterClass { if (other.hasRollBuffsCost()) { getMutableRollBuffsCost().mergeFrom(other.rollBuffsCost); } - if (other.hasFirstBuffTypeList()) { - getMutableFirstBuffTypeList().addAll(other.firstBuffTypeList); - } if (other.hasHandbookUnlockBuffIdList()) { getMutableHandbookUnlockBuffIdList().addAll(other.handbookUnlockBuffIdList); } + if (other.hasFirstBuffTypeList()) { + getMutableFirstBuffTypeList().addAll(other.firstBuffTypeList); + } if (other.hasMazeBuffList()) { getMutableMazeBuffList().addAll(other.mazeBuffList); } @@ -749,17 +749,17 @@ public final class RogueCommonBuffSelectInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rollBuffMaxTimes = 0; rollBuffFreeCount = 0; - sourceTotalCount = 0; - sourceCurCount = 0; - selectBuffSourceHint = 0; rollBuffTimes = 0; + rollBuffMaxTimes = 0; + sourceCurCount = 0; + sourceTotalCount = 0; + selectBuffSourceHint = 0; sourceType = 0; canRoll = false; rollBuffsCost.clear(); - firstBuffTypeList.clear(); handbookUnlockBuffIdList.clear(); + firstBuffTypeList.clear(); mazeBuffList.clear(); return this; } @@ -772,8 +772,8 @@ public final class RogueCommonBuffSelectInfoOuterClass { cachedSize = -1; bitField0_ = 0; rollBuffsCost.clearQuick(); - firstBuffTypeList.clear(); handbookUnlockBuffIdList.clear(); + firstBuffTypeList.clear(); mazeBuffList.clearQuick(); return this; } @@ -788,73 +788,73 @@ public final class RogueCommonBuffSelectInfoOuterClass { } RogueCommonBuffSelectInfo other = (RogueCommonBuffSelectInfo) o; return bitField0_ == other.bitField0_ - && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) && (!hasRollBuffFreeCount() || rollBuffFreeCount == other.rollBuffFreeCount) - && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) - && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) - && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint) && (!hasRollBuffTimes() || rollBuffTimes == other.rollBuffTimes) + && (!hasRollBuffMaxTimes() || rollBuffMaxTimes == other.rollBuffMaxTimes) + && (!hasSourceCurCount() || sourceCurCount == other.sourceCurCount) + && (!hasSourceTotalCount() || sourceTotalCount == other.sourceTotalCount) + && (!hasSelectBuffSourceHint() || selectBuffSourceHint == other.selectBuffSourceHint) && (!hasSourceType() || sourceType == other.sourceType) && (!hasCanRoll() || canRoll == other.canRoll) && (!hasRollBuffsCost() || rollBuffsCost.equals(other.rollBuffsCost)) - && (!hasFirstBuffTypeList() || firstBuffTypeList.equals(other.firstBuffTypeList)) && (!hasHandbookUnlockBuffIdList() || handbookUnlockBuffIdList.equals(other.handbookUnlockBuffIdList)) + && (!hasFirstBuffTypeList() || firstBuffTypeList.equals(other.firstBuffTypeList)) && (!hasMazeBuffList() || mazeBuffList.equals(other.mazeBuffList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(rollBuffMaxTimes); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(rollBuffFreeCount); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(rollBuffFreeCount); + output.writeUInt32NoTag(rollBuffTimes); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(sourceTotalCount); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(rollBuffMaxTimes); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 56); output.writeUInt32NoTag(sourceCurCount); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(selectBuffSourceHint); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(sourceTotalCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(rollBuffTimes); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 16); output.writeEnumNoTag(sourceType); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 112); output.writeBoolNoTag(canRoll); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 34); output.writeMessageNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000200) != 0) { - for (int i = 0; i < firstBuffTypeList.length(); i++) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(firstBuffTypeList.array()[i]); + for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < handbookUnlockBuffIdList.length(); i++) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(handbookUnlockBuffIdList.array()[i]); + for (int i = 0; i < firstBuffTypeList.length(); i++) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(firstBuffTypeList.array()[i]); } } if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < mazeBuffList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 42); output.writeMessageNoTag(mazeBuffList.get(i)); } } @@ -864,22 +864,22 @@ public final class RogueCommonBuffSelectInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffFreeCount); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffMaxTimes); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceCurCount); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); + size += 1 + ProtoSink.computeUInt32SizeNoTag(sourceTotalCount); } if ((bitField0_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(rollBuffTimes); + size += 1 + ProtoSink.computeUInt32SizeNoTag(selectBuffSourceHint); } if ((bitField0_ & 0x00000040) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(sourceType); @@ -891,10 +891,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(rollBuffsCost); } if ((bitField0_ & 0x00000200) != 0) { - size += (1 * firstBuffTypeList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(firstBuffTypeList); + size += (1 * handbookUnlockBuffIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(handbookUnlockBuffIdList); } if ((bitField0_ & 0x00000400) != 0) { - size += (1 * handbookUnlockBuffIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(handbookUnlockBuffIdList); + size += (1 * firstBuffTypeList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(firstBuffTypeList); } if ((bitField0_ & 0x00000800) != 0) { size += (1 * mazeBuffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(mazeBuffList); @@ -909,9 +909,9 @@ public final class RogueCommonBuffSelectInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // rollBuffMaxTimes - rollBuffMaxTimes = input.readUInt32(); + case 8: { + // rollBuffFreeCount + rollBuffFreeCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 24) { @@ -919,17 +919,17 @@ public final class RogueCommonBuffSelectInfoOuterClass { } } case 24: { - // rollBuffFreeCount - rollBuffFreeCount = input.readUInt32(); + // rollBuffTimes + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 48) { break; } } - case 40: { - // sourceTotalCount - sourceTotalCount = input.readUInt32(); + case 48: { + // rollBuffMaxTimes + rollBuffMaxTimes = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 56) { @@ -941,29 +941,29 @@ public final class RogueCommonBuffSelectInfoOuterClass { sourceCurCount = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 80) { + if (tag != 96) { break; } } - case 80: { - // selectBuffSourceHint - selectBuffSourceHint = input.readUInt32(); + case 96: { + // sourceTotalCount + sourceTotalCount = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 88) { + if (tag != 120) { break; } } - case 88: { - // rollBuffTimes - rollBuffTimes = input.readUInt32(); + case 120: { + // selectBuffSourceHint + selectBuffSourceHint = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 104) { + if (tag != 16) { break; } } - case 104: { + case 16: { // sourceType final int value = input.readInt32(); if (RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.forNumber(value) != null) { @@ -971,47 +971,47 @@ public final class RogueCommonBuffSelectInfoOuterClass { bitField0_ |= 0x00000040; } tag = input.readTag(); - if (tag != 48) { + if (tag != 112) { break; } } - case 48: { + case 112: { // canRoll canRoll = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // rollBuffsCost - input.readMessage(rollBuffsCost); - bitField0_ |= 0x00000100; - tag = input.readTag(); if (tag != 34) { break; } } case 34: { - // firstBuffTypeList [packed=true] - input.readPackedUInt32(firstBuffTypeList, tag); - bitField0_ |= 0x00000200; + // rollBuffsCost + input.readMessage(rollBuffsCost); + bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 66) { + if (tag != 82) { break; } } - case 66: { + case 82: { // handbookUnlockBuffIdList [packed=true] input.readPackedUInt32(handbookUnlockBuffIdList, tag); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { + case 106: { + // firstBuffTypeList [packed=true] + input.readPackedUInt32(firstBuffTypeList, tag); + bitField0_ |= 0x00000400; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // mazeBuffList tag = input.readRepeatedMessage(mazeBuffList, tag); bitField0_ |= 0x00000800; @@ -1029,15 +1029,15 @@ public final class RogueCommonBuffSelectInfoOuterClass { tag = input.readTag(); break; } - case 32: { - // firstBuffTypeList [packed=false] - tag = input.readRepeatedUInt32(firstBuffTypeList, tag); + case 80: { + // handbookUnlockBuffIdList [packed=false] + tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); bitField0_ |= 0x00000200; break; } - case 64: { - // handbookUnlockBuffIdList [packed=false] - tag = input.readRepeatedUInt32(handbookUnlockBuffIdList, tag); + case 104: { + // firstBuffTypeList [packed=false] + tag = input.readRepeatedUInt32(firstBuffTypeList, tag); bitField0_ |= 0x00000400; break; } @@ -1049,22 +1049,22 @@ public final class RogueCommonBuffSelectInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.rollBuffFreeCount, rollBuffFreeCount); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount); + output.writeUInt32(FieldNames.rollBuffMaxTimes, rollBuffMaxTimes); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.sourceCurCount, sourceCurCount); } if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); + output.writeUInt32(FieldNames.sourceTotalCount, sourceTotalCount); } if ((bitField0_ & 0x00000020) != 0) { - output.writeUInt32(FieldNames.rollBuffTimes, rollBuffTimes); + output.writeUInt32(FieldNames.selectBuffSourceHint, selectBuffSourceHint); } if ((bitField0_ & 0x00000040) != 0) { output.writeEnum(FieldNames.sourceType, sourceType, RogueCommonBuffSelectSourceOuterClass.RogueCommonBuffSelectSource.converter()); @@ -1076,10 +1076,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { output.writeMessage(FieldNames.rollBuffsCost, rollBuffsCost); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRepeatedUInt32(FieldNames.firstBuffTypeList, firstBuffTypeList); + output.writeRepeatedUInt32(FieldNames.handbookUnlockBuffIdList, handbookUnlockBuffIdList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedUInt32(FieldNames.handbookUnlockBuffIdList, handbookUnlockBuffIdList); + output.writeRepeatedUInt32(FieldNames.firstBuffTypeList, firstBuffTypeList); } if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.mazeBuffList, mazeBuffList); @@ -1094,11 +1094,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -564731182: - case -792528959: { - if (input.isAtField(FieldNames.rollBuffMaxTimes)) { + case -227537549: + case -710203098: { + if (input.isAtField(FieldNames.rollBuffFreeCount)) { if (!input.trySkipNullValue()) { - rollBuffMaxTimes = input.readUInt32(); + rollBuffFreeCount = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -1106,11 +1106,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -227537549: - case -710203098: { - if (input.isAtField(FieldNames.rollBuffFreeCount)) { + case -436216138: + case 2038334812: { + if (input.isAtField(FieldNames.rollBuffTimes)) { if (!input.trySkipNullValue()) { - rollBuffFreeCount = input.readUInt32(); + rollBuffTimes = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -1118,11 +1118,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -1098445146: - case -1750826448: { - if (input.isAtField(FieldNames.sourceTotalCount)) { + case -564731182: + case -792528959: { + if (input.isAtField(FieldNames.rollBuffMaxTimes)) { if (!input.trySkipNullValue()) { - sourceTotalCount = input.readUInt32(); + rollBuffMaxTimes = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -1142,11 +1142,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -1160450543: - case -335538398: { - if (input.isAtField(FieldNames.selectBuffSourceHint)) { + case -1098445146: + case -1750826448: { + if (input.isAtField(FieldNames.sourceTotalCount)) { if (!input.trySkipNullValue()) { - selectBuffSourceHint = input.readUInt32(); + sourceTotalCount = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1154,11 +1154,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -436216138: - case 2038334812: { - if (input.isAtField(FieldNames.rollBuffTimes)) { + case -1160450543: + case -335538398: { + if (input.isAtField(FieldNames.selectBuffSourceHint)) { if (!input.trySkipNullValue()) { - rollBuffTimes = input.readUInt32(); + selectBuffSourceHint = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -1207,11 +1207,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case -2103912645: - case -1677036794: { - if (input.isAtField(FieldNames.firstBuffTypeList)) { + case 620352744: + case 2008489866: { + if (input.isAtField(FieldNames.handbookUnlockBuffIdList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(firstBuffTypeList); + input.readRepeatedUInt32(handbookUnlockBuffIdList); bitField0_ |= 0x00000200; } } else { @@ -1219,11 +1219,11 @@ public final class RogueCommonBuffSelectInfoOuterClass { } break; } - case 620352744: - case 2008489866: { - if (input.isAtField(FieldNames.handbookUnlockBuffIdList)) { + case -2103912645: + case -1677036794: { + if (input.isAtField(FieldNames.firstBuffTypeList)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(handbookUnlockBuffIdList); + input.readRepeatedUInt32(firstBuffTypeList); bitField0_ |= 0x00000400; } } else { @@ -1296,17 +1296,17 @@ public final class RogueCommonBuffSelectInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rollBuffMaxTimes = FieldName.forField("rollBuffMaxTimes", "roll_buff_max_times"); - static final FieldName rollBuffFreeCount = FieldName.forField("rollBuffFreeCount", "roll_buff_free_count"); - static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_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 selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); + static final FieldName sourceTotalCount = FieldName.forField("sourceTotalCount", "source_total_count"); - static final FieldName rollBuffTimes = FieldName.forField("rollBuffTimes", "roll_buff_times"); + static final FieldName selectBuffSourceHint = FieldName.forField("selectBuffSourceHint", "select_buff_source_hint"); static final FieldName sourceType = FieldName.forField("sourceType", "source_type"); @@ -1314,10 +1314,10 @@ public final class RogueCommonBuffSelectInfoOuterClass { static final FieldName rollBuffsCost = FieldName.forField("rollBuffsCost", "roll_buffs_cost"); - 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 firstBuffTypeList = FieldName.forField("firstBuffTypeList", "first_buff_type_list"); + static final FieldName mazeBuffList = FieldName.forField("mazeBuffList", "maze_buff_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java index 9f1916c..72ba786 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 = 9; + * optional uint32 unique_id = 4; */ private int uniqueId; /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_action = 7; */ private final RogueActionOuterClass.RogueAction rogueAction = RogueActionOuterClass.RogueAction.newInstance(); @@ -39,7 +39,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 9; + * optional uint32 unique_id = 4; * @return whether the uniqueId field is set */ public boolean hasUniqueId() { @@ -47,7 +47,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 9; + * optional uint32 unique_id = 4; * @return this */ public RogueCommonPendingAction clearUniqueId() { @@ -57,7 +57,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 9; + * optional uint32 unique_id = 4; * @return the uniqueId */ public int getUniqueId() { @@ -65,7 +65,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional uint32 unique_id = 9; + * optional uint32 unique_id = 4; * @param value the uniqueId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_action = 7; * @return whether the rogueAction field is set */ public boolean hasRogueAction() { @@ -84,7 +84,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_action = 7; * @return this */ public RogueCommonPendingAction clearRogueAction() { @@ -94,7 +94,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_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. @@ -108,7 +108,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_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 @@ -122,7 +122,7 @@ public final class RogueCommonPendingActionOuterClass { } /** - * optional .RogueAction rogue_action = 6; + * optional .RogueAction rogue_action = 7; * @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) 72); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(uniqueId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 58); output.writeMessageNoTag(rogueAction); } } @@ -226,16 +226,16 @@ public final class RogueCommonPendingActionOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 32: { // uniqueId uniqueId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 58) { break; } } - case 50: { + case 58: { // 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 6c85a1e..1a7e6d8 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurVirtualItemInfoOuterClass.java @@ -19,15 +19,15 @@ public final class RogueCurVirtualItemInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 cur_rogue_coin = 1; - */ - private int curRogueCoin; - - /** - * optional uint32 cur_talent_coin = 12; + * optional uint32 cur_talent_coin = 4; */ private int curTalentCoin; + /** + * optional uint32 cur_rogue_coin = 12; + */ + private int curRogueCoin; + private RogueCurVirtualItemInfo() { } @@ -39,62 +39,25 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_rogue_coin = 1; - * @return whether the curRogueCoin field is set + * optional uint32 cur_talent_coin = 4; + * @return whether the curTalentCoin field is set */ - public boolean hasCurRogueCoin() { + public boolean hasCurTalentCoin() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 cur_rogue_coin = 1; - * @return this - */ - public RogueCurVirtualItemInfo clearCurRogueCoin() { - bitField0_ &= ~0x00000001; - curRogueCoin = 0; - return this; - } - - /** - * optional uint32 cur_rogue_coin = 1; - * @return the curRogueCoin - */ - public int getCurRogueCoin() { - return curRogueCoin; - } - - /** - * optional uint32 cur_rogue_coin = 1; - * @param value the curRogueCoin to set - * @return this - */ - public RogueCurVirtualItemInfo setCurRogueCoin(final int value) { - bitField0_ |= 0x00000001; - curRogueCoin = value; - return this; - } - - /** - * optional uint32 cur_talent_coin = 12; - * @return whether the curTalentCoin field is set - */ - public boolean hasCurTalentCoin() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_talent_coin = 12; + * optional uint32 cur_talent_coin = 4; * @return this */ public RogueCurVirtualItemInfo clearCurTalentCoin() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curTalentCoin = 0; return this; } /** - * optional uint32 cur_talent_coin = 12; + * optional uint32 cur_talent_coin = 4; * @return the curTalentCoin */ public int getCurTalentCoin() { @@ -102,23 +65,60 @@ public final class RogueCurVirtualItemInfoOuterClass { } /** - * optional uint32 cur_talent_coin = 12; + * optional uint32 cur_talent_coin = 4; * @param value the curTalentCoin to set * @return this */ public RogueCurVirtualItemInfo setCurTalentCoin(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; curTalentCoin = value; return this; } + /** + * optional uint32 cur_rogue_coin = 12; + * @return whether the curRogueCoin field is set + */ + public boolean hasCurRogueCoin() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 cur_rogue_coin = 12; + * @return this + */ + public RogueCurVirtualItemInfo clearCurRogueCoin() { + bitField0_ &= ~0x00000002; + curRogueCoin = 0; + return this; + } + + /** + * optional uint32 cur_rogue_coin = 12; + * @return the curRogueCoin + */ + public int getCurRogueCoin() { + return curRogueCoin; + } + + /** + * optional uint32 cur_rogue_coin = 12; + * @param value the curRogueCoin to set + * @return this + */ + public RogueCurVirtualItemInfo setCurRogueCoin(final int value) { + bitField0_ |= 0x00000002; + curRogueCoin = value; + return this; + } + @Override public RogueCurVirtualItemInfo copyFrom(final RogueCurVirtualItemInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - curRogueCoin = other.curRogueCoin; curTalentCoin = other.curTalentCoin; + curRogueCoin = other.curRogueCoin; } return this; } @@ -129,12 +129,12 @@ public final class RogueCurVirtualItemInfoOuterClass { return this; } cachedSize = -1; - if (other.hasCurRogueCoin()) { - setCurRogueCoin(other.curRogueCoin); - } if (other.hasCurTalentCoin()) { setCurTalentCoin(other.curTalentCoin); } + if (other.hasCurRogueCoin()) { + setCurRogueCoin(other.curRogueCoin); + } return this; } @@ -145,8 +145,8 @@ public final class RogueCurVirtualItemInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - curRogueCoin = 0; curTalentCoin = 0; + curRogueCoin = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueCurVirtualItemInfoOuterClass { } RogueCurVirtualItemInfo other = (RogueCurVirtualItemInfo) o; return bitField0_ == other.bitField0_ - && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin) - && (!hasCurTalentCoin() || curTalentCoin == other.curTalentCoin); + && (!hasCurTalentCoin() || curTalentCoin == other.curTalentCoin) + && (!hasCurRogueCoin() || curRogueCoin == other.curRogueCoin); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(curRogueCoin); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(curTalentCoin); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(curTalentCoin); + output.writeUInt32NoTag(curRogueCoin); } } @@ -190,10 +190,10 @@ public final class RogueCurVirtualItemInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curTalentCoin); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curTalentCoin); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curRogueCoin); } return size; } @@ -205,9 +205,9 @@ public final class RogueCurVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // curRogueCoin - curRogueCoin = input.readUInt32(); + case 32: { + // curTalentCoin + curTalentCoin = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 96) { @@ -215,8 +215,8 @@ public final class RogueCurVirtualItemInfoOuterClass { } } case 96: { - // curTalentCoin - curTalentCoin = input.readUInt32(); + // curRogueCoin + curRogueCoin = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class RogueCurVirtualItemInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin); + output.writeUInt32(FieldNames.curTalentCoin, curTalentCoin); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curTalentCoin, curTalentCoin); + output.writeUInt32(FieldNames.curRogueCoin, curRogueCoin); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueCurVirtualItemInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1836271915: - case -979997387: { - if (input.isAtField(FieldNames.curRogueCoin)) { + case -658043907: + case 569371269: { + if (input.isAtField(FieldNames.curTalentCoin)) { if (!input.trySkipNullValue()) { - curRogueCoin = input.readUInt32(); + curTalentCoin = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueCurVirtualItemInfoOuterClass { } break; } - case -658043907: - case 569371269: { - if (input.isAtField(FieldNames.curTalentCoin)) { + case 1836271915: + case -979997387: { + if (input.isAtField(FieldNames.curRogueCoin)) { if (!input.trySkipNullValue()) { - curTalentCoin = input.readUInt32(); + curRogueCoin = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueCurVirtualItemInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName curRogueCoin = FieldName.forField("curRogueCoin", "cur_rogue_coin"); - static final FieldName curTalentCoin = FieldName.forField("curTalentCoin", "cur_talent_coin"); + + static final FieldName curRogueCoin = FieldName.forField("curRogueCoin", "cur_rogue_coin"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java index 935cc04..3454b90 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueCurrentInfoOuterClass.java @@ -19,44 +19,44 @@ public final class RogueCurrentInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueStatus status = 7; + * optional .RogueStatus status = 13; */ private int status; /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - */ - private final RogueMiracleInfoOuterClass.RogueMiracleInfo rogueMiracleInfo = RogueMiracleInfoOuterClass.RogueMiracleInfo.newInstance(); - - /** - * optional .RogueAeon rogue_aeon_info = 3; - */ - private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 6; - */ - private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance(); - - /** - * optional .RogueCommonPendingAction pending_action = 8; + * optional .RogueCommonPendingAction pending_action = 2; */ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction pendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); /** - * optional .RogueMapInfo room_map = 9; + * 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; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItem = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); /** - * optional .RogueBuffInfo rogue_buff_info = 14; + * optional .RogueAvatarInfo rogue_avatar_info = 11; */ - private final RogueBuffInfoOuterClass.RogueBuffInfo rogueBuffInfo = RogueBuffInfoOuterClass.RogueBuffInfo.newInstance(); + private final RogueAvatarInfoOuterClass.RogueAvatarInfo rogueAvatarInfo = RogueAvatarInfoOuterClass.RogueAvatarInfo.newInstance(); + + /** + * optional .RogueAeon rogue_aeon_info = 15; + */ + private final RogueAeonOuterClass.RogueAeon rogueAeonInfo = RogueAeonOuterClass.RogueAeon.newInstance(); private RogueCurrentInfo() { } @@ -69,7 +69,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 7; + * optional .RogueStatus status = 13; * @return whether the status field is set */ public boolean hasStatus() { @@ -77,7 +77,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 7; + * optional .RogueStatus status = 13; * @return this */ public RogueCurrentInfo clearStatus() { @@ -87,7 +87,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 7; + * optional .RogueStatus status = 13; * @return the status */ public RogueStatusOuterClass.RogueStatus getStatus() { @@ -120,7 +120,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueStatus status = 7; + * optional .RogueStatus status = 13; * @param value the status to set * @return this */ @@ -131,198 +131,25 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - * @return whether the rogueMiracleInfo field is set + * optional .RogueCommonPendingAction pending_action = 2; + * @return whether the pendingAction field is set */ - public boolean hasRogueMiracleInfo() { + public boolean hasPendingAction() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - * @return this - */ - public RogueCurrentInfo clearRogueMiracleInfo() { - bitField0_ &= ~0x00000002; - rogueMiracleInfo.clear(); - return this; - } - - /** - * 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 #getMutableRogueMiracleInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueMiracleInfoOuterClass.RogueMiracleInfo getRogueMiracleInfo() { - return rogueMiracleInfo; - } - - /** - * 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueMiracleInfoOuterClass.RogueMiracleInfo getMutableRogueMiracleInfo() { - bitField0_ |= 0x00000002; - return rogueMiracleInfo; - } - - /** - * optional .RogueMiracleInfo rogue_miracle_info = 2; - * @param value the rogueMiracleInfo to set - * @return this - */ - public RogueCurrentInfo setRogueMiracleInfo( - final RogueMiracleInfoOuterClass.RogueMiracleInfo value) { - bitField0_ |= 0x00000002; - rogueMiracleInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAeon rogue_aeon_info = 3; - * @return whether the rogueAeonInfo field is set - */ - public boolean hasRogueAeonInfo() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .RogueAeon rogue_aeon_info = 3; - * @return this - */ - public RogueCurrentInfo clearRogueAeonInfo() { - bitField0_ &= ~0x00000004; - rogueAeonInfo.clear(); - return this; - } - - /** - * optional .RogueAeon 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. - * - * Use {@link #getMutableRogueAeonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAeonOuterClass.RogueAeon getRogueAeonInfo() { - return rogueAeonInfo; - } - - /** - * optional .RogueAeon 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { - bitField0_ |= 0x00000004; - return rogueAeonInfo; - } - - /** - * optional .RogueAeon rogue_aeon_info = 3; - * @param value the rogueAeonInfo to set - * @return this - */ - public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { - bitField0_ |= 0x00000004; - rogueAeonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 6; - * @return whether the rogueAvatarInfo field is set - */ - public boolean hasRogueAvatarInfo() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 6; - * @return this - */ - public RogueCurrentInfo clearRogueAvatarInfo() { - bitField0_ &= ~0x00000008; - rogueAvatarInfo.clear(); - return this; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_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 #getMutableRogueAvatarInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { - return rogueAvatarInfo; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_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 RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { - bitField0_ |= 0x00000008; - return rogueAvatarInfo; - } - - /** - * optional .RogueAvatarInfo rogue_avatar_info = 6; - * @param value the rogueAvatarInfo to set - * @return this - */ - public RogueCurrentInfo setRogueAvatarInfo( - final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { - bitField0_ |= 0x00000008; - rogueAvatarInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueCommonPendingAction pending_action = 8; - * @return whether the pendingAction field is set - */ - public boolean hasPendingAction() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .RogueCommonPendingAction pending_action = 8; + * optional .RogueCommonPendingAction pending_action = 2; * @return this */ public RogueCurrentInfo clearPendingAction() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; pendingAction.clear(); return this; } /** - * optional .RogueCommonPendingAction pending_action = 8; + * 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. @@ -336,7 +163,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueCommonPendingAction pending_action = 8; + * 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 @@ -345,42 +172,42 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueCommonPendingActionOuterClass.RogueCommonPendingAction getMutablePendingAction() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; return pendingAction; } /** - * optional .RogueCommonPendingAction pending_action = 8; + * optional .RogueCommonPendingAction pending_action = 2; * @param value the pendingAction to set * @return this */ public RogueCurrentInfo setPendingAction( final RogueCommonPendingActionOuterClass.RogueCommonPendingAction value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; pendingAction.copyFrom(value); return this; } /** - * optional .RogueMapInfo room_map = 9; + * optional .RogueMapInfo room_map = 4; * @return whether the roomMap field is set */ public boolean hasRoomMap() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000004) != 0; } /** - * optional .RogueMapInfo room_map = 9; + * optional .RogueMapInfo room_map = 4; * @return this */ public RogueCurrentInfo clearRoomMap() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000004; roomMap.clear(); return this; } /** - * optional .RogueMapInfo room_map = 9; + * 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. @@ -394,7 +221,7 @@ public final class RogueCurrentInfoOuterClass { } /** - * optional .RogueMapInfo room_map = 9; + * 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 @@ -403,27 +230,142 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueMapInfoOuterClass.RogueMapInfo getMutableRoomMap() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000004; return roomMap; } /** - * optional .RogueMapInfo room_map = 9; + * optional .RogueMapInfo room_map = 4; * @param value the roomMap to set * @return this */ public RogueCurrentInfo setRoomMap(final RogueMapInfoOuterClass.RogueMapInfo value) { - bitField0_ |= 0x00000020; + 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_ & 0x00000040) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -431,7 +373,7 @@ public final class RogueCurrentInfoOuterClass { * @return this */ public RogueCurrentInfo clearRogueVirtualItem() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; rogueVirtualItem.clear(); return this; } @@ -460,7 +402,7 @@ public final class RogueCurrentInfoOuterClass { * @return internal storage object for modifications */ public RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo getMutableRogueVirtualItem() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return rogueVirtualItem; } @@ -471,45 +413,45 @@ public final class RogueCurrentInfoOuterClass { */ public RogueCurrentInfo setRogueVirtualItem( final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; rogueVirtualItem.copyFrom(value); return this; } /** - * optional .RogueBuffInfo rogue_buff_info = 14; - * @return whether the rogueBuffInfo field is set + * optional .RogueAvatarInfo rogue_avatar_info = 11; + * @return whether the rogueAvatarInfo field is set */ - public boolean hasRogueBuffInfo() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasRogueAvatarInfo() { + return (bitField0_ & 0x00000040) != 0; } /** - * optional .RogueBuffInfo rogue_buff_info = 14; + * optional .RogueAvatarInfo rogue_avatar_info = 11; * @return this */ - public RogueCurrentInfo clearRogueBuffInfo() { - bitField0_ &= ~0x00000080; - rogueBuffInfo.clear(); + public RogueCurrentInfo clearRogueAvatarInfo() { + bitField0_ &= ~0x00000040; + rogueAvatarInfo.clear(); return this; } /** - * optional .RogueBuffInfo rogue_buff_info = 14; + * optional .RogueAvatarInfo rogue_avatar_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. + * Use {@link #getMutableRogueAvatarInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueBuffInfoOuterClass.RogueBuffInfo getRogueBuffInfo() { - return rogueBuffInfo; + public RogueAvatarInfoOuterClass.RogueAvatarInfo getRogueAvatarInfo() { + return rogueAvatarInfo; } /** - * optional .RogueBuffInfo rogue_buff_info = 14; + * optional .RogueAvatarInfo rogue_avatar_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 @@ -517,19 +459,77 @@ public final class RogueCurrentInfoOuterClass { * * @return internal storage object for modifications */ - public RogueBuffInfoOuterClass.RogueBuffInfo getMutableRogueBuffInfo() { - bitField0_ |= 0x00000080; - return rogueBuffInfo; + public RogueAvatarInfoOuterClass.RogueAvatarInfo getMutableRogueAvatarInfo() { + bitField0_ |= 0x00000040; + return rogueAvatarInfo; } /** - * optional .RogueBuffInfo rogue_buff_info = 14; - * @param value the rogueBuffInfo to set + * optional .RogueAvatarInfo rogue_avatar_info = 11; + * @param value the rogueAvatarInfo to set * @return this */ - public RogueCurrentInfo setRogueBuffInfo(final RogueBuffInfoOuterClass.RogueBuffInfo value) { + public RogueCurrentInfo setRogueAvatarInfo( + final RogueAvatarInfoOuterClass.RogueAvatarInfo value) { + bitField0_ |= 0x00000040; + rogueAvatarInfo.copyFrom(value); + return this; + } + + /** + * optional .RogueAeon rogue_aeon_info = 15; + * @return whether the rogueAeonInfo field is set + */ + public boolean hasRogueAeonInfo() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .RogueAeon rogue_aeon_info = 15; + * @return this + */ + public RogueCurrentInfo clearRogueAeonInfo() { + bitField0_ &= ~0x00000080; + rogueAeonInfo.clear(); + return this; + } + + /** + * optional .RogueAeon rogue_aeon_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 #getMutableRogueAeonInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueAeonOuterClass.RogueAeon getRogueAeonInfo() { + return rogueAeonInfo; + } + + /** + * optional .RogueAeon rogue_aeon_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 RogueAeonOuterClass.RogueAeon getMutableRogueAeonInfo() { bitField0_ |= 0x00000080; - rogueBuffInfo.copyFrom(value); + return rogueAeonInfo; + } + + /** + * optional .RogueAeon rogue_aeon_info = 15; + * @param value the rogueAeonInfo to set + * @return this + */ + public RogueCurrentInfo setRogueAeonInfo(final RogueAeonOuterClass.RogueAeon value) { + bitField0_ |= 0x00000080; + rogueAeonInfo.copyFrom(value); return this; } @@ -539,13 +539,13 @@ public final class RogueCurrentInfoOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; status = other.status; - rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); - rogueAeonInfo.copyFrom(other.rogueAeonInfo); - rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); pendingAction.copyFrom(other.pendingAction); roomMap.copyFrom(other.roomMap); - rogueVirtualItem.copyFrom(other.rogueVirtualItem); rogueBuffInfo.copyFrom(other.rogueBuffInfo); + rogueMiracleInfo.copyFrom(other.rogueMiracleInfo); + rogueVirtualItem.copyFrom(other.rogueVirtualItem); + rogueAvatarInfo.copyFrom(other.rogueAvatarInfo); + rogueAeonInfo.copyFrom(other.rogueAeonInfo); } return this; } @@ -559,26 +559,26 @@ public final class RogueCurrentInfoOuterClass { if (other.hasStatus()) { setStatusValue(other.status); } - if (other.hasRogueMiracleInfo()) { - getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); - } - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); - } - if (other.hasRogueAvatarInfo()) { - getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo); - } if (other.hasPendingAction()) { getMutablePendingAction().mergeFrom(other.pendingAction); } if (other.hasRoomMap()) { getMutableRoomMap().mergeFrom(other.roomMap); } + if (other.hasRogueBuffInfo()) { + getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); + } + if (other.hasRogueMiracleInfo()) { + getMutableRogueMiracleInfo().mergeFrom(other.rogueMiracleInfo); + } if (other.hasRogueVirtualItem()) { getMutableRogueVirtualItem().mergeFrom(other.rogueVirtualItem); } - if (other.hasRogueBuffInfo()) { - getMutableRogueBuffInfo().mergeFrom(other.rogueBuffInfo); + if (other.hasRogueAvatarInfo()) { + getMutableRogueAvatarInfo().mergeFrom(other.rogueAvatarInfo); + } + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } return this; } @@ -591,13 +591,13 @@ public final class RogueCurrentInfoOuterClass { cachedSize = -1; bitField0_ = 0; status = 0; - rogueMiracleInfo.clear(); - rogueAeonInfo.clear(); - rogueAvatarInfo.clear(); pendingAction.clear(); roomMap.clear(); - rogueVirtualItem.clear(); rogueBuffInfo.clear(); + rogueMiracleInfo.clear(); + rogueVirtualItem.clear(); + rogueAvatarInfo.clear(); + rogueAeonInfo.clear(); return this; } @@ -608,13 +608,13 @@ public final class RogueCurrentInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueMiracleInfo.clearQuick(); - rogueAeonInfo.clearQuick(); - rogueAvatarInfo.clearQuick(); pendingAction.clearQuick(); roomMap.clearQuick(); - rogueVirtualItem.clearQuick(); rogueBuffInfo.clearQuick(); + rogueMiracleInfo.clearQuick(); + rogueVirtualItem.clearQuick(); + rogueAvatarInfo.clearQuick(); + rogueAeonInfo.clearQuick(); return this; } @@ -629,48 +629,48 @@ public final class RogueCurrentInfoOuterClass { RogueCurrentInfo other = (RogueCurrentInfo) o; return bitField0_ == other.bitField0_ && (!hasStatus() || status == other.status) - && (!hasRogueMiracleInfo() || rogueMiracleInfo.equals(other.rogueMiracleInfo)) - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) - && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo)) && (!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)) - && (!hasRogueBuffInfo() || rogueBuffInfo.equals(other.rogueBuffInfo)); + && (!hasRogueAvatarInfo() || rogueAvatarInfo.equals(other.rogueAvatarInfo)) + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 104); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueMiracleInfo); + output.writeMessageNoTag(pendingAction); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(rogueAeonInfo); + output.writeRawByte((byte) 34); + output.writeMessageNoTag(roomMap); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 50); - output.writeMessageNoTag(rogueAvatarInfo); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(rogueBuffInfo); } if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 66); - output.writeMessageNoTag(pendingAction); + output.writeMessageNoTag(rogueMiracleInfo); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 74); - output.writeMessageNoTag(roomMap); - } - if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 82); output.writeMessageNoTag(rogueVirtualItem); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 90); + output.writeMessageNoTag(rogueAvatarInfo); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(rogueBuffInfo); + output.writeRawByte((byte) 122); + output.writeMessageNoTag(rogueAeonInfo); } } @@ -681,25 +681,25 @@ public final class RogueCurrentInfoOuterClass { size += 1 + ProtoSink.computeEnumSizeNoTag(status); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueMiracleInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo); - } - if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(pendingAction); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(roomMap); } - if ((bitField0_ & 0x00000040) != 0) { + 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) { + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAvatarInfo); + } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueBuffInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } return size; } @@ -711,7 +711,7 @@ public final class RogueCurrentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 104: { // status final int value = input.readInt32(); if (RogueStatusOuterClass.RogueStatus.forNumber(value) != null) { @@ -724,26 +724,26 @@ public final class RogueCurrentInfoOuterClass { } } case 18: { - // rogueMiracleInfo - input.readMessage(rogueMiracleInfo); + // pendingAction + input.readMessage(pendingAction); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + case 34: { + // roomMap + input.readMessage(roomMap); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 50) { + if (tag != 42) { break; } } - case 50: { - // rogueAvatarInfo - input.readMessage(rogueAvatarInfo); + case 42: { + // rogueBuffInfo + input.readMessage(rogueBuffInfo); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 66) { @@ -751,19 +751,10 @@ public final class RogueCurrentInfoOuterClass { } } case 66: { - // pendingAction - input.readMessage(pendingAction); + // rogueMiracleInfo + input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { - // roomMap - input.readMessage(roomMap); - bitField0_ |= 0x00000020; - tag = input.readTag(); if (tag != 82) { break; } @@ -771,15 +762,24 @@ public final class RogueCurrentInfoOuterClass { case 82: { // rogueVirtualItem input.readMessage(rogueVirtualItem); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; tag = input.readTag(); - if (tag != 114) { + if (tag != 90) { break; } } - case 114: { - // rogueBuffInfo - input.readMessage(rogueBuffInfo); + case 90: { + // rogueAvatarInfo + input.readMessage(rogueAvatarInfo); + bitField0_ |= 0x00000040; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 0) { @@ -807,25 +807,25 @@ public final class RogueCurrentInfoOuterClass { output.writeEnum(FieldNames.status, status, RogueStatusOuterClass.RogueStatus.converter()); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueMiracleInfo, rogueMiracleInfo); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.pendingAction, pendingAction); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.roomMap, roomMap); } - if ((bitField0_ & 0x00000040) != 0) { + 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) { + output.writeMessage(FieldNames.rogueAvatarInfo, rogueAvatarInfo); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.rogueBuffInfo, rogueBuffInfo); + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } output.endObject(); } @@ -853,48 +853,12 @@ public final class RogueCurrentInfoOuterClass { } break; } - case -452511099: - case 1925436929: { - if (input.isAtField(FieldNames.rogueMiracleInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueMiracleInfo); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1685018549: - case -1375922619: { - if (input.isAtField(FieldNames.rogueAeonInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAeonInfo); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1966631135: - case 667955439: { - if (input.isAtField(FieldNames.rogueAvatarInfo)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueAvatarInfo); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case -110680403: case 1646545374: { if (input.isAtField(FieldNames.pendingAction)) { if (!input.trySkipNullValue()) { input.readMessage(pendingAction); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -906,19 +870,7 @@ public final class RogueCurrentInfoOuterClass { if (input.isAtField(FieldNames.roomMap)) { if (!input.trySkipNullValue()) { input.readMessage(roomMap); - bitField0_ |= 0x00000020; - } - } else { - input.skipUnknownField(); - } - break; - } - case 2090167940: - case -856063476: { - if (input.isAtField(FieldNames.rogueVirtualItem)) { - if (!input.trySkipNullValue()) { - input.readMessage(rogueVirtualItem); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -930,6 +882,54 @@ public final class RogueCurrentInfoOuterClass { 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2090167940: + case -856063476: { + if (input.isAtField(FieldNames.rogueVirtualItem)) { + 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1685018549: + case -1375922619: { + if (input.isAtField(FieldNames.rogueAeonInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000080; } } else { @@ -992,19 +992,19 @@ public final class RogueCurrentInfoOuterClass { static class FieldNames { static final FieldName status = FieldName.forField("status"); - static final FieldName rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); - - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - - static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info"); - 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 rogueMiracleInfo = FieldName.forField("rogueMiracleInfo", "rogue_miracle_info"); + static final FieldName rogueVirtualItem = FieldName.forField("rogueVirtualItem", "rogue_virtual_item"); - static final FieldName rogueBuffInfo = FieldName.forField("rogueBuffInfo", "rogue_buff_info"); + static final FieldName rogueAvatarInfo = FieldName.forField("rogueAvatarInfo", "rogue_avatar_info"); + + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java index 8413afa..1a0616d 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventParamOuterClass.java @@ -20,12 +20,12 @@ public final class RogueDialogueEventParamOuterClass { private static final long serialVersionUID = 0L; /** - * optional float ratio = 4; + * optional float ratio = 12; */ private float ratio; /** - * optional uint32 dialogue_event_id = 8; + * optional uint32 dialogue_event_id = 4; */ private int dialogueEventId; @@ -35,12 +35,12 @@ public final class RogueDialogueEventParamOuterClass { private int argId; /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 2; */ private int intValue; /** - * optional bool is_valid = 11; + * optional bool is_valid = 3; */ private boolean isValid; @@ -55,7 +55,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 4; + * optional float ratio = 12; * @return whether the ratio field is set */ public boolean hasRatio() { @@ -63,7 +63,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 4; + * optional float ratio = 12; * @return this */ public RogueDialogueEventParam clearRatio() { @@ -73,7 +73,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 4; + * optional float ratio = 12; * @return the ratio */ public float getRatio() { @@ -81,7 +81,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional float ratio = 4; + * optional float ratio = 12; * @param value the ratio to set * @return this */ @@ -92,7 +92,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 8; + * optional uint32 dialogue_event_id = 4; * @return whether the dialogueEventId field is set */ public boolean hasDialogueEventId() { @@ -100,7 +100,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 8; + * optional uint32 dialogue_event_id = 4; * @return this */ public RogueDialogueEventParam clearDialogueEventId() { @@ -110,7 +110,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 8; + * optional uint32 dialogue_event_id = 4; * @return the dialogueEventId */ public int getDialogueEventId() { @@ -118,7 +118,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional uint32 dialogue_event_id = 8; + * optional uint32 dialogue_event_id = 4; * @param value the dialogueEventId to set * @return this */ @@ -166,7 +166,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 2; * @return whether the intValue field is set */ public boolean hasIntValue() { @@ -174,7 +174,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 2; * @return this */ public RogueDialogueEventParam clearIntValue() { @@ -184,7 +184,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 2; * @return the intValue */ public int getIntValue() { @@ -192,7 +192,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional sint32 int_value = 5; + * optional sint32 int_value = 2; * @param value the intValue to set * @return this */ @@ -203,7 +203,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 11; + * optional bool is_valid = 3; * @return whether the isValid field is set */ public boolean hasIsValid() { @@ -211,7 +211,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 11; + * optional bool is_valid = 3; * @return this */ public RogueDialogueEventParam clearIsValid() { @@ -221,7 +221,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 11; + * optional bool is_valid = 3; * @return the isValid */ public boolean getIsValid() { @@ -229,7 +229,7 @@ public final class RogueDialogueEventParamOuterClass { } /** - * optional bool is_valid = 11; + * optional bool is_valid = 3; * @param value the isValid to set * @return this */ @@ -322,11 +322,11 @@ public final class RogueDialogueEventParamOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 37); + output.writeRawByte((byte) 101); output.writeFloatNoTag(ratio); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(dialogueEventId); } if ((bitField0_ & 0x00000004) != 0) { @@ -334,11 +334,11 @@ public final class RogueDialogueEventParamOuterClass { output.writeUInt32NoTag(argId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 16); output.writeSInt32NoTag(intValue); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeBoolNoTag(isValid); } } @@ -371,16 +371,16 @@ public final class RogueDialogueEventParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 37: { + case 101: { // ratio ratio = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 32) { break; } } - case 64: { + case 32: { // dialogueEventId dialogueEventId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -394,20 +394,20 @@ public final class RogueDialogueEventParamOuterClass { argId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 40) { + if (tag != 16) { break; } } - case 40: { + case 16: { // intValue intValue = input.readSInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 88) { + if (tag != 24) { break; } } - case 88: { + case 24: { // isValid isValid = input.readBool(); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java index 8be634a..ee3cde6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookAeonOuterClass.java @@ -20,40 +20,40 @@ public final class RogueHandbookAeonOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 exp = 1; - */ - private int exp; - - /** - * optional uint32 aeon_id = 8; - */ - private int aeonId; - - /** - * optional uint32 max_level = 9; + * optional uint32 max_level = 5; */ private int maxLevel; /** - * optional uint32 level = 13; + * optional uint32 level = 8; */ private int level; + /** + * optional uint32 aeon_id = 12; + */ + private int aeonId; + + /** + * optional uint32 exp = 13; + */ + private int exp; + /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_list = 2; */ private final RepeatedInt archiveUnlockList = RepeatedInt.newEmptyInstance(); /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_list = 15; */ private final RepeatedInt takenRewardList = RepeatedInt.newEmptyInstance(); @@ -68,99 +68,25 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 exp = 1; - * @return whether the exp field is set + * optional uint32 max_level = 5; + * @return whether the maxLevel field is set */ - public boolean hasExp() { + public boolean hasMaxLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 exp = 1; - * @return this - */ - public RogueHandbookAeon 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 RogueHandbookAeon setExp(final int value) { - bitField0_ |= 0x00000001; - exp = value; - return this; - } - - /** - * optional uint32 aeon_id = 8; - * @return whether the aeonId field is set - */ - public boolean hasAeonId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 aeon_id = 8; - * @return this - */ - public RogueHandbookAeon clearAeonId() { - bitField0_ &= ~0x00000002; - aeonId = 0; - return this; - } - - /** - * optional uint32 aeon_id = 8; - * @return the aeonId - */ - public int getAeonId() { - return aeonId; - } - - /** - * optional uint32 aeon_id = 8; - * @param value the aeonId to set - * @return this - */ - public RogueHandbookAeon setAeonId(final int value) { - bitField0_ |= 0x00000002; - aeonId = value; - return this; - } - - /** - * optional uint32 max_level = 9; - * @return whether the maxLevel field is set - */ - public boolean hasMaxLevel() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 max_level = 9; + * optional uint32 max_level = 5; * @return this */ public RogueHandbookAeon clearMaxLevel() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; maxLevel = 0; return this; } /** - * optional uint32 max_level = 9; + * optional uint32 max_level = 5; * @return the maxLevel */ public int getMaxLevel() { @@ -168,36 +94,36 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 max_level = 9; + * optional uint32 max_level = 5; * @param value the maxLevel to set * @return this */ public RogueHandbookAeon setMaxLevel(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; maxLevel = value; return this; } /** - * optional uint32 level = 13; + * optional uint32 level = 8; * @return whether the level field is set */ public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 level = 13; + * optional uint32 level = 8; * @return this */ public RogueHandbookAeon clearLevel() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; level = 0; return this; } /** - * optional uint32 level = 13; + * optional uint32 level = 8; * @return the level */ public int getLevel() { @@ -205,22 +131,96 @@ public final class RogueHandbookAeonOuterClass { } /** - * optional uint32 level = 13; + * optional uint32 level = 8; * @param value the level to set * @return this */ public RogueHandbookAeon setLevel(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; level = value; return this; } + /** + * optional uint32 aeon_id = 12; + * @return whether the aeonId field is set + */ + public boolean hasAeonId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 aeon_id = 12; + * @return this + */ + public RogueHandbookAeon clearAeonId() { + bitField0_ &= ~0x00000004; + aeonId = 0; + return this; + } + + /** + * optional uint32 aeon_id = 12; + * @return the aeonId + */ + public int getAeonId() { + return aeonId; + } + + /** + * optional uint32 aeon_id = 12; + * @param value the aeonId to set + * @return this + */ + public RogueHandbookAeon setAeonId(final int value) { + bitField0_ |= 0x00000004; + aeonId = value; + return this; + } + + /** + * optional uint32 exp = 13; + * @return whether the exp field is set + */ + public boolean hasExp() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 exp = 13; + * @return this + */ + public RogueHandbookAeon clearExp() { + bitField0_ &= ~0x00000008; + exp = 0; + return this; + } + + /** + * optional uint32 exp = 13; + * @return the exp + */ + public int getExp() { + return exp; + } + + /** + * optional uint32 exp = 13; + * @param value the exp to set + * @return this + */ + public RogueHandbookAeon setExp(final int value) { + bitField0_ |= 0x00000008; + exp = value; + return this; + } + /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_list = 2; * @return whether the archiveUnlockList field is set */ public boolean hasArchiveUnlockList() { @@ -229,10 +229,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_list = 2; * @return this */ public RogueHandbookAeon clearArchiveUnlockList() { @@ -243,10 +243,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_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. @@ -261,10 +261,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_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 @@ -279,10 +279,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_list = 2; * @param value the archiveUnlockList to add * @return this */ @@ -294,10 +294,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  IFCNJDJDNBL
+     *  FODOAOKIBLG
      *
* - * repeated uint32 archive_unlock_list = 3; + * repeated uint32 archive_unlock_list = 2; * @param values the archiveUnlockList to add * @return this */ @@ -309,10 +309,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_list = 15; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -321,10 +321,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_list = 15; * @return this */ public RogueHandbookAeon clearTakenRewardList() { @@ -335,10 +335,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_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. @@ -353,10 +353,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_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 @@ -371,10 +371,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_list = 15; * @param value the takenRewardList to add * @return this */ @@ -386,10 +386,10 @@ public final class RogueHandbookAeonOuterClass { /** * 
-     *  JNOHODCLONM
+     *  NJFMOEKGAHN
      *
* - * repeated uint32 taken_reward_list = 12; + * repeated uint32 taken_reward_list = 15; * @param values the takenRewardList to add * @return this */ @@ -404,10 +404,10 @@ public final class RogueHandbookAeonOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - exp = other.exp; - aeonId = other.aeonId; maxLevel = other.maxLevel; level = other.level; + aeonId = other.aeonId; + exp = other.exp; archiveUnlockList.copyFrom(other.archiveUnlockList); takenRewardList.copyFrom(other.takenRewardList); } @@ -420,18 +420,18 @@ public final class RogueHandbookAeonOuterClass { return this; } cachedSize = -1; - if (other.hasExp()) { - setExp(other.exp); - } - if (other.hasAeonId()) { - setAeonId(other.aeonId); - } if (other.hasMaxLevel()) { setMaxLevel(other.maxLevel); } if (other.hasLevel()) { setLevel(other.level); } + if (other.hasAeonId()) { + setAeonId(other.aeonId); + } + if (other.hasExp()) { + setExp(other.exp); + } if (other.hasArchiveUnlockList()) { getMutableArchiveUnlockList().addAll(other.archiveUnlockList); } @@ -448,10 +448,10 @@ public final class RogueHandbookAeonOuterClass { } cachedSize = -1; bitField0_ = 0; - exp = 0; - aeonId = 0; maxLevel = 0; level = 0; + aeonId = 0; + exp = 0; archiveUnlockList.clear(); takenRewardList.clear(); return this; @@ -479,10 +479,10 @@ public final class RogueHandbookAeonOuterClass { } RogueHandbookAeon other = (RogueHandbookAeon) o; return bitField0_ == other.bitField0_ - && (!hasExp() || exp == other.exp) - && (!hasAeonId() || aeonId == other.aeonId) && (!hasMaxLevel() || maxLevel == other.maxLevel) && (!hasLevel() || level == other.level) + && (!hasAeonId() || aeonId == other.aeonId) + && (!hasExp() || exp == other.exp) && (!hasArchiveUnlockList() || archiveUnlockList.equals(other.archiveUnlockList)) && (!hasTakenRewardList() || takenRewardList.equals(other.takenRewardList)); } @@ -490,30 +490,30 @@ public final class RogueHandbookAeonOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(exp); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(maxLevel); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 64); - output.writeUInt32NoTag(aeonId); + output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(maxLevel); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(aeonId); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(level); + output.writeUInt32NoTag(exp); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < archiveUnlockList.length(); i++) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(archiveUnlockList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(takenRewardList.array()[i]); } } @@ -523,17 +523,17 @@ public final class RogueHandbookAeonOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(maxLevel); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(level); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(exp); + } if ((bitField0_ & 0x00000010) != 0) { size += (1 * archiveUnlockList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(archiveUnlockList); } @@ -550,9 +550,9 @@ public final class RogueHandbookAeonOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // exp - exp = input.readUInt32(); + case 40: { + // maxLevel + maxLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 64) { @@ -560,17 +560,17 @@ public final class RogueHandbookAeonOuterClass { } } case 64: { - // aeonId - aeonId = input.readUInt32(); + // level + level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 72) { + if (tag != 96) { break; } } - case 72: { - // maxLevel - maxLevel = input.readUInt32(); + case 96: { + // aeonId + aeonId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 104) { @@ -578,24 +578,24 @@ public final class RogueHandbookAeonOuterClass { } } case 104: { - // level - level = input.readUInt32(); + // exp + exp = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 18) { break; } } - case 26: { + case 18: { // archiveUnlockList [packed=true] input.readPackedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 98) { + if (tag != 122) { break; } } - case 98: { + case 122: { // takenRewardList [packed=true] input.readPackedUInt32(takenRewardList, tag); bitField0_ |= 0x00000020; @@ -614,13 +614,13 @@ public final class RogueHandbookAeonOuterClass { tag = input.readTag(); break; } - case 24: { + case 16: { // archiveUnlockList [packed=false] tag = input.readRepeatedUInt32(archiveUnlockList, tag); bitField0_ |= 0x00000010; break; } - case 96: { + case 120: { // takenRewardList [packed=false] tag = input.readRepeatedUInt32(takenRewardList, tag); bitField0_ |= 0x00000020; @@ -634,17 +634,17 @@ public final class RogueHandbookAeonOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.exp, exp); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.aeonId, aeonId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.maxLevel, maxLevel); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.level, level); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.aeonId, aeonId); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.exp, exp); + } if ((bitField0_ & 0x00000010) != 0) { output.writeRepeatedUInt32(FieldNames.archiveUnlockList, archiveUnlockList); } @@ -661,10 +661,11 @@ public final class RogueHandbookAeonOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 100893: { - if (input.isAtField(FieldNames.exp)) { + case 390120576: + case -241235735: { + if (input.isAtField(FieldNames.maxLevel)) { if (!input.trySkipNullValue()) { - exp = input.readUInt32(); + maxLevel = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -672,23 +673,22 @@ public final class RogueHandbookAeonOuterClass { } break; } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } case -1421249154: case -1109029417: { if (input.isAtField(FieldNames.aeonId)) { if (!input.trySkipNullValue()) { aeonId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case 390120576: - case -241235735: { - if (input.isAtField(FieldNames.maxLevel)) { - if (!input.trySkipNullValue()) { - maxLevel = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -696,10 +696,10 @@ public final class RogueHandbookAeonOuterClass { } break; } - case 102865796: { - if (input.isAtField(FieldNames.level)) { + case 100893: { + if (input.isAtField(FieldNames.exp)) { if (!input.trySkipNullValue()) { - level = input.readUInt32(); + exp = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -784,14 +784,14 @@ public final class RogueHandbookAeonOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName exp = FieldName.forField("exp"); - - static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); - static final FieldName maxLevel = FieldName.forField("maxLevel", "max_level"); static final FieldName level = FieldName.forField("level"); + static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id"); + + static final FieldName exp = FieldName.forField("exp"); + static final FieldName archiveUnlockList = FieldName.forField("archiveUnlockList", "archive_unlock_list"); static final FieldName takenRewardList = FieldName.forField("takenRewardList", "taken_reward_list"); diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java index 6c95ee4..64952b3 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookBuffOuterClass.java @@ -19,7 +19,7 @@ public final class RogueHandbookBuffOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 15; */ private int buffId; @@ -34,7 +34,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 15; * @return whether the buffId field is set */ public boolean hasBuffId() { @@ -42,7 +42,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 15; * @return this */ public RogueHandbookBuff clearBuffId() { @@ -52,7 +52,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 15; * @return the buffId */ public int getBuffId() { @@ -60,7 +60,7 @@ public final class RogueHandbookBuffOuterClass { } /** - * optional uint32 buff_id = 5; + * optional uint32 buff_id = 15; * @param value the buffId to set * @return this */ @@ -129,7 +129,7 @@ public final class RogueHandbookBuffOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(buffId); } } @@ -150,7 +150,7 @@ public final class RogueHandbookBuffOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 120: { // buffId buffId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java index a629a1c..4b10bf6 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookDataOuterClass.java @@ -29,16 +29,16 @@ public final class RogueHandbookDataOuterClass { */ private final RepeatedMessage rogueAeonList = RepeatedMessage.newEmptyInstance(RogueHandbookAeonOuterClass.RogueHandbookAeon.getFactory()); + /** + * repeated .RogueHandbookBuff buff_list = 10; + */ + private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueHandbookBuffOuterClass.RogueHandbookBuff.getFactory()); + /** * repeated .RogueHandbookEvent rogue_event = 12; */ private final RepeatedMessage rogueEvent = RepeatedMessage.newEmptyInstance(RogueHandbookEventOuterClass.RogueHandbookEvent.getFactory()); - /** - * repeated .RogueHandbookBuff buff_list = 15; - */ - private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(RogueHandbookBuffOuterClass.RogueHandbookBuff.getFactory()); - private RogueHandbookData() { } @@ -191,12 +191,82 @@ public final class RogueHandbookDataOuterClass { return this; } + /** + * repeated .RogueHandbookBuff buff_list = 10; + * @return whether the buffList field is set + */ + public boolean hasBuffList() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated .RogueHandbookBuff buff_list = 10; + * @return this + */ + public RogueHandbookData clearBuffList() { + bitField0_ &= ~0x00000004; + buffList.clear(); + return this; + } + + /** + * repeated .RogueHandbookBuff 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. + * + * Use {@link #getMutableBuffList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getBuffList() { + return buffList; + } + + /** + * repeated .RogueHandbookBuff 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedMessage getMutableBuffList() { + bitField0_ |= 0x00000004; + return buffList; + } + + /** + * repeated .RogueHandbookBuff buff_list = 10; + * @param value the buffList to add + * @return this + */ + public RogueHandbookData addBuffList( + final RogueHandbookBuffOuterClass.RogueHandbookBuff value) { + bitField0_ |= 0x00000004; + buffList.add(value); + return this; + } + + /** + * repeated .RogueHandbookBuff buff_list = 10; + * @param values the buffList to add + * @return this + */ + public RogueHandbookData addAllBuffList( + final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) { + bitField0_ |= 0x00000004; + buffList.addAll(values); + return this; + } + /** * repeated .RogueHandbookEvent rogue_event = 12; * @return whether the rogueEvent field is set */ public boolean hasRogueEvent() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -204,7 +274,7 @@ public final class RogueHandbookDataOuterClass { * @return this */ public RogueHandbookData clearRogueEvent() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; rogueEvent.clear(); return this; } @@ -233,7 +303,7 @@ public final class RogueHandbookDataOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableRogueEvent() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return rogueEvent; } @@ -244,7 +314,7 @@ public final class RogueHandbookDataOuterClass { */ public RogueHandbookData addRogueEvent( final RogueHandbookEventOuterClass.RogueHandbookEvent value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; rogueEvent.add(value); return this; } @@ -256,81 +326,11 @@ public final class RogueHandbookDataOuterClass { */ public RogueHandbookData addAllRogueEvent( final RogueHandbookEventOuterClass.RogueHandbookEvent... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; rogueEvent.addAll(values); return this; } - /** - * repeated .RogueHandbookBuff buff_list = 15; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * repeated .RogueHandbookBuff buff_list = 15; - * @return this - */ - public RogueHandbookData clearBuffList() { - bitField0_ &= ~0x00000008; - buffList.clear(); - return this; - } - - /** - * repeated .RogueHandbookBuff 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. - * - * Use {@link #getMutableBuffList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBuffList() { - return buffList; - } - - /** - * repeated .RogueHandbookBuff 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RepeatedMessage getMutableBuffList() { - bitField0_ |= 0x00000008; - return buffList; - } - - /** - * repeated .RogueHandbookBuff buff_list = 15; - * @param value the buffList to add - * @return this - */ - public RogueHandbookData addBuffList( - final RogueHandbookBuffOuterClass.RogueHandbookBuff value) { - bitField0_ |= 0x00000008; - buffList.add(value); - return this; - } - - /** - * repeated .RogueHandbookBuff buff_list = 15; - * @param values the buffList to add - * @return this - */ - public RogueHandbookData addAllBuffList( - final RogueHandbookBuffOuterClass.RogueHandbookBuff... values) { - bitField0_ |= 0x00000008; - buffList.addAll(values); - return this; - } - @Override public RogueHandbookData copyFrom(final RogueHandbookData other) { cachedSize = other.cachedSize; @@ -338,8 +338,8 @@ public final class RogueHandbookDataOuterClass { bitField0_ = other.bitField0_; miracleList.copyFrom(other.miracleList); rogueAeonList.copyFrom(other.rogueAeonList); - rogueEvent.copyFrom(other.rogueEvent); buffList.copyFrom(other.buffList); + rogueEvent.copyFrom(other.rogueEvent); } return this; } @@ -356,12 +356,12 @@ public final class RogueHandbookDataOuterClass { if (other.hasRogueAeonList()) { getMutableRogueAeonList().addAll(other.rogueAeonList); } - if (other.hasRogueEvent()) { - getMutableRogueEvent().addAll(other.rogueEvent); - } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } + if (other.hasRogueEvent()) { + getMutableRogueEvent().addAll(other.rogueEvent); + } return this; } @@ -374,8 +374,8 @@ public final class RogueHandbookDataOuterClass { bitField0_ = 0; miracleList.clear(); rogueAeonList.clear(); - rogueEvent.clear(); buffList.clear(); + rogueEvent.clear(); return this; } @@ -388,8 +388,8 @@ public final class RogueHandbookDataOuterClass { bitField0_ = 0; miracleList.clearQuick(); rogueAeonList.clearQuick(); - rogueEvent.clearQuick(); buffList.clearQuick(); + rogueEvent.clearQuick(); return this; } @@ -405,8 +405,8 @@ public final class RogueHandbookDataOuterClass { return bitField0_ == other.bitField0_ && (!hasMiracleList() || miracleList.equals(other.miracleList)) && (!hasRogueAeonList() || rogueAeonList.equals(other.rogueAeonList)) - && (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent)) - && (!hasBuffList() || buffList.equals(other.buffList)); + && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasRogueEvent() || rogueEvent.equals(other.rogueEvent)); } @Override @@ -424,15 +424,15 @@ public final class RogueHandbookDataOuterClass { } } if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < rogueEvent.length(); i++) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(rogueEvent.get(i)); + for (int i = 0; i < buffList.length(); i++) { + output.writeRawByte((byte) 82); + output.writeMessageNoTag(buffList.get(i)); } } if ((bitField0_ & 0x00000008) != 0) { - for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(buffList.get(i)); + for (int i = 0; i < rogueEvent.length(); i++) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(rogueEvent.get(i)); } } } @@ -447,10 +447,10 @@ public final class RogueHandbookDataOuterClass { size += (1 * rogueAeonList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueAeonList); } if ((bitField0_ & 0x00000004) != 0) { - size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent); + size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } if ((bitField0_ & 0x00000008) != 0) { - size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); + size += (1 * rogueEvent.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(rogueEvent); } return size; } @@ -474,6 +474,14 @@ public final class RogueHandbookDataOuterClass { // rogueAeonList tag = input.readRepeatedMessage(rogueAeonList, tag); bitField0_ |= 0x00000002; + if (tag != 82) { + break; + } + } + case 82: { + // buffList + tag = input.readRepeatedMessage(buffList, tag); + bitField0_ |= 0x00000004; if (tag != 98) { break; } @@ -481,14 +489,6 @@ public final class RogueHandbookDataOuterClass { case 98: { // rogueEvent tag = input.readRepeatedMessage(rogueEvent, tag); - bitField0_ |= 0x00000004; - if (tag != 122) { - break; - } - } - case 122: { - // buffList - tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000008; if (tag != 0) { break; @@ -518,10 +518,10 @@ public final class RogueHandbookDataOuterClass { output.writeRepeatedMessage(FieldNames.rogueAeonList, rogueAeonList); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent); + output.writeRepeatedMessage(FieldNames.buffList, buffList); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.buffList, buffList); + output.writeRepeatedMessage(FieldNames.rogueEvent, rogueEvent); } output.endObject(); } @@ -557,11 +557,11 @@ public final class RogueHandbookDataOuterClass { } break; } - case -1148216096: - case -505804811: { - if (input.isAtField(FieldNames.rogueEvent)) { + case -1522789487: + case 55792906: { + if (input.isAtField(FieldNames.buffList)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(rogueEvent); + input.readRepeatedMessage(buffList); bitField0_ |= 0x00000004; } } else { @@ -569,11 +569,11 @@ public final class RogueHandbookDataOuterClass { } break; } - case -1522789487: - case 55792906: { - if (input.isAtField(FieldNames.buffList)) { + case -1148216096: + case -505804811: { + if (input.isAtField(FieldNames.rogueEvent)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(buffList); + input.readRepeatedMessage(rogueEvent); bitField0_ |= 0x00000008; } } else { @@ -638,9 +638,9 @@ public final class RogueHandbookDataOuterClass { static final FieldName rogueAeonList = FieldName.forField("rogueAeonList", "rogue_aeon_list"); - static final FieldName rogueEvent = FieldName.forField("rogueEvent", "rogue_event"); - static final FieldName buffList = FieldName.forField("buffList", "buff_list"); + + static final FieldName rogueEvent = FieldName.forField("rogueEvent", "rogue_event"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java index eccbb9c..3886d17 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookEventOuterClass.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; public final class RogueHandbookEventOuterClass { /** @@ -20,20 +19,15 @@ public final class RogueHandbookEventOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 event_id = 11; + * optional uint32 event_id = 15; */ private int eventId; /** - * optional bool is_unlocked = 14; + * optional bool is_unlocked = 1; */ private boolean isUnlocked; - /** - * repeated uint32 MDALHHJKHNJ = 13; - */ - private final RepeatedInt mDALHHJKHNJ = RepeatedInt.newEmptyInstance(); - private RogueHandbookEvent() { } @@ -45,7 +39,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 11; + * optional uint32 event_id = 15; * @return whether the eventId field is set */ public boolean hasEventId() { @@ -53,7 +47,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 11; + * optional uint32 event_id = 15; * @return this */ public RogueHandbookEvent clearEventId() { @@ -63,7 +57,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 11; + * optional uint32 event_id = 15; * @return the eventId */ public int getEventId() { @@ -71,7 +65,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional uint32 event_id = 11; + * optional uint32 event_id = 15; * @param value the eventId to set * @return this */ @@ -82,7 +76,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 14; + * optional bool is_unlocked = 1; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -90,7 +84,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 14; + * optional bool is_unlocked = 1; * @return this */ public RogueHandbookEvent clearIsUnlocked() { @@ -100,7 +94,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 14; + * optional bool is_unlocked = 1; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -108,7 +102,7 @@ public final class RogueHandbookEventOuterClass { } /** - * optional bool is_unlocked = 14; + * optional bool is_unlocked = 1; * @param value the isUnlocked to set * @return this */ @@ -118,74 +112,6 @@ public final class RogueHandbookEventOuterClass { return this; } - /** - * repeated uint32 MDALHHJKHNJ = 13; - * @return whether the mDALHHJKHNJ field is set - */ - public boolean hasMDALHHJKHNJ() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 MDALHHJKHNJ = 13; - * @return this - */ - public RogueHandbookEvent clearMDALHHJKHNJ() { - bitField0_ &= ~0x00000004; - mDALHHJKHNJ.clear(); - return this; - } - - /** - * repeated uint32 MDALHHJKHNJ = 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 #getMutableMDALHHJKHNJ()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getMDALHHJKHNJ() { - return mDALHHJKHNJ; - } - - /** - * repeated uint32 MDALHHJKHNJ = 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 getMutableMDALHHJKHNJ() { - bitField0_ |= 0x00000004; - return mDALHHJKHNJ; - } - - /** - * repeated uint32 MDALHHJKHNJ = 13; - * @param value the mDALHHJKHNJ to add - * @return this - */ - public RogueHandbookEvent addMDALHHJKHNJ(final int value) { - bitField0_ |= 0x00000004; - mDALHHJKHNJ.add(value); - return this; - } - - /** - * repeated uint32 MDALHHJKHNJ = 13; - * @param values the mDALHHJKHNJ to add - * @return this - */ - public RogueHandbookEvent addAllMDALHHJKHNJ(final int... values) { - bitField0_ |= 0x00000004; - mDALHHJKHNJ.addAll(values); - return this; - } - @Override public RogueHandbookEvent copyFrom(final RogueHandbookEvent other) { cachedSize = other.cachedSize; @@ -193,7 +119,6 @@ public final class RogueHandbookEventOuterClass { bitField0_ = other.bitField0_; eventId = other.eventId; isUnlocked = other.isUnlocked; - mDALHHJKHNJ.copyFrom(other.mDALHHJKHNJ); } return this; } @@ -210,9 +135,6 @@ public final class RogueHandbookEventOuterClass { if (other.hasIsUnlocked()) { setIsUnlocked(other.isUnlocked); } - if (other.hasMDALHHJKHNJ()) { - getMutableMDALHHJKHNJ().addAll(other.mDALHHJKHNJ); - } return this; } @@ -225,7 +147,6 @@ public final class RogueHandbookEventOuterClass { bitField0_ = 0; eventId = 0; isUnlocked = false; - mDALHHJKHNJ.clear(); return this; } @@ -236,7 +157,6 @@ public final class RogueHandbookEventOuterClass { } cachedSize = -1; bitField0_ = 0; - mDALHHJKHNJ.clear(); return this; } @@ -251,26 +171,19 @@ public final class RogueHandbookEventOuterClass { RogueHandbookEvent other = (RogueHandbookEvent) o; return bitField0_ == other.bitField0_ && (!hasEventId() || eventId == other.eventId) - && (!hasIsUnlocked() || isUnlocked == other.isUnlocked) - && (!hasMDALHHJKHNJ() || mDALHHJKHNJ.equals(other.mDALHHJKHNJ)); + && (!hasIsUnlocked() || isUnlocked == other.isUnlocked); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeBoolNoTag(isUnlocked); } - if ((bitField0_ & 0x00000004) != 0) { - for (int i = 0; i < mDALHHJKHNJ.length(); i++) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(mDALHHJKHNJ.array()[i]); - } - } } @Override @@ -282,9 +195,6 @@ public final class RogueHandbookEventOuterClass { if ((bitField0_ & 0x00000002) != 0) { size += 2; } - if ((bitField0_ & 0x00000004) != 0) { - size += (1 * mDALHHJKHNJ.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(mDALHHJKHNJ); - } return size; } @@ -295,29 +205,20 @@ public final class RogueHandbookEventOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // eventId eventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 8) { break; } } - case 112: { + case 8: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // mDALHHJKHNJ [packed=true] - input.readPackedUInt32(mDALHHJKHNJ, tag); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 0) { break; } @@ -332,12 +233,6 @@ public final class RogueHandbookEventOuterClass { tag = input.readTag(); break; } - case 104: { - // mDALHHJKHNJ [packed=false] - tag = input.readRepeatedUInt32(mDALHHJKHNJ, tag); - bitField0_ |= 0x00000004; - break; - } } } } @@ -351,9 +246,6 @@ public final class RogueHandbookEventOuterClass { if ((bitField0_ & 0x00000002) != 0) { output.writeBool(FieldNames.isUnlocked, isUnlocked); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRepeatedUInt32(FieldNames.mDALHHJKHNJ, mDALHHJKHNJ); - } output.endObject(); } @@ -388,17 +280,6 @@ public final class RogueHandbookEventOuterClass { } break; } - case -2007440415: { - if (input.isAtField(FieldNames.mDALHHJKHNJ)) { - if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(mDALHHJKHNJ); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } default: { input.skipUnknownField(); break; @@ -455,8 +336,6 @@ public final class RogueHandbookEventOuterClass { static final FieldName eventId = FieldName.forField("eventId", "event_id"); static final FieldName isUnlocked = FieldName.forField("isUnlocked", "is_unlocked"); - - static final FieldName mDALHHJKHNJ = FieldName.forField("MDALHHJKHNJ"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java index a5feccd..8c8bb3f 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueHandbookMiracleOuterClass.java @@ -19,12 +19,12 @@ public final class RogueHandbookMiracleOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 miracle_id = 11; + * optional uint32 miracle_id = 2; */ private int miracleId; /** - * optional bool is_unlocked = 3; + * optional bool is_unlocked = 12; */ private boolean isUnlocked; @@ -39,7 +39,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 11; + * optional uint32 miracle_id = 2; * @return whether the miracleId field is set */ public boolean hasMiracleId() { @@ -47,7 +47,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 11; + * optional uint32 miracle_id = 2; * @return this */ public RogueHandbookMiracle clearMiracleId() { @@ -57,7 +57,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 11; + * optional uint32 miracle_id = 2; * @return the miracleId */ public int getMiracleId() { @@ -65,7 +65,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional uint32 miracle_id = 11; + * optional uint32 miracle_id = 2; * @param value the miracleId to set * @return this */ @@ -76,7 +76,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 3; + * optional bool is_unlocked = 12; * @return whether the isUnlocked field is set */ public boolean hasIsUnlocked() { @@ -84,7 +84,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 3; + * optional bool is_unlocked = 12; * @return this */ public RogueHandbookMiracle clearIsUnlocked() { @@ -94,7 +94,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 3; + * optional bool is_unlocked = 12; * @return the isUnlocked */ public boolean getIsUnlocked() { @@ -102,7 +102,7 @@ public final class RogueHandbookMiracleOuterClass { } /** - * optional bool is_unlocked = 3; + * optional bool is_unlocked = 12; * @param value the isUnlocked to set * @return this */ @@ -177,11 +177,11 @@ public final class RogueHandbookMiracleOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeBoolNoTag(isUnlocked); } } @@ -205,16 +205,16 @@ public final class RogueHandbookMiracleOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // miracleId miracleId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 96) { break; } } - case 24: { + case 96: { // isUnlocked isUnlocked = input.readBool(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java index 8413d41..4f21479 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueInfoDataOuterClass.java @@ -19,29 +19,29 @@ public final class RogueInfoDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueAeonInfo rogue_aeon_info = 2; - */ - private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); - - /** - * optional .RogueAreaInfo rogue_area_info = 3; + * optional .RogueAreaInfo rogue_area_info = 5; */ private final RogueAreaInfoOuterClass.RogueAreaInfo rogueAreaInfo = RogueAreaInfoOuterClass.RogueAreaInfo.newInstance(); /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * 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 = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; */ private final RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo rogueVirtualItemInfo = RogueCurVirtualItemInfoOuterClass.RogueCurVirtualItemInfo.newInstance(); /** - * optional .RogueSeasonInfo rogue_season_info = 14; + * optional .RogueAeonInfo rogue_aeon_info = 11; */ - private final RogueSeasonInfoOuterClass.RogueSeasonInfo rogueSeasonInfo = RogueSeasonInfoOuterClass.RogueSeasonInfo.newInstance(); + private final RogueAeonInfoOuterClass.RogueAeonInfo rogueAeonInfo = RogueAeonInfoOuterClass.RogueAeonInfo.newInstance(); private RogueInfoData() { } @@ -54,82 +54,25 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAeonInfo rogue_aeon_info = 2; - * @return whether the rogueAeonInfo field is set + * optional .RogueAreaInfo rogue_area_info = 5; + * @return whether the rogueAreaInfo field is set */ - public boolean hasRogueAeonInfo() { + public boolean hasRogueAreaInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueAeonInfo rogue_aeon_info = 2; - * @return this - */ - public RogueInfoData clearRogueAeonInfo() { - bitField0_ &= ~0x00000001; - rogueAeonInfo.clear(); - return this; - } - - /** - * optional .RogueAeonInfo rogue_aeon_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 #getMutableRogueAeonInfo()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueAeonInfoOuterClass.RogueAeonInfo getRogueAeonInfo() { - return rogueAeonInfo; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 2; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { - bitField0_ |= 0x00000001; - return rogueAeonInfo; - } - - /** - * optional .RogueAeonInfo rogue_aeon_info = 2; - * @param value the rogueAeonInfo to set - * @return this - */ - public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { - bitField0_ |= 0x00000001; - rogueAeonInfo.copyFrom(value); - return this; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 3; - * @return whether the rogueAreaInfo field is set - */ - public boolean hasRogueAreaInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueAreaInfo rogue_area_info = 3; + * optional .RogueAreaInfo rogue_area_info = 5; * @return this */ public RogueInfoData clearRogueAreaInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rogueAreaInfo.clear(); return this; } /** - * optional .RogueAreaInfo rogue_area_info = 3; + * 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. @@ -143,7 +86,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueAreaInfo rogue_area_info = 3; + * 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 @@ -152,23 +95,80 @@ public final class RogueInfoDataOuterClass { * @return internal storage object for modifications */ public RogueAreaInfoOuterClass.RogueAreaInfo getMutableRogueAreaInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return rogueAreaInfo; } /** - * optional .RogueAreaInfo rogue_area_info = 3; + * optional .RogueAreaInfo rogue_area_info = 5; * @param value the rogueAreaInfo to set * @return this */ public RogueInfoData setRogueAreaInfo(final RogueAreaInfoOuterClass.RogueAreaInfo value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; rogueAreaInfo.copyFrom(value); return this; } /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * 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() { @@ -176,7 +176,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * @return this */ public RogueInfoData clearRogueScoreInfo() { @@ -186,7 +186,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * 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. @@ -200,7 +200,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * 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 @@ -214,7 +214,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueScoreRewardInfo rogue_score_info = 10; + * optional .RogueScoreRewardInfo rogue_score_info = 9; * @param value the rogueScoreInfo to set * @return this */ @@ -226,7 +226,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; * @return whether the rogueVirtualItemInfo field is set */ public boolean hasRogueVirtualItemInfo() { @@ -234,7 +234,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; * @return this */ public RogueInfoData clearRogueVirtualItemInfo() { @@ -244,7 +244,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_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. @@ -258,7 +258,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_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 @@ -273,7 +273,7 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 11; + * optional .RogueCurVirtualItemInfo rogue_virtual_item_info = 10; * @param value the rogueVirtualItemInfo to set * @return this */ @@ -285,39 +285,39 @@ public final class RogueInfoDataOuterClass { } /** - * optional .RogueSeasonInfo rogue_season_info = 14; - * @return whether the rogueSeasonInfo field is set + * optional .RogueAeonInfo rogue_aeon_info = 11; + * @return whether the rogueAeonInfo field is set */ - public boolean hasRogueSeasonInfo() { + public boolean hasRogueAeonInfo() { return (bitField0_ & 0x00000010) != 0; } /** - * optional .RogueSeasonInfo rogue_season_info = 14; + * optional .RogueAeonInfo rogue_aeon_info = 11; * @return this */ - public RogueInfoData clearRogueSeasonInfo() { + public RogueInfoData clearRogueAeonInfo() { bitField0_ &= ~0x00000010; - rogueSeasonInfo.clear(); + rogueAeonInfo.clear(); return this; } /** - * optional .RogueSeasonInfo rogue_season_info = 14; + * optional .RogueAeonInfo rogue_aeon_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 #getMutableRogueSeasonInfo()} if you want to modify it. + * Use {@link #getMutableRogueAeonInfo()} if you want to modify it. * * @return internal storage object for reading */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getRogueSeasonInfo() { - return rogueSeasonInfo; + public RogueAeonInfoOuterClass.RogueAeonInfo getRogueAeonInfo() { + return rogueAeonInfo; } /** - * optional .RogueSeasonInfo rogue_season_info = 14; + * optional .RogueAeonInfo rogue_aeon_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 @@ -325,19 +325,19 @@ public final class RogueInfoDataOuterClass { * * @return internal storage object for modifications */ - public RogueSeasonInfoOuterClass.RogueSeasonInfo getMutableRogueSeasonInfo() { + public RogueAeonInfoOuterClass.RogueAeonInfo getMutableRogueAeonInfo() { bitField0_ |= 0x00000010; - return rogueSeasonInfo; + return rogueAeonInfo; } /** - * optional .RogueSeasonInfo rogue_season_info = 14; - * @param value the rogueSeasonInfo to set + * optional .RogueAeonInfo rogue_aeon_info = 11; + * @param value the rogueAeonInfo to set * @return this */ - public RogueInfoData setRogueSeasonInfo(final RogueSeasonInfoOuterClass.RogueSeasonInfo value) { + public RogueInfoData setRogueAeonInfo(final RogueAeonInfoOuterClass.RogueAeonInfo value) { bitField0_ |= 0x00000010; - rogueSeasonInfo.copyFrom(value); + rogueAeonInfo.copyFrom(value); return this; } @@ -346,11 +346,11 @@ public final class RogueInfoDataOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueAeonInfo.copyFrom(other.rogueAeonInfo); rogueAreaInfo.copyFrom(other.rogueAreaInfo); + rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); rogueScoreInfo.copyFrom(other.rogueScoreInfo); rogueVirtualItemInfo.copyFrom(other.rogueVirtualItemInfo); - rogueSeasonInfo.copyFrom(other.rogueSeasonInfo); + rogueAeonInfo.copyFrom(other.rogueAeonInfo); } return this; } @@ -361,20 +361,20 @@ public final class RogueInfoDataOuterClass { return this; } cachedSize = -1; - if (other.hasRogueAeonInfo()) { - getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); - } if (other.hasRogueAreaInfo()) { getMutableRogueAreaInfo().mergeFrom(other.rogueAreaInfo); } + if (other.hasRogueSeasonInfo()) { + getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); + } if (other.hasRogueScoreInfo()) { getMutableRogueScoreInfo().mergeFrom(other.rogueScoreInfo); } if (other.hasRogueVirtualItemInfo()) { getMutableRogueVirtualItemInfo().mergeFrom(other.rogueVirtualItemInfo); } - if (other.hasRogueSeasonInfo()) { - getMutableRogueSeasonInfo().mergeFrom(other.rogueSeasonInfo); + if (other.hasRogueAeonInfo()) { + getMutableRogueAeonInfo().mergeFrom(other.rogueAeonInfo); } return this; } @@ -386,11 +386,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueAeonInfo.clear(); rogueAreaInfo.clear(); + rogueSeasonInfo.clear(); rogueScoreInfo.clear(); rogueVirtualItemInfo.clear(); - rogueSeasonInfo.clear(); + rogueAeonInfo.clear(); return this; } @@ -401,11 +401,11 @@ public final class RogueInfoDataOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueAeonInfo.clearQuick(); rogueAreaInfo.clearQuick(); + rogueSeasonInfo.clearQuick(); rogueScoreInfo.clearQuick(); rogueVirtualItemInfo.clearQuick(); - rogueSeasonInfo.clearQuick(); + rogueAeonInfo.clearQuick(); return this; } @@ -419,34 +419,34 @@ public final class RogueInfoDataOuterClass { } RogueInfoData other = (RogueInfoData) o; return bitField0_ == other.bitField0_ - && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)) && (!hasRogueAreaInfo() || rogueAreaInfo.equals(other.rogueAreaInfo)) + && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)) && (!hasRogueScoreInfo() || rogueScoreInfo.equals(other.rogueScoreInfo)) && (!hasRogueVirtualItemInfo() || rogueVirtualItemInfo.equals(other.rogueVirtualItemInfo)) - && (!hasRogueSeasonInfo() || rogueSeasonInfo.equals(other.rogueSeasonInfo)); + && (!hasRogueAeonInfo() || rogueAeonInfo.equals(other.rogueAeonInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(rogueAeonInfo); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 42); output.writeMessageNoTag(rogueAreaInfo); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(rogueSeasonInfo); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueScoreInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 82); output.writeMessageNoTag(rogueVirtualItemInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(rogueSeasonInfo); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(rogueAeonInfo); } } @@ -454,10 +454,10 @@ public final class RogueInfoDataOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAreaInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueScoreInfo); @@ -466,7 +466,7 @@ public final class RogueInfoDataOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(rogueVirtualItemInfo); } if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueSeasonInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAeonInfo); } return size; } @@ -478,45 +478,45 @@ public final class RogueInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // rogueAeonInfo - input.readMessage(rogueAeonInfo); + case 42: { + // rogueAreaInfo + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { - // rogueAreaInfo - input.readMessage(rogueAreaInfo); + case 58: { + // rogueSeasonInfo + input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { + // rogueScoreInfo + input.readMessage(rogueScoreInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 82) { break; } } case 82: { - // rogueScoreInfo - input.readMessage(rogueScoreInfo); - bitField0_ |= 0x00000004; + // rogueVirtualItemInfo + input.readMessage(rogueVirtualItemInfo); + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 90) { break; } } case 90: { - // rogueVirtualItemInfo - input.readMessage(rogueVirtualItemInfo); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { - // rogueSeasonInfo - input.readMessage(rogueSeasonInfo); + // rogueAeonInfo + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { @@ -541,10 +541,10 @@ public final class RogueInfoDataOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); + output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueAreaInfo, rogueAreaInfo); + output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.rogueScoreInfo, rogueScoreInfo); @@ -553,7 +553,7 @@ public final class RogueInfoDataOuterClass { output.writeMessage(FieldNames.rogueVirtualItemInfo, rogueVirtualItemInfo); } if ((bitField0_ & 0x00000010) != 0) { - output.writeMessage(FieldNames.rogueSeasonInfo, rogueSeasonInfo); + output.writeMessage(FieldNames.rogueAeonInfo, rogueAeonInfo); } output.endObject(); } @@ -565,11 +565,11 @@ public final class RogueInfoDataOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1685018549: - case -1375922619: { - if (input.isAtField(FieldNames.rogueAeonInfo)) { + case 964297429: + case -851505925: { + if (input.isAtField(FieldNames.rogueAreaInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueAeonInfo); + input.readMessage(rogueAreaInfo); bitField0_ |= 0x00000001; } } else { @@ -577,11 +577,11 @@ public final class RogueInfoDataOuterClass { } break; } - case 964297429: - case -851505925: { - if (input.isAtField(FieldNames.rogueAreaInfo)) { + case -1037341781: + case -588845659: { + if (input.isAtField(FieldNames.rogueSeasonInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueAreaInfo); + input.readMessage(rogueSeasonInfo); bitField0_ |= 0x00000002; } } else { @@ -613,11 +613,11 @@ public final class RogueInfoDataOuterClass { } break; } - case -1037341781: - case -588845659: { - if (input.isAtField(FieldNames.rogueSeasonInfo)) { + case -1685018549: + case -1375922619: { + if (input.isAtField(FieldNames.rogueAeonInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(rogueSeasonInfo); + input.readMessage(rogueAeonInfo); bitField0_ |= 0x00000010; } } else { @@ -677,15 +677,15 @@ public final class RogueInfoDataOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); - static final FieldName rogueAreaInfo = FieldName.forField("rogueAreaInfo", "rogue_area_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 rogueSeasonInfo = FieldName.forField("rogueSeasonInfo", "rogue_season_info"); + static final FieldName rogueAeonInfo = FieldName.forField("rogueAeonInfo", "rogue_aeon_info"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueInfoOuterClass.java index 89d3372..5efc45a 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 .RogueInfoData rogue_info_data = 806; - */ - private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); - - /** - * optional .RogueCurrentInfo rogue_current_info = 1236; + * optional .RogueCurrentInfo rogue_current_info = 363; */ private final RogueCurrentInfoOuterClass.RogueCurrentInfo rogueCurrentInfo = RogueCurrentInfoOuterClass.RogueCurrentInfo.newInstance(); + /** + * optional .RogueInfoData rogue_info_data = 470; + */ + private final RogueInfoDataOuterClass.RogueInfoData rogueInfoData = RogueInfoDataOuterClass.RogueInfoData.newInstance(); + private RogueInfo() { } @@ -39,82 +39,25 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueInfoData rogue_info_data = 806; - * @return whether the rogueInfoData field is set + * optional .RogueCurrentInfo rogue_current_info = 363; + * @return whether the rogueCurrentInfo field is set */ - public boolean hasRogueInfoData() { + public boolean hasRogueCurrentInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .RogueInfoData rogue_info_data = 806; - * @return this - */ - public RogueInfo clearRogueInfoData() { - bitField0_ &= ~0x00000001; - rogueInfoData.clear(); - return this; - } - - /** - * optional .RogueInfoData rogue_info_data = 806; - * - * This 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 #getMutableRogueInfoData()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RogueInfoDataOuterClass.RogueInfoData getRogueInfoData() { - return rogueInfoData; - } - - /** - * optional .RogueInfoData rogue_info_data = 806; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public RogueInfoDataOuterClass.RogueInfoData getMutableRogueInfoData() { - bitField0_ |= 0x00000001; - return rogueInfoData; - } - - /** - * optional .RogueInfoData rogue_info_data = 806; - * @param value the rogueInfoData to set - * @return this - */ - public RogueInfo setRogueInfoData(final RogueInfoDataOuterClass.RogueInfoData value) { - bitField0_ |= 0x00000001; - rogueInfoData.copyFrom(value); - return this; - } - - /** - * optional .RogueCurrentInfo rogue_current_info = 1236; - * @return whether the rogueCurrentInfo field is set - */ - public boolean hasRogueCurrentInfo() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional .RogueCurrentInfo rogue_current_info = 1236; + * optional .RogueCurrentInfo rogue_current_info = 363; * @return this */ public RogueInfo clearRogueCurrentInfo() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; rogueCurrentInfo.clear(); return this; } /** - * optional .RogueCurrentInfo rogue_current_info = 1236; + * 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. @@ -128,7 +71,7 @@ public final class RogueInfoOuterClass { } /** - * optional .RogueCurrentInfo rogue_current_info = 1236; + * 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 @@ -137,28 +80,85 @@ public final class RogueInfoOuterClass { * @return internal storage object for modifications */ public RogueCurrentInfoOuterClass.RogueCurrentInfo getMutableRogueCurrentInfo() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return rogueCurrentInfo; } /** - * optional .RogueCurrentInfo rogue_current_info = 1236; + * optional .RogueCurrentInfo rogue_current_info = 363; * @param value the rogueCurrentInfo to set * @return this */ public RogueInfo setRogueCurrentInfo(final RogueCurrentInfoOuterClass.RogueCurrentInfo value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public RogueInfo clearRogueInfoData() { + bitField0_ &= ~0x00000002; + rogueInfoData.clear(); + return this; + } + + /** + * optional .RogueInfoData rogue_info_data = 470; + * + * This 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 #getMutableRogueInfoData()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RogueInfoDataOuterClass.RogueInfoData getRogueInfoData() { + return rogueInfoData; + } + + /** + * optional .RogueInfoData rogue_info_data = 470; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RogueInfoDataOuterClass.RogueInfoData getMutableRogueInfoData() { + bitField0_ |= 0x00000002; + return rogueInfoData; + } + + /** + * optional .RogueInfoData rogue_info_data = 470; + * @param value the rogueInfoData to set + * @return this + */ + public RogueInfo setRogueInfoData(final RogueInfoDataOuterClass.RogueInfoData value) { + bitField0_ |= 0x00000002; + rogueInfoData.copyFrom(value); + return this; + } + @Override public RogueInfo copyFrom(final RogueInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - rogueInfoData.copyFrom(other.rogueInfoData); rogueCurrentInfo.copyFrom(other.rogueCurrentInfo); + rogueInfoData.copyFrom(other.rogueInfoData); } return this; } @@ -169,12 +169,12 @@ public final class RogueInfoOuterClass { return this; } cachedSize = -1; - if (other.hasRogueInfoData()) { - getMutableRogueInfoData().mergeFrom(other.rogueInfoData); - } if (other.hasRogueCurrentInfo()) { getMutableRogueCurrentInfo().mergeFrom(other.rogueCurrentInfo); } + if (other.hasRogueInfoData()) { + getMutableRogueInfoData().mergeFrom(other.rogueInfoData); + } return this; } @@ -185,8 +185,8 @@ public final class RogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueInfoData.clear(); rogueCurrentInfo.clear(); + rogueInfoData.clear(); return this; } @@ -197,8 +197,8 @@ public final class RogueInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - rogueInfoData.clearQuick(); rogueCurrentInfo.clearQuick(); + rogueInfoData.clearQuick(); return this; } @@ -212,19 +212,19 @@ public final class RogueInfoOuterClass { } RogueInfo other = (RogueInfo) o; return bitField0_ == other.bitField0_ - && (!hasRogueInfoData() || rogueInfoData.equals(other.rogueInfoData)) - && (!hasRogueCurrentInfo() || rogueCurrentInfo.equals(other.rogueCurrentInfo)); + && (!hasRogueCurrentInfo() || rogueCurrentInfo.equals(other.rogueCurrentInfo)) + && (!hasRogueInfoData() || rogueInfoData.equals(other.rogueInfoData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawLittleEndian16((short) 12978); - output.writeMessageNoTag(rogueInfoData); + output.writeRawLittleEndian16((short) 5850); + output.writeMessageNoTag(rogueCurrentInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawLittleEndian16((short) 19874); - output.writeMessageNoTag(rogueCurrentInfo); + output.writeRawLittleEndian16((short) 7602); + output.writeMessageNoTag(rogueInfoData); } } @@ -232,10 +232,10 @@ public final class RogueInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueInfoData); + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueCurrentInfo); } if ((bitField0_ & 0x00000002) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(rogueCurrentInfo); + size += 2 + ProtoSink.computeMessageSizeNoTag(rogueInfoData); } return size; } @@ -247,18 +247,18 @@ public final class RogueInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 6450: { - // rogueInfoData - input.readMessage(rogueInfoData); + case 2906: { + // rogueCurrentInfo + input.readMessage(rogueCurrentInfo); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 9890) { + if (tag != 3762) { break; } } - case 9890: { - // rogueCurrentInfo - input.readMessage(rogueCurrentInfo); + case 3762: { + // rogueInfoData + input.readMessage(rogueInfoData); 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.rogueInfoData, rogueInfoData); + output.writeMessage(FieldNames.rogueCurrentInfo, rogueCurrentInfo); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.rogueCurrentInfo, rogueCurrentInfo); + output.writeMessage(FieldNames.rogueInfoData, rogueInfoData); } output.endObject(); } @@ -298,11 +298,11 @@ public final class RogueInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -310,11 +310,11 @@ public final class RogueInfoOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -374,9 +374,9 @@ public final class RogueInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName rogueInfoData = FieldName.forField("rogueInfoData", "rogue_info_data"); - static final FieldName rogueCurrentInfo = FieldName.forField("rogueCurrentInfo", "rogue_current_info"); + + static final FieldName rogueInfoData = FieldName.forField("rogueInfoData", "rogue_info_data"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataInfoOuterClass.java index 7598e5b..8941507 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 miracle_id = 7; + * optional uint32 JFIPNOAJNJM = 1; + */ + private int jFIPNOAJNJM; + + /** + * optional uint32 IKPLEKFLPFF = 6; + */ + private int iKPLEKFLPFF; + + /** + * optional uint32 ODFNOGMKDOA = 9; + */ + private int oDFNOGMKDOA; + + /** + * optional uint32 miracle_id = 12; */ private int miracleId; /** - * optional uint32 MMFONFFPNJM = 8; + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; */ - private int mMFONFFPNJM; - - /** - * optional uint32 NKBEHFHLPEF = 11; - */ - private int nKBEHFHLPEF; - - /** - * optional uint32 DCLABPANBJG = 12; - */ - private int dCLABPANBJG; - - /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; - */ - private final RepeatedMessage kONAGCDHKKH = RepeatedMessage.newEmptyInstance(KONAGCDHKKHEntry.getFactory()); + private final RepeatedMessage dFKPIBCLGOP = RepeatedMessage.newEmptyInstance(DFKPIBCLGOPEntry.getFactory()); private RogueMiracleDataInfo() { } @@ -55,25 +55,136 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 miracle_id = 7; - * @return whether the miracleId field is set + * optional uint32 JFIPNOAJNJM = 1; + * @return whether the jFIPNOAJNJM field is set */ - public boolean hasMiracleId() { + public boolean hasJFIPNOAJNJM() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 miracle_id = 7; + * optional uint32 JFIPNOAJNJM = 1; + * @return this + */ + public RogueMiracleDataInfo clearJFIPNOAJNJM() { + bitField0_ &= ~0x00000001; + jFIPNOAJNJM = 0; + return this; + } + + /** + * optional uint32 JFIPNOAJNJM = 1; + * @return the jFIPNOAJNJM + */ + public int getJFIPNOAJNJM() { + return jFIPNOAJNJM; + } + + /** + * optional uint32 JFIPNOAJNJM = 1; + * @param value the jFIPNOAJNJM to set + * @return this + */ + public RogueMiracleDataInfo setJFIPNOAJNJM(final int value) { + bitField0_ |= 0x00000001; + jFIPNOAJNJM = value; + return this; + } + + /** + * optional uint32 IKPLEKFLPFF = 6; + * @return whether the iKPLEKFLPFF field is set + */ + public boolean hasIKPLEKFLPFF() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 IKPLEKFLPFF = 6; + * @return this + */ + public RogueMiracleDataInfo clearIKPLEKFLPFF() { + bitField0_ &= ~0x00000002; + iKPLEKFLPFF = 0; + return this; + } + + /** + * optional uint32 IKPLEKFLPFF = 6; + * @return the iKPLEKFLPFF + */ + public int getIKPLEKFLPFF() { + return iKPLEKFLPFF; + } + + /** + * optional uint32 IKPLEKFLPFF = 6; + * @param value the iKPLEKFLPFF to set + * @return this + */ + public RogueMiracleDataInfo setIKPLEKFLPFF(final int value) { + bitField0_ |= 0x00000002; + iKPLEKFLPFF = value; + return this; + } + + /** + * optional uint32 ODFNOGMKDOA = 9; + * @return whether the oDFNOGMKDOA field is set + */ + public boolean hasODFNOGMKDOA() { + 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; * @return this */ public RogueMiracleDataInfo clearMiracleId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000008; miracleId = 0; return this; } /** - * optional uint32 miracle_id = 7; + * optional uint32 miracle_id = 12; * @return the miracleId */ public int getMiracleId() { @@ -81,161 +192,50 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * optional uint32 miracle_id = 7; + * optional uint32 miracle_id = 12; * @param value the miracleId to set * @return this */ public RogueMiracleDataInfo setMiracleId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; miracleId = value; return this; } /** - * optional uint32 MMFONFFPNJM = 8; - * @return whether the mMFONFFPNJM field is set + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * @return whether the dFKPIBCLGOP field is set */ - public boolean hasMMFONFFPNJM() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 MMFONFFPNJM = 8; - * @return this - */ - public RogueMiracleDataInfo clearMMFONFFPNJM() { - bitField0_ &= ~0x00000002; - mMFONFFPNJM = 0; - return this; - } - - /** - * optional uint32 MMFONFFPNJM = 8; - * @return the mMFONFFPNJM - */ - public int getMMFONFFPNJM() { - return mMFONFFPNJM; - } - - /** - * optional uint32 MMFONFFPNJM = 8; - * @param value the mMFONFFPNJM to set - * @return this - */ - public RogueMiracleDataInfo setMMFONFFPNJM(final int value) { - bitField0_ |= 0x00000002; - mMFONFFPNJM = value; - return this; - } - - /** - * optional uint32 NKBEHFHLPEF = 11; - * @return whether the nKBEHFHLPEF field is set - */ - public boolean hasNKBEHFHLPEF() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 NKBEHFHLPEF = 11; - * @return this - */ - public RogueMiracleDataInfo clearNKBEHFHLPEF() { - bitField0_ &= ~0x00000004; - nKBEHFHLPEF = 0; - return this; - } - - /** - * optional uint32 NKBEHFHLPEF = 11; - * @return the nKBEHFHLPEF - */ - public int getNKBEHFHLPEF() { - return nKBEHFHLPEF; - } - - /** - * optional uint32 NKBEHFHLPEF = 11; - * @param value the nKBEHFHLPEF to set - * @return this - */ - public RogueMiracleDataInfo setNKBEHFHLPEF(final int value) { - bitField0_ |= 0x00000004; - nKBEHFHLPEF = value; - return this; - } - - /** - * optional uint32 DCLABPANBJG = 12; - * @return whether the dCLABPANBJG field is set - */ - public boolean hasDCLABPANBJG() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 DCLABPANBJG = 12; - * @return this - */ - public RogueMiracleDataInfo clearDCLABPANBJG() { - bitField0_ &= ~0x00000008; - dCLABPANBJG = 0; - return this; - } - - /** - * optional uint32 DCLABPANBJG = 12; - * @return the dCLABPANBJG - */ - public int getDCLABPANBJG() { - return dCLABPANBJG; - } - - /** - * optional uint32 DCLABPANBJG = 12; - * @param value the dCLABPANBJG to set - * @return this - */ - public RogueMiracleDataInfo setDCLABPANBJG(final int value) { - bitField0_ |= 0x00000008; - dCLABPANBJG = value; - return this; - } - - /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; - * @return whether the kONAGCDHKKH field is set - */ - public boolean hasKONAGCDHKKH() { + public boolean hasDFKPIBCLGOP() { return (bitField0_ & 0x00000010) != 0; } /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; * @return this */ - public RogueMiracleDataInfo clearKONAGCDHKKH() { + public RogueMiracleDataInfo clearDFKPIBCLGOP() { bitField0_ &= ~0x00000010; - kONAGCDHKKH.clear(); + dFKPIBCLGOP.clear(); return this; } /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 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 #getMutableKONAGCDHKKH()} if you want to modify it. + * Use {@link #getMutableDFKPIBCLGOP()} if you want to modify it. * * @return internal storage object for reading */ - public RepeatedMessage getKONAGCDHKKH() { - return kONAGCDHKKH; + public RepeatedMessage getDFKPIBCLGOP() { + return dFKPIBCLGOP; } /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 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 @@ -243,30 +243,30 @@ public final class RogueMiracleDataInfoOuterClass { * * @return internal storage object for modifications */ - public RepeatedMessage getMutableKONAGCDHKKH() { + public RepeatedMessage getMutableDFKPIBCLGOP() { bitField0_ |= 0x00000010; - return kONAGCDHKKH; + return dFKPIBCLGOP; } /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; - * @param value the kONAGCDHKKH to add + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * @param value the dFKPIBCLGOP to add * @return this */ - public RogueMiracleDataInfo addKONAGCDHKKH(final KONAGCDHKKHEntry value) { + public RogueMiracleDataInfo addDFKPIBCLGOP(final DFKPIBCLGOPEntry value) { bitField0_ |= 0x00000010; - kONAGCDHKKH.add(value); + dFKPIBCLGOP.add(value); return this; } /** - * repeated .RogueMiracleDataInfo.KONAGCDHKKHEntry KONAGCDHKKH = 15; - * @param values the kONAGCDHKKH to add + * repeated .RogueMiracleDataInfo.DFKPIBCLGOPEntry DFKPIBCLGOP = 14; + * @param values the dFKPIBCLGOP to add * @return this */ - public RogueMiracleDataInfo addAllKONAGCDHKKH(final KONAGCDHKKHEntry... values) { + public RogueMiracleDataInfo addAllDFKPIBCLGOP(final DFKPIBCLGOPEntry... values) { bitField0_ |= 0x00000010; - kONAGCDHKKH.addAll(values); + dFKPIBCLGOP.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; miracleId = other.miracleId; - mMFONFFPNJM = other.mMFONFFPNJM; - nKBEHFHLPEF = other.nKBEHFHLPEF; - dCLABPANBJG = other.dCLABPANBJG; - kONAGCDHKKH.copyFrom(other.kONAGCDHKKH); + dFKPIBCLGOP.copyFrom(other.dFKPIBCLGOP); } return this; } @@ -290,20 +290,20 @@ public final class RogueMiracleDataInfoOuterClass { return this; } cachedSize = -1; + if (other.hasJFIPNOAJNJM()) { + setJFIPNOAJNJM(other.jFIPNOAJNJM); + } + if (other.hasIKPLEKFLPFF()) { + setIKPLEKFLPFF(other.iKPLEKFLPFF); + } + if (other.hasODFNOGMKDOA()) { + setODFNOGMKDOA(other.oDFNOGMKDOA); + } if (other.hasMiracleId()) { setMiracleId(other.miracleId); } - if (other.hasMMFONFFPNJM()) { - setMMFONFFPNJM(other.mMFONFFPNJM); - } - if (other.hasNKBEHFHLPEF()) { - setNKBEHFHLPEF(other.nKBEHFHLPEF); - } - if (other.hasDCLABPANBJG()) { - setDCLABPANBJG(other.dCLABPANBJG); - } - if (other.hasKONAGCDHKKH()) { - getMutableKONAGCDHKKH().addAll(other.kONAGCDHKKH); + if (other.hasDFKPIBCLGOP()) { + getMutableDFKPIBCLGOP().addAll(other.dFKPIBCLGOP); } return this; } @@ -315,11 +315,11 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + jFIPNOAJNJM = 0; + iKPLEKFLPFF = 0; + oDFNOGMKDOA = 0; miracleId = 0; - mMFONFFPNJM = 0; - nKBEHFHLPEF = 0; - dCLABPANBJG = 0; - kONAGCDHKKH.clear(); + dFKPIBCLGOP.clear(); return this; } @@ -330,7 +330,7 @@ public final class RogueMiracleDataInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - kONAGCDHKKH.clearQuick(); + dFKPIBCLGOP.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) && (!hasMiracleId() || miracleId == other.miracleId) - && (!hasMMFONFFPNJM() || mMFONFFPNJM == other.mMFONFFPNJM) - && (!hasNKBEHFHLPEF() || nKBEHFHLPEF == other.nKBEHFHLPEF) - && (!hasDCLABPANBJG() || dCLABPANBJG == other.dCLABPANBJG) - && (!hasKONAGCDHKKH() || kONAGCDHKKH.equals(other.kONAGCDHKKH)); + && (!hasDFKPIBCLGOP() || dFKPIBCLGOP.equals(other.dFKPIBCLGOP)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(miracleId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(jFIPNOAJNJM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(mMFONFFPNJM); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(iKPLEKFLPFF); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(nKBEHFHLPEF); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(oDFNOGMKDOA); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(dCLABPANBJG); + output.writeUInt32NoTag(miracleId); } if ((bitField0_ & 0x00000010) != 0) { - for (int i = 0; i < kONAGCDHKKH.length(); i++) { - output.writeRawByte((byte) 122); - output.writeMessageNoTag(kONAGCDHKKH.get(i)); + for (int i = 0; i < dFKPIBCLGOP.length(); i++) { + output.writeRawByte((byte) 114); + output.writeMessageNoTag(dFKPIBCLGOP.get(i)); } } } @@ -381,19 +381,19 @@ public final class RogueMiracleDataInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(jFIPNOAJNJM); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mMFONFFPNJM); + size += 1 + ProtoSink.computeUInt32SizeNoTag(iKPLEKFLPFF); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(nKBEHFHLPEF); + size += 1 + ProtoSink.computeUInt32SizeNoTag(oDFNOGMKDOA); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(dCLABPANBJG); + size += 1 + ProtoSink.computeUInt32SizeNoTag(miracleId); } if ((bitField0_ & 0x00000010) != 0) { - size += (1 * kONAGCDHKKH.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(kONAGCDHKKH); + size += (1 * dFKPIBCLGOP.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dFKPIBCLGOP); } return size; } @@ -405,27 +405,27 @@ public final class RogueMiracleDataInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { - // miracleId - miracleId = input.readUInt32(); + case 8: { + // jFIPNOAJNJM + jFIPNOAJNJM = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 48) { break; } } - case 64: { - // mMFONFFPNJM - mMFONFFPNJM = input.readUInt32(); + case 48: { + // iKPLEKFLPFF + iKPLEKFLPFF = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { - // nKBEHFHLPEF - nKBEHFHLPEF = input.readUInt32(); + case 72: { + // oDFNOGMKDOA + oDFNOGMKDOA = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 96) { @@ -433,17 +433,17 @@ public final class RogueMiracleDataInfoOuterClass { } } case 96: { - // dCLABPANBJG - dCLABPANBJG = input.readUInt32(); + // miracleId + miracleId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 122) { + if (tag != 114) { break; } } - case 122: { - // kONAGCDHKKH - tag = input.readRepeatedMessage(kONAGCDHKKH, tag); + case 114: { + // dFKPIBCLGOP + tag = input.readRepeatedMessage(dFKPIBCLGOP, 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.miracleId, miracleId); + output.writeUInt32(FieldNames.jFIPNOAJNJM, jFIPNOAJNJM); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.mMFONFFPNJM, mMFONFFPNJM); + output.writeUInt32(FieldNames.iKPLEKFLPFF, iKPLEKFLPFF); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.nKBEHFHLPEF, nKBEHFHLPEF); + output.writeUInt32(FieldNames.oDFNOGMKDOA, oDFNOGMKDOA); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.dCLABPANBJG, dCLABPANBJG); + output.writeUInt32(FieldNames.miracleId, miracleId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.kONAGCDHKKH, kONAGCDHKKH); + output.writeRepeatedMessage(FieldNames.dFKPIBCLGOP, dFKPIBCLGOP); } output.endObject(); } @@ -491,11 +491,10 @@ public final class RogueMiracleDataInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -164571796: - case -806736983: { - if (input.isAtField(FieldNames.miracleId)) { + case 1019082596: { + if (input.isAtField(FieldNames.jFIPNOAJNJM)) { if (!input.trySkipNullValue()) { - miracleId = input.readUInt32(); + jFIPNOAJNJM = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -503,10 +502,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case 1974288326: { - if (input.isAtField(FieldNames.mMFONFFPNJM)) { + case -117523130: { + if (input.isAtField(FieldNames.iKPLEKFLPFF)) { if (!input.trySkipNullValue()) { - mMFONFFPNJM = input.readUInt32(); + iKPLEKFLPFF = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -514,10 +513,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case -2066312081: { - if (input.isAtField(FieldNames.nKBEHFHLPEF)) { + case -671364125: { + if (input.isAtField(FieldNames.oDFNOGMKDOA)) { if (!input.trySkipNullValue()) { - nKBEHFHLPEF = input.readUInt32(); + oDFNOGMKDOA = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -525,10 +524,11 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case 269276528: { - if (input.isAtField(FieldNames.dCLABPANBJG)) { + case -164571796: + case -806736983: { + if (input.isAtField(FieldNames.miracleId)) { if (!input.trySkipNullValue()) { - dCLABPANBJG = input.readUInt32(); + miracleId = input.readUInt32(); bitField0_ |= 0x00000008; } } else { @@ -536,10 +536,10 @@ public final class RogueMiracleDataInfoOuterClass { } break; } - case -1329612143: { - if (input.isAtField(FieldNames.kONAGCDHKKH)) { + case -916882785: { + if (input.isAtField(FieldNames.dFKPIBCLGOP)) { if (!input.trySkipNullValue()) { - input.readRepeatedMessage(kONAGCDHKKH); + input.readRepeatedMessage(dFKPIBCLGOP); bitField0_ |= 0x00000010; } } else { @@ -588,9 +588,9 @@ public final class RogueMiracleDataInfoOuterClass { } /** - * Protobuf type {@code KONAGCDHKKHEntry} + * Protobuf type {@code DFKPIBCLGOPEntry} */ - public static final class KONAGCDHKKHEntry extends ProtoMessage implements Cloneable { + public static final class DFKPIBCLGOPEntry extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; /** @@ -603,14 +603,14 @@ public final class RogueMiracleDataInfoOuterClass { */ private int value_; - private KONAGCDHKKHEntry() { + private DFKPIBCLGOPEntry() { } /** - * @return a new empty instance of {@code KONAGCDHKKHEntry} + * @return a new empty instance of {@code DFKPIBCLGOPEntry} */ - public static KONAGCDHKKHEntry newInstance() { - return new KONAGCDHKKHEntry(); + public static DFKPIBCLGOPEntry newInstance() { + return new DFKPIBCLGOPEntry(); } /** @@ -625,7 +625,7 @@ public final class RogueMiracleDataInfoOuterClass { * optional uint32 key = 1; * @return this */ - public KONAGCDHKKHEntry clearKey() { + public DFKPIBCLGOPEntry clearKey() { bitField0_ &= ~0x00000001; key = 0; return this; @@ -644,7 +644,7 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the key to set * @return this */ - public KONAGCDHKKHEntry setKey(final int value) { + public DFKPIBCLGOPEntry 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 KONAGCDHKKHEntry clearValue() { + public DFKPIBCLGOPEntry clearValue() { bitField0_ &= ~0x00000002; value_ = 0; return this; @@ -681,14 +681,14 @@ public final class RogueMiracleDataInfoOuterClass { * @param value the value_ to set * @return this */ - public KONAGCDHKKHEntry setValue(final int value) { + public DFKPIBCLGOPEntry setValue(final int value) { bitField0_ |= 0x00000002; value_ = value; return this; } @Override - public KONAGCDHKKHEntry copyFrom(final KONAGCDHKKHEntry other) { + public DFKPIBCLGOPEntry copyFrom(final DFKPIBCLGOPEntry other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; @@ -699,7 +699,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public KONAGCDHKKHEntry mergeFrom(final KONAGCDHKKHEntry other) { + public DFKPIBCLGOPEntry mergeFrom(final DFKPIBCLGOPEntry other) { if (other.isEmpty()) { return this; } @@ -714,7 +714,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public KONAGCDHKKHEntry clear() { + public DFKPIBCLGOPEntry clear() { if (isEmpty()) { return this; } @@ -726,7 +726,7 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public KONAGCDHKKHEntry clearQuick() { + public DFKPIBCLGOPEntry clearQuick() { if (isEmpty()) { return this; } @@ -740,10 +740,10 @@ public final class RogueMiracleDataInfoOuterClass { if (o == this) { return true; } - if (!(o instanceof KONAGCDHKKHEntry)) { + if (!(o instanceof DFKPIBCLGOPEntry)) { return false; } - KONAGCDHKKHEntry other = (KONAGCDHKKHEntry) o; + DFKPIBCLGOPEntry other = (DFKPIBCLGOPEntry) 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 KONAGCDHKKHEntry mergeFrom(final ProtoSource input) throws IOException { + public DFKPIBCLGOPEntry 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 KONAGCDHKKHEntry mergeFrom(final JsonSource input) throws IOException { + public DFKPIBCLGOPEntry mergeFrom(final JsonSource input) throws IOException { if (!input.beginObject()) { return this; } @@ -864,8 +864,8 @@ public final class RogueMiracleDataInfoOuterClass { } @Override - public KONAGCDHKKHEntry clone() { - return new KONAGCDHKKHEntry().copyFrom(this); + public DFKPIBCLGOPEntry clone() { + return new DFKPIBCLGOPEntry().copyFrom(this); } @Override @@ -873,32 +873,32 @@ public final class RogueMiracleDataInfoOuterClass { return ((bitField0_) == 0); } - public static KONAGCDHKKHEntry parseFrom(final byte[] data) throws + public static DFKPIBCLGOPEntry parseFrom(final byte[] data) throws InvalidProtocolBufferException { - return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), data).checkInitialized(); + return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), data).checkInitialized(); } - public static KONAGCDHKKHEntry parseFrom(final ProtoSource input) throws IOException { - return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized(); + public static DFKPIBCLGOPEntry parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), input).checkInitialized(); } - public static KONAGCDHKKHEntry parseFrom(final JsonSource input) throws IOException { - return ProtoMessage.mergeFrom(new KONAGCDHKKHEntry(), input).checkInitialized(); + public static DFKPIBCLGOPEntry parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new DFKPIBCLGOPEntry(), input).checkInitialized(); } /** - * @return factory for creating KONAGCDHKKHEntry messages + * @return factory for creating DFKPIBCLGOPEntry messages */ - public static MessageFactory getFactory() { - return KONAGCDHKKHEntryFactory.INSTANCE; + public static MessageFactory getFactory() { + return DFKPIBCLGOPEntryFactory.INSTANCE; } - private enum KONAGCDHKKHEntryFactory implements MessageFactory { + private enum DFKPIBCLGOPEntryFactory implements MessageFactory { INSTANCE; @Override - public KONAGCDHKKHEntry create() { - return KONAGCDHKKHEntry.newInstance(); + public DFKPIBCLGOPEntry create() { + return DFKPIBCLGOPEntry.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 iKPLEKFLPFF = FieldName.forField("IKPLEKFLPFF"); + + static final FieldName oDFNOGMKDOA = FieldName.forField("ODFNOGMKDOA"); + static final FieldName miracleId = FieldName.forField("miracleId", "miracle_id"); - static final FieldName mMFONFFPNJM = FieldName.forField("MMFONFFPNJM"); - - static final FieldName nKBEHFHLPEF = FieldName.forField("NKBEHFHLPEF"); - - static final FieldName dCLABPANBJG = FieldName.forField("DCLABPANBJG"); - - static final FieldName kONAGCDHKKH = FieldName.forField("KONAGCDHKKH"); + static final FieldName dFKPIBCLGOP = FieldName.forField("DFKPIBCLGOP"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java index 108216e..a80d51b 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueMiracleDataOuterClass.java @@ -19,7 +19,7 @@ public final class RogueMiracleDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 1; */ private final RogueMiracleOuterClass.RogueMiracle rogueMiracle = RogueMiracleOuterClass.RogueMiracle.newInstance(); @@ -34,7 +34,7 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 1; * @return whether the rogueMiracle field is set */ public boolean hasRogueMiracle() { @@ -42,7 +42,7 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 1; * @return this */ public RogueMiracleData clearRogueMiracle() { @@ -52,7 +52,7 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 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. @@ -66,7 +66,7 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 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 @@ -80,7 +80,7 @@ public final class RogueMiracleDataOuterClass { } /** - * optional .RogueMiracle rogue_miracle = 5; + * optional .RogueMiracle rogue_miracle = 1; * @param value the rogueMiracle to set * @return this */ @@ -150,7 +150,7 @@ public final class RogueMiracleDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 10); output.writeMessageNoTag(rogueMiracle); } } @@ -171,7 +171,7 @@ public final class RogueMiracleDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 10: { // 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 b2838da..f10df63 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 = 12; + * optional uint32 DMJLJNDFOGP = 1; */ private int dMJLJNDFOGP; /** - * optional uint32 KHBDIKDDIIB = 15; + * optional uint32 KHBDIKDDIIB = 2; */ private int kHBDIKDDIIB; /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; */ private final RepeatedMessage rogueMiracleList = RepeatedMessage.newEmptyInstance(RogueMiracleDataInfoOuterClass.RogueMiracleDataInfo.getFactory()); @@ -45,7 +45,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 DMJLJNDFOGP = 12; + * optional uint32 DMJLJNDFOGP = 1; * @return whether the dMJLJNDFOGP field is set */ public boolean hasDMJLJNDFOGP() { @@ -53,7 +53,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 DMJLJNDFOGP = 12; + * optional uint32 DMJLJNDFOGP = 1; * @return this */ public RogueMiracleInfoData clearDMJLJNDFOGP() { @@ -63,7 +63,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 DMJLJNDFOGP = 12; + * optional uint32 DMJLJNDFOGP = 1; * @return the dMJLJNDFOGP */ public int getDMJLJNDFOGP() { @@ -71,7 +71,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 DMJLJNDFOGP = 12; + * optional uint32 DMJLJNDFOGP = 1; * @param value the dMJLJNDFOGP to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 KHBDIKDDIIB = 15; + * optional uint32 KHBDIKDDIIB = 2; * @return whether the kHBDIKDDIIB field is set */ public boolean hasKHBDIKDDIIB() { @@ -90,7 +90,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 KHBDIKDDIIB = 15; + * optional uint32 KHBDIKDDIIB = 2; * @return this */ public RogueMiracleInfoData clearKHBDIKDDIIB() { @@ -100,7 +100,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 KHBDIKDDIIB = 15; + * optional uint32 KHBDIKDDIIB = 2; * @return the kHBDIKDDIIB */ public int getKHBDIKDDIIB() { @@ -108,7 +108,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * optional uint32 KHBDIKDDIIB = 15; + * optional uint32 KHBDIKDDIIB = 2; * @param value the kHBDIKDDIIB to set * @return this */ @@ -119,7 +119,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; * @return whether the rogueMiracleList field is set */ public boolean hasRogueMiracleList() { @@ -127,7 +127,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; * @return this */ public RogueMiracleInfoData clearRogueMiracleList() { @@ -137,7 +137,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo 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. @@ -152,7 +152,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo 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 @@ -167,7 +167,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; * @param value the rogueMiracleList to add * @return this */ @@ -179,7 +179,7 @@ public final class RogueMiracleInfoDataOuterClass { } /** - * repeated .RogueMiracleDataInfo rogue_miracle_list = 2; + * repeated .RogueMiracleDataInfo rogue_miracle_list = 10; * @param values the rogueMiracleList to add * @return this */ @@ -262,16 +262,16 @@ public final class RogueMiracleInfoDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(dMJLJNDFOGP); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(kHBDIKDDIIB); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < rogueMiracleList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(rogueMiracleList.get(i)); } } @@ -299,25 +299,25 @@ public final class RogueMiracleInfoDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 8: { // dMJLJNDFOGP dMJLJNDFOGP = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 16) { break; } } - case 120: { + case 16: { // kHBDIKDDIIB kHBDIKDDIIB = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // rogueMiracleList tag = input.readRepeatedMessage(rogueMiracleList, tag); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueMiracleInfoOuterClass.java index f21bcf3..d4876c1 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 = 10; + * optional .RogueMiracleInfoData rogue_miracle_info = 8; */ private final RogueMiracleInfoDataOuterClass.RogueMiracleInfoData rogueMiracleInfo = RogueMiracleInfoDataOuterClass.RogueMiracleInfoData.newInstance(); @@ -34,7 +34,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 10; + * optional .RogueMiracleInfoData rogue_miracle_info = 8; * @return whether the rogueMiracleInfo field is set */ public boolean hasRogueMiracleInfo() { @@ -42,7 +42,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 10; + * optional .RogueMiracleInfoData rogue_miracle_info = 8; * @return this */ public RogueMiracleInfo clearRogueMiracleInfo() { @@ -52,7 +52,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 10; + * optional .RogueMiracleInfoData 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. @@ -66,7 +66,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 10; + * optional .RogueMiracleInfoData 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 @@ -80,7 +80,7 @@ public final class RogueMiracleInfoOuterClass { } /** - * optional .RogueMiracleInfoData rogue_miracle_info = 10; + * optional .RogueMiracleInfoData rogue_miracle_info = 8; * @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) 82); + output.writeRawByte((byte) 66); output.writeMessageNoTag(rogueMiracleInfo); } } @@ -172,7 +172,7 @@ public final class RogueMiracleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 66: { // rogueMiracleInfo input.readMessage(rogueMiracleInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java index a97b47e..93d265f 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueRoomOuterClass.java @@ -19,25 +19,25 @@ public final class RogueRoomOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     * uint32 LELFKONOLPP = 4;
-     *
- * - * optional uint32 room_id = 2; - */ - private int roomId; - - /** - * optional uint32 site_id = 11; + * optional uint32 site_id = 5; */ private int siteId; /** * 
-     * RogueRoomStatus EPLFPIFPEEM = 8;
+     * uint32 LELFKONOLPP = 3;
      *
* - * optional .RogueRoomStatus room_status = 8; + * optional uint32 room_id = 15; + */ + private int roomId; + + /** + * 
+     * RogueRoomStatus OABFMKCFLGC = 10;
+     *
+ * + * optional .RogueRoomStatus room_status = 10; */ private int roomStatus; @@ -52,37 +52,74 @@ public final class RogueRoomOuterClass { } /** - * 
-     * uint32 LELFKONOLPP = 4;
-     *
- * - * optional uint32 room_id = 2; - * @return whether the roomId field is set + * optional uint32 site_id = 5; + * @return whether the siteId field is set */ - public boolean hasRoomId() { + public boolean hasSiteId() { return (bitField0_ & 0x00000001) != 0; } + /** + * optional uint32 site_id = 5; + * @return this + */ + public RogueRoom clearSiteId() { + bitField0_ &= ~0x00000001; + siteId = 0; + return this; + } + + /** + * optional uint32 site_id = 5; + * @return the siteId + */ + public int getSiteId() { + return siteId; + } + + /** + * optional uint32 site_id = 5; + * @param value the siteId to set + * @return this + */ + public RogueRoom setSiteId(final int value) { + bitField0_ |= 0x00000001; + siteId = value; + return this; + } + /** * 
-     * uint32 LELFKONOLPP = 4;
+     * uint32 LELFKONOLPP = 3;
      *
* - * optional uint32 room_id = 2; + * optional uint32 room_id = 15; + * @return whether the roomId field is set + */ + public boolean hasRoomId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     * uint32 LELFKONOLPP = 3;
+     *
+ * + * optional uint32 room_id = 15; * @return this */ public RogueRoom clearRoomId() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; roomId = 0; return this; } /** * 
-     * uint32 LELFKONOLPP = 4;
+     * uint32 LELFKONOLPP = 3;
      *
* - * optional uint32 room_id = 2; + * optional uint32 room_id = 15; * @return the roomId */ public int getRoomId() { @@ -91,62 +128,25 @@ public final class RogueRoomOuterClass { /** * 
-     * uint32 LELFKONOLPP = 4;
+     * uint32 LELFKONOLPP = 3;
      *
* - * optional uint32 room_id = 2; + * optional uint32 room_id = 15; * @param value the roomId to set * @return this */ public RogueRoom setRoomId(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; roomId = value; return this; } - /** - * optional uint32 site_id = 11; - * @return whether the siteId field is set - */ - public boolean hasSiteId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 site_id = 11; - * @return this - */ - public RogueRoom clearSiteId() { - bitField0_ &= ~0x00000002; - siteId = 0; - return this; - } - - /** - * optional uint32 site_id = 11; - * @return the siteId - */ - public int getSiteId() { - return siteId; - } - - /** - * optional uint32 site_id = 11; - * @param value the siteId to set - * @return this - */ - public RogueRoom setSiteId(final int value) { - bitField0_ |= 0x00000002; - siteId = value; - return this; - } - /** * 
-     * RogueRoomStatus EPLFPIFPEEM = 8;
+     * RogueRoomStatus OABFMKCFLGC = 10;
      *
* - * optional .RogueRoomStatus room_status = 8; + * optional .RogueRoomStatus room_status = 10; * @return whether the roomStatus field is set */ public boolean hasRoomStatus() { @@ -155,10 +155,10 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus EPLFPIFPEEM = 8;
+     * RogueRoomStatus OABFMKCFLGC = 10;
      *
* - * optional .RogueRoomStatus room_status = 8; + * optional .RogueRoomStatus room_status = 10; * @return this */ public RogueRoom clearRoomStatus() { @@ -169,10 +169,10 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus EPLFPIFPEEM = 8;
+     * RogueRoomStatus OABFMKCFLGC = 10;
      *
* - * optional .RogueRoomStatus room_status = 8; + * optional .RogueRoomStatus room_status = 10; * @return the roomStatus */ public RogueRoomStatusOuterClass.RogueRoomStatus getRoomStatus() { @@ -206,10 +206,10 @@ public final class RogueRoomOuterClass { /** * 
-     * RogueRoomStatus EPLFPIFPEEM = 8;
+     * RogueRoomStatus OABFMKCFLGC = 10;
      *
* - * optional .RogueRoomStatus room_status = 8; + * optional .RogueRoomStatus room_status = 10; * @param value the roomStatus to set * @return this */ @@ -224,8 +224,8 @@ public final class RogueRoomOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - roomId = other.roomId; siteId = other.siteId; + roomId = other.roomId; roomStatus = other.roomStatus; } return this; @@ -237,12 +237,12 @@ public final class RogueRoomOuterClass { return this; } cachedSize = -1; - if (other.hasRoomId()) { - setRoomId(other.roomId); - } if (other.hasSiteId()) { setSiteId(other.siteId); } + if (other.hasRoomId()) { + setRoomId(other.roomId); + } if (other.hasRoomStatus()) { setRoomStatusValue(other.roomStatus); } @@ -256,8 +256,8 @@ public final class RogueRoomOuterClass { } cachedSize = -1; bitField0_ = 0; - roomId = 0; siteId = 0; + roomId = 0; roomStatus = 0; return this; } @@ -282,23 +282,23 @@ public final class RogueRoomOuterClass { } RogueRoom other = (RogueRoom) o; return bitField0_ == other.bitField0_ - && (!hasRoomId() || roomId == other.roomId) && (!hasSiteId() || siteId == other.siteId) + && (!hasRoomId() || roomId == other.roomId) && (!hasRoomStatus() || roomStatus == other.roomStatus); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(roomId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(siteId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(roomId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeEnumNoTag(roomStatus); } } @@ -307,10 +307,10 @@ public final class RogueRoomOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(siteId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(roomId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeEnumSizeNoTag(roomStatus); @@ -325,25 +325,25 @@ public final class RogueRoomOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // roomId - roomId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { + case 40: { // siteId siteId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 120) { break; } } - case 64: { + case 120: { + // roomId + roomId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { // roomStatus final int value = input.readInt32(); if (RogueRoomStatusOuterClass.RogueRoomStatus.forNumber(value) != null) { @@ -373,10 +373,10 @@ public final class RogueRoomOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.roomId, roomId); + output.writeUInt32(FieldNames.siteId, siteId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.siteId, siteId); + output.writeUInt32(FieldNames.roomId, roomId); } if ((bitField0_ & 0x00000004) != 0) { output.writeEnum(FieldNames.roomStatus, roomStatus, RogueRoomStatusOuterClass.RogueRoomStatus.converter()); @@ -391,11 +391,11 @@ public final class RogueRoomOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -925319338: - case 1379892991: { - if (input.isAtField(FieldNames.roomId)) { + case -902090046: + case 2100001043: { + if (input.isAtField(FieldNames.siteId)) { if (!input.trySkipNullValue()) { - roomId = input.readUInt32(); + siteId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -403,11 +403,11 @@ public final class RogueRoomOuterClass { } break; } - case -902090046: - case 2100001043: { - if (input.isAtField(FieldNames.siteId)) { + case -925319338: + case 1379892991: { + if (input.isAtField(FieldNames.roomId)) { if (!input.trySkipNullValue()) { - siteId = input.readUInt32(); + roomId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -484,10 +484,10 @@ public final class RogueRoomOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName roomId = FieldName.forField("roomId", "room_id"); - static final FieldName siteId = FieldName.forField("siteId", "site_id"); + static final FieldName roomId = FieldName.forField("roomId", "room_id"); + static final FieldName roomStatus = FieldName.forField("roomStatus", "room_status"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java index 3427e3d..ab80127 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueScoreRewardInfoOuterClass.java @@ -20,37 +20,45 @@ public final class RogueScoreRewardInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 9; - */ - private long beginTime; - - /** - * optional int64 end_time = 15; + * 
+     *  ?
+     *
+ * + * optional int64 end_time = 4; */ private long endTime; /** - * optional uint32 score = 4; + * 
+     *  ?
+     *
+ * + * optional int64 begin_time = 12; */ - private int score; + private long beginTime; /** - * optional uint32 pool_id = 6; + * optional uint32 pool_id = 11; */ private int poolId; /** - * optional bool has_taken_initial_score = 11; + * optional uint32 score = 15; */ - private boolean hasTakenInitialScore; + private int score; /** - * optional bool pool_refreshed = 13; + * optional bool pool_refreshed = 6; */ private boolean poolRefreshed; /** - * repeated uint32 has_taken_reward = 7; + * optional bool has_taken_initial_score = 14; + */ + private boolean hasTakenInitialScore; + + /** + * repeated uint32 has_taken_reward = 5; */ private final RepeatedInt hasTakenReward = RepeatedInt.newEmptyInstance(); @@ -65,62 +73,37 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional int64 begin_time = 9; - * @return whether the beginTime field is set + * 
+     *  ?
+     *
+ * + * optional int64 end_time = 4; + * @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 RogueScoreRewardInfo 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 RogueScoreRewardInfo setBeginTime(final long value) { - bitField0_ |= 0x00000001; - beginTime = value; - return this; - } - - /** - * optional int64 end_time = 15; - * @return whether the endTime field is set - */ - public boolean hasEndTime() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional int64 end_time = 15; + * 
+     *  ?
+     *
+ * + * optional int64 end_time = 4; * @return this */ public RogueScoreRewardInfo clearEndTime() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; endTime = 0L; return this; } /** - * optional int64 end_time = 15; + * 
+     *  ?
+     *
+ * + * optional int64 end_time = 4; * @return the endTime */ public long getEndTime() { @@ -128,73 +111,93 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional int64 end_time = 15; + * 
+     *  ?
+     *
+ * + * optional int64 end_time = 4; * @param value the endTime to set * @return this */ public RogueScoreRewardInfo setEndTime(final long value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; endTime = value; return this; } /** - * optional uint32 score = 4; - * @return whether the score field is set + * 
+     *  ?
+     *
+ * + * optional int64 begin_time = 12; + * @return whether the beginTime field is set */ - public boolean hasScore() { + public boolean hasBeginTime() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  ?
+     *
+ * + * optional int64 begin_time = 12; + * @return this + */ + public RogueScoreRewardInfo clearBeginTime() { + bitField0_ &= ~0x00000002; + beginTime = 0L; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional int64 begin_time = 12; + * @return the beginTime + */ + public long getBeginTime() { + return beginTime; + } + + /** + * 
+     *  ?
+     *
+ * + * optional int64 begin_time = 12; + * @param value the beginTime to set + * @return this + */ + public RogueScoreRewardInfo setBeginTime(final long value) { + bitField0_ |= 0x00000002; + beginTime = value; + return this; + } + + /** + * optional uint32 pool_id = 11; + * @return whether the poolId field is set + */ + public boolean hasPoolId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 score = 4; - * @return this - */ - public RogueScoreRewardInfo clearScore() { - bitField0_ &= ~0x00000004; - score = 0; - return this; - } - - /** - * optional uint32 score = 4; - * @return the score - */ - public int getScore() { - return score; - } - - /** - * optional uint32 score = 4; - * @param value the score to set - * @return this - */ - public RogueScoreRewardInfo setScore(final int value) { - bitField0_ |= 0x00000004; - score = value; - return this; - } - - /** - * optional uint32 pool_id = 6; - * @return whether the poolId field is set - */ - public boolean hasPoolId() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 pool_id = 6; + * optional uint32 pool_id = 11; * @return this */ public RogueScoreRewardInfo clearPoolId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; poolId = 0; return this; } /** - * optional uint32 pool_id = 6; + * optional uint32 pool_id = 11; * @return the poolId */ public int getPoolId() { @@ -202,73 +205,73 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional uint32 pool_id = 6; + * optional uint32 pool_id = 11; * @param value the poolId to set * @return this */ public RogueScoreRewardInfo setPoolId(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; poolId = value; return this; } /** - * optional bool has_taken_initial_score = 11; - * @return whether the hasTakenInitialScore field is set + * optional uint32 score = 15; + * @return whether the score field is set */ - public boolean hasHasTakenInitialScore() { + public boolean hasScore() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 score = 15; + * @return this + */ + public RogueScoreRewardInfo clearScore() { + bitField0_ &= ~0x00000008; + score = 0; + return this; + } + + /** + * optional uint32 score = 15; + * @return the score + */ + public int getScore() { + return score; + } + + /** + * optional uint32 score = 15; + * @param value the score to set + * @return this + */ + public RogueScoreRewardInfo setScore(final int value) { + bitField0_ |= 0x00000008; + score = value; + return this; + } + + /** + * optional bool pool_refreshed = 6; + * @return whether the poolRefreshed field is set + */ + public boolean hasPoolRefreshed() { return (bitField0_ & 0x00000010) != 0; } /** - * optional bool has_taken_initial_score = 11; - * @return this - */ - public RogueScoreRewardInfo clearHasTakenInitialScore() { - bitField0_ &= ~0x00000010; - hasTakenInitialScore = false; - return this; - } - - /** - * optional bool has_taken_initial_score = 11; - * @return the hasTakenInitialScore - */ - public boolean getHasTakenInitialScore() { - return hasTakenInitialScore; - } - - /** - * optional bool has_taken_initial_score = 11; - * @param value the hasTakenInitialScore to set - * @return this - */ - public RogueScoreRewardInfo setHasTakenInitialScore(final boolean value) { - bitField0_ |= 0x00000010; - hasTakenInitialScore = value; - return this; - } - - /** - * optional bool pool_refreshed = 13; - * @return whether the poolRefreshed field is set - */ - public boolean hasPoolRefreshed() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional bool pool_refreshed = 13; + * optional bool pool_refreshed = 6; * @return this */ public RogueScoreRewardInfo clearPoolRefreshed() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; poolRefreshed = false; return this; } /** - * optional bool pool_refreshed = 13; + * optional bool pool_refreshed = 6; * @return the poolRefreshed */ public boolean getPoolRefreshed() { @@ -276,18 +279,55 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * optional bool pool_refreshed = 13; + * optional bool pool_refreshed = 6; * @param value the poolRefreshed to set * @return this */ public RogueScoreRewardInfo setPoolRefreshed(final boolean value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; poolRefreshed = value; return this; } /** - * repeated uint32 has_taken_reward = 7; + * 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; + * @return this + */ + public RogueScoreRewardInfo clearHasTakenInitialScore() { + bitField0_ &= ~0x00000020; + hasTakenInitialScore = false; + return this; + } + + /** + * optional bool has_taken_initial_score = 14; + * @return the hasTakenInitialScore + */ + public boolean getHasTakenInitialScore() { + return hasTakenInitialScore; + } + + /** + * optional bool has_taken_initial_score = 14; + * @param value the hasTakenInitialScore to set + * @return this + */ + public RogueScoreRewardInfo setHasTakenInitialScore(final boolean value) { + bitField0_ |= 0x00000020; + hasTakenInitialScore = value; + return this; + } + + /** + * repeated uint32 has_taken_reward = 5; * @return whether the hasTakenReward field is set */ public boolean hasHasTakenReward() { @@ -295,7 +335,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 7; + * repeated uint32 has_taken_reward = 5; * @return this */ public RogueScoreRewardInfo clearHasTakenReward() { @@ -305,7 +345,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 7; + * repeated uint32 has_taken_reward = 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. @@ -319,7 +359,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 7; + * repeated uint32 has_taken_reward = 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 @@ -333,7 +373,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 7; + * repeated uint32 has_taken_reward = 5; * @param value the hasTakenReward to add * @return this */ @@ -344,7 +384,7 @@ public final class RogueScoreRewardInfoOuterClass { } /** - * repeated uint32 has_taken_reward = 7; + * repeated uint32 has_taken_reward = 5; * @param values the hasTakenReward to add * @return this */ @@ -359,12 +399,12 @@ public final class RogueScoreRewardInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - beginTime = other.beginTime; endTime = other.endTime; - score = other.score; + beginTime = other.beginTime; poolId = other.poolId; - hasTakenInitialScore = other.hasTakenInitialScore; + score = other.score; poolRefreshed = other.poolRefreshed; + hasTakenInitialScore = other.hasTakenInitialScore; hasTakenReward.copyFrom(other.hasTakenReward); } return this; @@ -376,24 +416,24 @@ public final class RogueScoreRewardInfoOuterClass { return this; } cachedSize = -1; - if (other.hasBeginTime()) { - setBeginTime(other.beginTime); - } if (other.hasEndTime()) { setEndTime(other.endTime); } - if (other.hasScore()) { - setScore(other.score); + if (other.hasBeginTime()) { + setBeginTime(other.beginTime); } if (other.hasPoolId()) { setPoolId(other.poolId); } - if (other.hasHasTakenInitialScore()) { - setHasTakenInitialScore(other.hasTakenInitialScore); + if (other.hasScore()) { + setScore(other.score); } if (other.hasPoolRefreshed()) { setPoolRefreshed(other.poolRefreshed); } + if (other.hasHasTakenInitialScore()) { + setHasTakenInitialScore(other.hasTakenInitialScore); + } if (other.hasHasTakenReward()) { getMutableHasTakenReward().addAll(other.hasTakenReward); } @@ -407,12 +447,12 @@ public final class RogueScoreRewardInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - beginTime = 0L; endTime = 0L; - score = 0; + beginTime = 0L; poolId = 0; - hasTakenInitialScore = false; + score = 0; poolRefreshed = false; + hasTakenInitialScore = false; hasTakenReward.clear(); return this; } @@ -438,44 +478,44 @@ public final class RogueScoreRewardInfoOuterClass { } RogueScoreRewardInfo other = (RogueScoreRewardInfo) o; return bitField0_ == other.bitField0_ - && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) - && (!hasScore() || score == other.score) + && (!hasBeginTime() || beginTime == other.beginTime) && (!hasPoolId() || poolId == other.poolId) - && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) + && (!hasScore() || score == other.score) && (!hasPoolRefreshed() || poolRefreshed == other.poolRefreshed) + && (!hasHasTakenInitialScore() || hasTakenInitialScore == other.hasTakenInitialScore) && (!hasHasTakenReward() || hasTakenReward.equals(other.hasTakenReward)); } @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) 120); + output.writeRawByte((byte) 32); output.writeInt64NoTag(endTime); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(score); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 96); + output.writeInt64NoTag(beginTime); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 88); output.writeUInt32NoTag(poolId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(score); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); - output.writeBoolNoTag(hasTakenInitialScore); + output.writeRawByte((byte) 48); + output.writeBoolNoTag(poolRefreshed); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 104); - output.writeBoolNoTag(poolRefreshed); + output.writeRawByte((byte) 112); + output.writeBoolNoTag(hasTakenInitialScore); } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < hasTakenReward.length(); i++) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(hasTakenReward.array()[i]); } } @@ -485,16 +525,16 @@ public final class RogueScoreRewardInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeInt64SizeNoTag(endTime); } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeInt64SizeNoTag(beginTime); + } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + size += 1 + ProtoSink.computeUInt32SizeNoTag(poolId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(poolId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000010) != 0) { size += 2; @@ -515,61 +555,61 @@ public final class RogueScoreRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // beginTime - beginTime = input.readInt64(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 32: { // endTime endTime = input.readInt64(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // beginTime + beginTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // score - score = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // poolId - poolId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 88) { break; } } case 88: { - // hasTakenInitialScore - hasTakenInitialScore = input.readBool(); - bitField0_ |= 0x00000010; + // poolId + poolId = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { + // score + score = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // poolRefreshed poolRefreshed = input.readBool(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 58) { + if (tag != 112) { break; } } - case 58: { + case 112: { + // hasTakenInitialScore + hasTakenInitialScore = input.readBool(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { // hasTakenReward [packed=true] input.readPackedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -588,7 +628,7 @@ public final class RogueScoreRewardInfoOuterClass { tag = input.readTag(); break; } - case 56: { + case 40: { // hasTakenReward [packed=false] tag = input.readRepeatedUInt32(hasTakenReward, tag); bitField0_ |= 0x00000040; @@ -602,22 +642,22 @@ public final class RogueScoreRewardInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeInt64(FieldNames.beginTime, beginTime); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeInt64(FieldNames.endTime, endTime); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.score, score); + if ((bitField0_ & 0x00000002) != 0) { + output.writeInt64(FieldNames.beginTime, beginTime); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.poolId, poolId); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.score, score); + } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); + output.writeBool(FieldNames.poolRefreshed, poolRefreshed); } if ((bitField0_ & 0x00000020) != 0) { - output.writeBool(FieldNames.poolRefreshed, poolRefreshed); + output.writeBool(FieldNames.hasTakenInitialScore, hasTakenInitialScore); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedUInt32(FieldNames.hasTakenReward, hasTakenReward); @@ -632,11 +672,11 @@ public final class RogueScoreRewardInfoOuterClass { } 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 { @@ -644,11 +684,11 @@ public final class RogueScoreRewardInfoOuterClass { } 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 { @@ -656,35 +696,23 @@ public final class RogueScoreRewardInfoOuterClass { } break; } - case 109264530: { - if (input.isAtField(FieldNames.score)) { - if (!input.trySkipNullValue()) { - score = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case -982578601: case -395144162: { if (input.isAtField(FieldNames.poolId)) { if (!input.trySkipNullValue()) { poolId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); } break; } - case 1561171099: - case -1786836166: { - if (input.isAtField(FieldNames.hasTakenInitialScore)) { + case 109264530: { + if (input.isAtField(FieldNames.score)) { if (!input.trySkipNullValue()) { - hasTakenInitialScore = input.readBool(); - bitField0_ |= 0x00000010; + score = input.readUInt32(); + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -696,6 +724,18 @@ public final class RogueScoreRewardInfoOuterClass { if (input.isAtField(FieldNames.poolRefreshed)) { if (!input.trySkipNullValue()) { poolRefreshed = input.readBool(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1561171099: + case -1786836166: { + if (input.isAtField(FieldNames.hasTakenInitialScore)) { + if (!input.trySkipNullValue()) { + hasTakenInitialScore = input.readBool(); bitField0_ |= 0x00000020; } } else { @@ -768,18 +808,18 @@ public final class RogueScoreRewardInfoOuterClass { * 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 score = FieldName.forField("score"); + static final FieldName beginTime = FieldName.forField("beginTime", "begin_time"); static final FieldName poolId = FieldName.forField("poolId", "pool_id"); - static final FieldName hasTakenInitialScore = FieldName.forField("hasTakenInitialScore", "has_taken_initial_score"); + 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 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 f2879a6..23fa4d7 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 = 4; + * optional int64 begin_time = 8; */ private long beginTime; /** - * optional int64 end_time = 14; + * optional int64 end_time = 15; */ private long endTime; /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; */ private int seasonId; @@ -44,7 +44,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 4; + * optional int64 begin_time = 8; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -52,7 +52,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 4; + * optional int64 begin_time = 8; * @return this */ public RogueSeasonInfo clearBeginTime() { @@ -62,7 +62,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 4; + * optional int64 begin_time = 8; * @return the beginTime */ public long getBeginTime() { @@ -70,7 +70,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 begin_time = 4; + * optional int64 begin_time = 8; * @param value the beginTime to set * @return this */ @@ -81,7 +81,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 15; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -89,7 +89,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 15; * @return this */ public RogueSeasonInfo clearEndTime() { @@ -99,7 +99,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 15; * @return the endTime */ public long getEndTime() { @@ -107,7 +107,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional int64 end_time = 14; + * optional int64 end_time = 15; * @param value the endTime to set * @return this */ @@ -118,7 +118,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @return whether the seasonId field is set */ public boolean hasSeasonId() { @@ -126,7 +126,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @return this */ public RogueSeasonInfo clearSeasonId() { @@ -136,7 +136,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @return the seasonId */ public int getSeasonId() { @@ -144,7 +144,7 @@ public final class RogueSeasonInfoOuterClass { } /** - * optional uint32 season_id = 11; + * optional uint32 season_id = 5; * @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) 32); + output.writeRawByte((byte) 64); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 120); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(seasonId); } } @@ -260,25 +260,25 @@ public final class RogueSeasonInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 120) { break; } } - case 112: { + case 120: { // endTime endTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 88) { + if (tag != 40) { break; } } - case 88: { + case 40: { // 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 1173b47..da92435 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 modifier_effect_type = 4; - */ - private int modifierEffectType; - - /** - * optional uint32 board_event_id = 15; + * optional uint32 board_event_id = 4; */ private int boardEventId; + /** + * optional uint32 modifier_effect_type = 6; + */ + private int modifierEffectType; + private RogueSyncContextBoardEvent() { } @@ -39,62 +39,25 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 modifier_effect_type = 4; - * @return whether the modifierEffectType field is set + * optional uint32 board_event_id = 4; + * @return whether the boardEventId field is set */ - public boolean hasModifierEffectType() { + public boolean hasBoardEventId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 modifier_effect_type = 4; - * @return this - */ - public RogueSyncContextBoardEvent clearModifierEffectType() { - bitField0_ &= ~0x00000001; - modifierEffectType = 0; - return this; - } - - /** - * optional uint32 modifier_effect_type = 4; - * @return the modifierEffectType - */ - public int getModifierEffectType() { - return modifierEffectType; - } - - /** - * optional uint32 modifier_effect_type = 4; - * @param value the modifierEffectType to set - * @return this - */ - public RogueSyncContextBoardEvent setModifierEffectType(final int value) { - bitField0_ |= 0x00000001; - modifierEffectType = value; - return this; - } - - /** - * optional uint32 board_event_id = 15; - * @return whether the boardEventId field is set - */ - public boolean hasBoardEventId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 board_event_id = 15; + * optional uint32 board_event_id = 4; * @return this */ public RogueSyncContextBoardEvent clearBoardEventId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; boardEventId = 0; return this; } /** - * optional uint32 board_event_id = 15; + * optional uint32 board_event_id = 4; * @return the boardEventId */ public int getBoardEventId() { @@ -102,23 +65,60 @@ public final class RogueSyncContextBoardEventOuterClass { } /** - * optional uint32 board_event_id = 15; + * optional uint32 board_event_id = 4; * @param value the boardEventId to set * @return this */ public RogueSyncContextBoardEvent setBoardEventId(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public RogueSyncContextBoardEvent clearModifierEffectType() { + bitField0_ &= ~0x00000002; + modifierEffectType = 0; + return this; + } + + /** + * optional uint32 modifier_effect_type = 6; + * @return the modifierEffectType + */ + public int getModifierEffectType() { + return modifierEffectType; + } + + /** + * optional uint32 modifier_effect_type = 6; + * @param value the modifierEffectType to set + * @return this + */ + public RogueSyncContextBoardEvent setModifierEffectType(final int value) { + bitField0_ |= 0x00000002; + modifierEffectType = value; + return this; + } + @Override public RogueSyncContextBoardEvent copyFrom(final RogueSyncContextBoardEvent other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - modifierEffectType = other.modifierEffectType; boardEventId = other.boardEventId; + modifierEffectType = other.modifierEffectType; } return this; } @@ -129,12 +129,12 @@ public final class RogueSyncContextBoardEventOuterClass { return this; } cachedSize = -1; - if (other.hasModifierEffectType()) { - setModifierEffectType(other.modifierEffectType); - } if (other.hasBoardEventId()) { setBoardEventId(other.boardEventId); } + if (other.hasModifierEffectType()) { + setModifierEffectType(other.modifierEffectType); + } return this; } @@ -145,8 +145,8 @@ public final class RogueSyncContextBoardEventOuterClass { } cachedSize = -1; bitField0_ = 0; - modifierEffectType = 0; boardEventId = 0; + modifierEffectType = 0; return this; } @@ -170,19 +170,19 @@ public final class RogueSyncContextBoardEventOuterClass { } RogueSyncContextBoardEvent other = (RogueSyncContextBoardEvent) o; return bitField0_ == other.bitField0_ - && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType) - && (!hasBoardEventId() || boardEventId == other.boardEventId); + && (!hasBoardEventId() || boardEventId == other.boardEventId) + && (!hasModifierEffectType() || modifierEffectType == other.modifierEffectType); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(modifierEffectType); + output.writeUInt32NoTag(boardEventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); - output.writeUInt32NoTag(boardEventId); + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(modifierEffectType); } } @@ -190,10 +190,10 @@ public final class RogueSyncContextBoardEventOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); + size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(boardEventId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(modifierEffectType); } return size; } @@ -206,17 +206,17 @@ public final class RogueSyncContextBoardEventOuterClass { while (true) { switch (tag) { case 32: { - // modifierEffectType - modifierEffectType = input.readUInt32(); + // boardEventId + boardEventId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 48) { break; } } - case 120: { - // boardEventId - boardEventId = input.readUInt32(); + case 48: { + // modifierEffectType + modifierEffectType = 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.modifierEffectType, modifierEffectType); + output.writeUInt32(FieldNames.boardEventId, boardEventId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.boardEventId, boardEventId); + output.writeUInt32(FieldNames.modifierEffectType, modifierEffectType); } output.endObject(); } @@ -256,11 +256,11 @@ public final class RogueSyncContextBoardEventOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -268,11 +268,11 @@ public final class RogueSyncContextBoardEventOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -333,9 +333,9 @@ public final class RogueSyncContextBoardEventOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName modifierEffectType = FieldName.forField("modifierEffectType", "modifier_effect_type"); - static final FieldName boardEventId = FieldName.forField("boardEventId", "board_event_id"); + + static final FieldName modifierEffectType = FieldName.forField("modifierEffectType", "modifier_effect_type"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueTalentInfoOuterClass.java index ede8372..4e885b1 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 = 15; + * repeated .RogueTalent rogue_talent = 9; */ private final RepeatedMessage rogueTalent = RepeatedMessage.newEmptyInstance(RogueTalentOuterClass.RogueTalent.getFactory()); @@ -35,7 +35,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 9; * @return whether the rogueTalent field is set */ public boolean hasRogueTalent() { @@ -43,7 +43,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 9; * @return this */ public RogueTalentInfo clearRogueTalent() { @@ -53,7 +53,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 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 RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 9; * @param value the rogueTalent to add * @return this */ @@ -92,7 +92,7 @@ public final class RogueTalentInfoOuterClass { } /** - * repeated .RogueTalent rogue_talent = 15; + * repeated .RogueTalent rogue_talent = 9; * @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) 122); + output.writeRawByte((byte) 74); output.writeMessageNoTag(rogueTalent.get(i)); } } @@ -185,7 +185,7 @@ public final class RogueTalentInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 122: { + case 74: { // 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 894da47..8518829 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 = 12; + * optional uint32 talent_id = 8; */ private int talentId; /** - * optional .RogueTalentStatus status = 15; + * optional .RogueTalentStatus status = 5; */ private int status; /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_list = 3; */ private final RepeatedMessage unlockProgressList = RepeatedMessage.newEmptyInstance(RogueUnlockProgressOuterClass.RogueUnlockProgress.getFactory()); @@ -45,7 +45,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 8; * @return whether the talentId field is set */ public boolean hasTalentId() { @@ -53,7 +53,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 8; * @return this */ public RogueTalent clearTalentId() { @@ -63,7 +63,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 8; * @return the talentId */ public int getTalentId() { @@ -71,7 +71,7 @@ public final class RogueTalentOuterClass { } /** - * optional uint32 talent_id = 12; + * optional uint32 talent_id = 8; * @param value the talentId to set * @return this */ @@ -82,7 +82,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 15; + * optional .RogueTalentStatus status = 5; * @return whether the status field is set */ public boolean hasStatus() { @@ -90,7 +90,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 15; + * optional .RogueTalentStatus status = 5; * @return this */ public RogueTalent clearStatus() { @@ -100,7 +100,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 15; + * optional .RogueTalentStatus status = 5; * @return the status */ public RogueTalentStatusOuterClass.RogueTalentStatus getStatus() { @@ -133,7 +133,7 @@ public final class RogueTalentOuterClass { } /** - * optional .RogueTalentStatus status = 15; + * optional .RogueTalentStatus status = 5; * @param value the status to set * @return this */ @@ -144,7 +144,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @return whether the unlockProgressList field is set */ public boolean hasUnlockProgressList() { @@ -152,7 +152,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @return this */ public RogueTalent clearUnlockProgressList() { @@ -162,7 +162,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_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. @@ -177,7 +177,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_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 @@ -192,7 +192,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @param value the unlockProgressList to add * @return this */ @@ -204,7 +204,7 @@ public final class RogueTalentOuterClass { } /** - * repeated .RogueUnlockProgress unlock_progress_list = 13; + * repeated .RogueUnlockProgress unlock_progress_list = 3; * @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) 96); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(talentId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 40); output.writeEnumNoTag(status); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < unlockProgressList.length(); i++) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 26); output.writeMessageNoTag(unlockProgressList.get(i)); } } @@ -324,16 +324,16 @@ public final class RogueTalentOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 64: { // talentId talentId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 40) { break; } } - case 120: { + case 40: { // 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 != 106) { + if (tag != 26) { break; } } - case 106: { + case 26: { // 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 8227e1d..dbba100 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 progress = 9; - */ - private int progress; - - /** - * optional uint32 unlock_id = 13; + * optional uint32 unlock_id = 4; */ private int unlockId; /** - * optional bool finish = 15; + * optional uint32 progress = 15; + */ + private int progress; + + /** + * optional bool finish = 1; */ private boolean finish; @@ -44,62 +44,25 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 progress = 9; - * @return whether the progress field is set + * optional uint32 unlock_id = 4; + * @return whether the unlockId field is set */ - public boolean hasProgress() { + public boolean hasUnlockId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 progress = 9; - * @return this - */ - public RogueUnlockProgress clearProgress() { - bitField0_ &= ~0x00000001; - progress = 0; - return this; - } - - /** - * optional uint32 progress = 9; - * @return the progress - */ - public int getProgress() { - return progress; - } - - /** - * optional uint32 progress = 9; - * @param value the progress to set - * @return this - */ - public RogueUnlockProgress setProgress(final int value) { - bitField0_ |= 0x00000001; - progress = value; - return this; - } - - /** - * optional uint32 unlock_id = 13; - * @return whether the unlockId field is set - */ - public boolean hasUnlockId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 unlock_id = 13; + * optional uint32 unlock_id = 4; * @return this */ public RogueUnlockProgress clearUnlockId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; unlockId = 0; return this; } /** - * optional uint32 unlock_id = 13; + * optional uint32 unlock_id = 4; * @return the unlockId */ public int getUnlockId() { @@ -107,18 +70,55 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional uint32 unlock_id = 13; + * optional uint32 unlock_id = 4; * @param value the unlockId to set * @return this */ public RogueUnlockProgress setUnlockId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; unlockId = value; return this; } /** - * optional bool finish = 15; + * optional uint32 progress = 15; + * @return whether the progress field is set + */ + public boolean hasProgress() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 progress = 15; + * @return this + */ + public RogueUnlockProgress clearProgress() { + bitField0_ &= ~0x00000002; + progress = 0; + return this; + } + + /** + * optional uint32 progress = 15; + * @return the progress + */ + public int getProgress() { + return progress; + } + + /** + * optional uint32 progress = 15; + * @param value the progress to set + * @return this + */ + public RogueUnlockProgress setProgress(final int value) { + bitField0_ |= 0x00000002; + progress = value; + return this; + } + + /** + * optional bool finish = 1; * @return whether the finish field is set */ public boolean hasFinish() { @@ -126,7 +126,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 15; + * optional bool finish = 1; * @return this */ public RogueUnlockProgress clearFinish() { @@ -136,7 +136,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 15; + * optional bool finish = 1; * @return the finish */ public boolean getFinish() { @@ -144,7 +144,7 @@ public final class RogueUnlockProgressOuterClass { } /** - * optional bool finish = 15; + * optional bool finish = 1; * @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_; - progress = other.progress; unlockId = other.unlockId; + progress = other.progress; finish = other.finish; } return this; @@ -172,12 +172,12 @@ public final class RogueUnlockProgressOuterClass { return this; } cachedSize = -1; - if (other.hasProgress()) { - setProgress(other.progress); - } if (other.hasUnlockId()) { setUnlockId(other.unlockId); } + if (other.hasProgress()) { + setProgress(other.progress); + } if (other.hasFinish()) { setFinish(other.finish); } @@ -191,8 +191,8 @@ public final class RogueUnlockProgressOuterClass { } cachedSize = -1; bitField0_ = 0; - progress = 0; unlockId = 0; + progress = 0; finish = false; return this; } @@ -217,23 +217,23 @@ public final class RogueUnlockProgressOuterClass { } RogueUnlockProgress other = (RogueUnlockProgress) o; return bitField0_ == other.bitField0_ - && (!hasProgress() || progress == other.progress) && (!hasUnlockId() || unlockId == other.unlockId) + && (!hasProgress() || progress == other.progress) && (!hasFinish() || finish == other.finish); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(progress); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(unlockId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 120); + output.writeUInt32NoTag(progress); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 8); 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(progress); + size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(progress); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class RogueUnlockProgressOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // progress - progress = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { + case 32: { // unlockId unlockId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 120) { break; } } case 120: { + // progress + progress = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 8) { + break; + } + } + case 8: { // 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.progress, progress); + output.writeUInt32(FieldNames.unlockId, unlockId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.unlockId, unlockId); + output.writeUInt32(FieldNames.progress, progress); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.finish, finish); @@ -323,10 +323,11 @@ public final class RogueUnlockProgressOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -334,11 +335,10 @@ public final class RogueUnlockProgressOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -410,10 +410,10 @@ public final class RogueUnlockProgressOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName progress = FieldName.forField("progress"); - static final FieldName unlockId = FieldName.forField("unlockId", "unlock_id"); + static final FieldName progress = FieldName.forField("progress"); + static final FieldName finish = FieldName.forField("finish"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java index 7054d50..2bcadf5 100644 --- a/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RogueVirtualItemInfoOuterClass.java @@ -19,22 +19,11 @@ public final class RogueVirtualItemInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 JLGAKDGCBOH = 4; - */ - private int jLGAKDGCBOH; - - /** - * optional uint32 FGHILCKHDDO = 5; - */ - private int fGHILCKHDDO; - - /** - * optional uint32 LGFMKJAOICA = 11; - */ - private int lGFMKJAOICA; - - /** - * optional uint32 rogue_coin = 14; + * 
+     *  uint32 JLGAKDGCBOH = 7;
+     *
+ * + * optional uint32 rogue_coin = 8; */ private int rogueCoin; @@ -49,136 +38,37 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 JLGAKDGCBOH = 4; - * @return whether the jLGAKDGCBOH field is set + * 
+     *  uint32 JLGAKDGCBOH = 7;
+     *
+ * + * optional uint32 rogue_coin = 8; + * @return whether the rogueCoin field is set */ - public boolean hasJLGAKDGCBOH() { + public boolean hasRogueCoin() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 JLGAKDGCBOH = 4; - * @return this - */ - public RogueVirtualItemInfo clearJLGAKDGCBOH() { - bitField0_ &= ~0x00000001; - jLGAKDGCBOH = 0; - return this; - } - - /** - * optional uint32 JLGAKDGCBOH = 4; - * @return the jLGAKDGCBOH - */ - public int getJLGAKDGCBOH() { - return jLGAKDGCBOH; - } - - /** - * optional uint32 JLGAKDGCBOH = 4; - * @param value the jLGAKDGCBOH to set - * @return this - */ - public RogueVirtualItemInfo setJLGAKDGCBOH(final int value) { - bitField0_ |= 0x00000001; - jLGAKDGCBOH = value; - return this; - } - - /** - * optional uint32 FGHILCKHDDO = 5; - * @return whether the fGHILCKHDDO field is set - */ - public boolean hasFGHILCKHDDO() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 FGHILCKHDDO = 5; - * @return this - */ - public RogueVirtualItemInfo clearFGHILCKHDDO() { - bitField0_ &= ~0x00000002; - fGHILCKHDDO = 0; - return this; - } - - /** - * optional uint32 FGHILCKHDDO = 5; - * @return the fGHILCKHDDO - */ - public int getFGHILCKHDDO() { - return fGHILCKHDDO; - } - - /** - * optional uint32 FGHILCKHDDO = 5; - * @param value the fGHILCKHDDO to set - * @return this - */ - public RogueVirtualItemInfo setFGHILCKHDDO(final int value) { - bitField0_ |= 0x00000002; - fGHILCKHDDO = value; - return this; - } - - /** - * optional uint32 LGFMKJAOICA = 11; - * @return whether the lGFMKJAOICA field is set - */ - public boolean hasLGFMKJAOICA() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 LGFMKJAOICA = 11; - * @return this - */ - public RogueVirtualItemInfo clearLGFMKJAOICA() { - bitField0_ &= ~0x00000004; - lGFMKJAOICA = 0; - return this; - } - - /** - * optional uint32 LGFMKJAOICA = 11; - * @return the lGFMKJAOICA - */ - public int getLGFMKJAOICA() { - return lGFMKJAOICA; - } - - /** - * optional uint32 LGFMKJAOICA = 11; - * @param value the lGFMKJAOICA to set - * @return this - */ - public RogueVirtualItemInfo setLGFMKJAOICA(final int value) { - bitField0_ |= 0x00000004; - lGFMKJAOICA = value; - return this; - } - - /** - * optional uint32 rogue_coin = 14; - * @return whether the rogueCoin field is set - */ - public boolean hasRogueCoin() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rogue_coin = 14; + * 
+     *  uint32 JLGAKDGCBOH = 7;
+     *
+ * + * optional uint32 rogue_coin = 8; * @return this */ public RogueVirtualItemInfo clearRogueCoin() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000001; rogueCoin = 0; return this; } /** - * optional uint32 rogue_coin = 14; + * 
+     *  uint32 JLGAKDGCBOH = 7;
+     *
+ * + * optional uint32 rogue_coin = 8; * @return the rogueCoin */ public int getRogueCoin() { @@ -186,12 +76,16 @@ public final class RogueVirtualItemInfoOuterClass { } /** - * optional uint32 rogue_coin = 14; + * 
+     *  uint32 JLGAKDGCBOH = 7;
+     *
+ * + * optional uint32 rogue_coin = 8; * @param value the rogueCoin to set * @return this */ public RogueVirtualItemInfo setRogueCoin(final int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; rogueCoin = value; return this; } @@ -201,9 +95,6 @@ public final class RogueVirtualItemInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - jLGAKDGCBOH = other.jLGAKDGCBOH; - fGHILCKHDDO = other.fGHILCKHDDO; - lGFMKJAOICA = other.lGFMKJAOICA; rogueCoin = other.rogueCoin; } return this; @@ -215,15 +106,6 @@ public final class RogueVirtualItemInfoOuterClass { return this; } cachedSize = -1; - if (other.hasJLGAKDGCBOH()) { - setJLGAKDGCBOH(other.jLGAKDGCBOH); - } - if (other.hasFGHILCKHDDO()) { - setFGHILCKHDDO(other.fGHILCKHDDO); - } - if (other.hasLGFMKJAOICA()) { - setLGFMKJAOICA(other.lGFMKJAOICA); - } if (other.hasRogueCoin()) { setRogueCoin(other.rogueCoin); } @@ -237,9 +119,6 @@ public final class RogueVirtualItemInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - jLGAKDGCBOH = 0; - fGHILCKHDDO = 0; - lGFMKJAOICA = 0; rogueCoin = 0; return this; } @@ -264,28 +143,13 @@ public final class RogueVirtualItemInfoOuterClass { } RogueVirtualItemInfo other = (RogueVirtualItemInfo) o; return bitField0_ == other.bitField0_ - && (!hasJLGAKDGCBOH() || jLGAKDGCBOH == other.jLGAKDGCBOH) - && (!hasFGHILCKHDDO() || fGHILCKHDDO == other.fGHILCKHDDO) - && (!hasLGFMKJAOICA() || lGFMKJAOICA == other.lGFMKJAOICA) && (!hasRogueCoin() || rogueCoin == other.rogueCoin); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(jLGAKDGCBOH); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(fGHILCKHDDO); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(lGFMKJAOICA); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(rogueCoin); } } @@ -294,15 +158,6 @@ public final class RogueVirtualItemInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(jLGAKDGCBOH); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(fGHILCKHDDO); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(lGFMKJAOICA); - } - if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueCoin); } return size; @@ -315,37 +170,10 @@ public final class RogueVirtualItemInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // jLGAKDGCBOH - jLGAKDGCBOH = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // fGHILCKHDDO - fGHILCKHDDO = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // lGFMKJAOICA - lGFMKJAOICA = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 64: { // rogueCoin rogueCoin = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -369,15 +197,6 @@ public final class RogueVirtualItemInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.jLGAKDGCBOH, jLGAKDGCBOH); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.fGHILCKHDDO, fGHILCKHDDO); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.lGFMKJAOICA, lGFMKJAOICA); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.rogueCoin, rogueCoin); } output.endObject(); @@ -390,45 +209,12 @@ public final class RogueVirtualItemInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 110448746: { - if (input.isAtField(FieldNames.jLGAKDGCBOH)) { - if (!input.trySkipNullValue()) { - jLGAKDGCBOH = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case -196267399: { - if (input.isAtField(FieldNames.fGHILCKHDDO)) { - if (!input.trySkipNullValue()) { - fGHILCKHDDO = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1087946824: { - if (input.isAtField(FieldNames.lGFMKJAOICA)) { - if (!input.trySkipNullValue()) { - lGFMKJAOICA = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } case 655631243: case -1124761130: { if (input.isAtField(FieldNames.rogueCoin)) { if (!input.trySkipNullValue()) { rogueCoin = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -488,12 +274,6 @@ public final class RogueVirtualItemInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName jLGAKDGCBOH = FieldName.forField("JLGAKDGCBOH"); - - static final FieldName fGHILCKHDDO = FieldName.forField("FGHILCKHDDO"); - - static final FieldName lGFMKJAOICA = FieldName.forField("LGFMKJAOICA"); - static final FieldName rogueCoin = FieldName.forField("rogueCoin", "rogue_coin"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java index b9acc98..8fc32bc 100644 --- a/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotateMapCsReqOuterClass.java @@ -20,22 +20,22 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 4; */ private int groupId; /** - * optional uint32 unk_int = 7; + * optional uint32 unk_int = 5; */ private int unkInt; /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 12; */ private final NewMapRot rogueMap = NewMapRot.newInstance(); /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 15; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -50,7 +50,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 4; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -58,7 +58,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 4; * @return this */ public RotateMapCsReq clearGroupId() { @@ -68,7 +68,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 4; * @return the groupId */ public int getGroupId() { @@ -76,7 +76,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 group_id = 5; + * optional uint32 group_id = 4; * @param value the groupId to set * @return this */ @@ -87,7 +87,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 7; + * optional uint32 unk_int = 5; * @return whether the unkInt field is set */ public boolean hasUnkInt() { @@ -95,7 +95,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 7; + * optional uint32 unk_int = 5; * @return this */ public RotateMapCsReq clearUnkInt() { @@ -105,7 +105,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 7; + * optional uint32 unk_int = 5; * @return the unkInt */ public int getUnkInt() { @@ -113,7 +113,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional uint32 unk_int = 7; + * optional uint32 unk_int = 5; * @param value the unkInt to set * @return this */ @@ -124,7 +124,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 12; * @return whether the rogueMap field is set */ public boolean hasRogueMap() { @@ -132,7 +132,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 12; * @return this */ public RotateMapCsReq clearRogueMap() { @@ -142,7 +142,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 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. @@ -156,7 +156,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 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 @@ -170,7 +170,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .RotateMapCsReq.NewMapRot rogue_map = 6; + * optional .RotateMapCsReq.NewMapRot rogue_map = 12; * @param value the rogueMap to set * @return this */ @@ -181,7 +181,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 15; * @return whether the motion field is set */ public boolean hasMotion() { @@ -189,7 +189,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 15; * @return this */ public RotateMapCsReq clearMotion() { @@ -199,7 +199,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * 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. @@ -213,7 +213,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * 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 @@ -227,7 +227,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 15; * @param value the motion to set * @return this */ @@ -316,19 +316,19 @@ public final class RotateMapCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(unkInt); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 98); output.writeMessageNoTag(rogueMap); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 122); output.writeMessageNoTag(motion); } } @@ -358,34 +358,34 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 32: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 40) { break; } } - case 56: { + case 40: { // unkInt unkInt = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { - // rogueMap - input.readMessage(rogueMap); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 98) { break; } } case 98: { + // rogueMap + input.readMessage(rogueMap); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // motion input.readMessage(motion); bitField0_ |= 0x00000008; @@ -527,22 +527,22 @@ public final class RotateMapCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional float x = 8; + * optional float x = 7; */ private float x; /** - * optional float z = 10; - */ - private float z; - - /** - * optional float y = 11; + * optional float y = 9; */ private float y; /** - * optional float w = 12; + * optional float z = 13; + */ + private float z; + + /** + * optional float w = 15; */ private float w; @@ -557,7 +557,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 8; + * optional float x = 7; * @return whether the x field is set */ public boolean hasX() { @@ -565,7 +565,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 8; + * optional float x = 7; * @return this */ public Vector4 clearX() { @@ -575,7 +575,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 8; + * optional float x = 7; * @return the x */ public float getX() { @@ -583,7 +583,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float x = 8; + * optional float x = 7; * @param value the x to set * @return this */ @@ -594,62 +594,25 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float z = 10; - * @return whether the z field is set + * optional float y = 9; + * @return whether the y field is set */ - public boolean hasZ() { + public boolean hasY() { return (bitField0_ & 0x00000002) != 0; } /** - * optional float z = 10; - * @return this - */ - public Vector4 clearZ() { - bitField0_ &= ~0x00000002; - z = 0F; - return this; - } - - /** - * optional float z = 10; - * @return the z - */ - public float getZ() { - return z; - } - - /** - * optional float z = 10; - * @param value the z to set - * @return this - */ - public Vector4 setZ(final float value) { - bitField0_ |= 0x00000002; - z = value; - return this; - } - - /** - * optional float y = 11; - * @return whether the y field is set - */ - public boolean hasY() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional float y = 11; + * optional float y = 9; * @return this */ public Vector4 clearY() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; y = 0F; return this; } /** - * optional float y = 11; + * optional float y = 9; * @return the y */ public float getY() { @@ -657,18 +620,55 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float y = 11; + * optional float y = 9; * @param value the y to set * @return this */ public Vector4 setY(final float value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; y = value; return this; } /** - * optional float w = 12; + * optional float z = 13; + * @return whether the z field is set + */ + public boolean hasZ() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional float z = 13; + * @return this + */ + public Vector4 clearZ() { + bitField0_ &= ~0x00000004; + z = 0F; + return this; + } + + /** + * optional float z = 13; + * @return the z + */ + public float getZ() { + return z; + } + + /** + * optional float z = 13; + * @param value the z to set + * @return this + */ + public Vector4 setZ(final float value) { + bitField0_ |= 0x00000004; + z = value; + return this; + } + + /** + * optional float w = 15; * @return whether the w field is set */ public boolean hasW() { @@ -676,7 +676,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float w = 12; + * optional float w = 15; * @return this */ public Vector4 clearW() { @@ -686,7 +686,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float w = 12; + * optional float w = 15; * @return the w */ public float getW() { @@ -694,7 +694,7 @@ public final class RotateMapCsReqOuterClass { } /** - * optional float w = 12; + * optional float w = 15; * @param value the w to set * @return this */ @@ -710,8 +710,8 @@ public final class RotateMapCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; x = other.x; - z = other.z; y = other.y; + z = other.z; w = other.w; } return this; @@ -726,12 +726,12 @@ public final class RotateMapCsReqOuterClass { if (other.hasX()) { setX(other.x); } - if (other.hasZ()) { - setZ(other.z); - } if (other.hasY()) { setY(other.y); } + if (other.hasZ()) { + setZ(other.z); + } if (other.hasW()) { setW(other.w); } @@ -746,8 +746,8 @@ public final class RotateMapCsReqOuterClass { cachedSize = -1; bitField0_ = 0; x = 0F; - z = 0F; y = 0F; + z = 0F; w = 0F; return this; } @@ -773,27 +773,27 @@ public final class RotateMapCsReqOuterClass { Vector4 other = (Vector4) o; return bitField0_ == other.bitField0_ && (!hasX() || ProtoUtil.isEqual(x, other.x)) - && (!hasZ() || ProtoUtil.isEqual(z, other.z)) && (!hasY() || ProtoUtil.isEqual(y, other.y)) + && (!hasZ() || ProtoUtil.isEqual(z, other.z)) && (!hasW() || ProtoUtil.isEqual(w, other.w)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 69); + output.writeRawByte((byte) 61); output.writeFloatNoTag(x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 85); - output.writeFloatNoTag(z); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 93); + output.writeRawByte((byte) 77); output.writeFloatNoTag(y); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 109); + output.writeFloatNoTag(z); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 101); + output.writeRawByte((byte) 125); output.writeFloatNoTag(w); } } @@ -823,34 +823,34 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 69: { + case 61: { // x x = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 85) { + if (tag != 77) { break; } } - case 85: { - // z - z = input.readFloat(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 93) { - break; - } - } - case 93: { + case 77: { // y y = input.readFloat(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 101) { + if (tag != 109) { break; } } - case 101: { + case 109: { + // z + z = input.readFloat(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 125) { + break; + } + } + case 125: { // w w = input.readFloat(); bitField0_ |= 0x00000008; @@ -880,10 +880,10 @@ public final class RotateMapCsReqOuterClass { output.writeFloat(FieldNames.x, x); } if ((bitField0_ & 0x00000002) != 0) { - output.writeFloat(FieldNames.z, z); + output.writeFloat(FieldNames.y, y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeFloat(FieldNames.y, y); + output.writeFloat(FieldNames.z, z); } if ((bitField0_ & 0x00000008) != 0) { output.writeFloat(FieldNames.w, w); @@ -909,10 +909,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 122: { - if (input.isAtField(FieldNames.z)) { + case 121: { + if (input.isAtField(FieldNames.y)) { if (!input.trySkipNullValue()) { - z = input.readFloat(); + y = input.readFloat(); bitField0_ |= 0x00000002; } } else { @@ -920,10 +920,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 121: { - if (input.isAtField(FieldNames.y)) { + case 122: { + if (input.isAtField(FieldNames.z)) { if (!input.trySkipNullValue()) { - y = input.readFloat(); + z = input.readFloat(); bitField0_ |= 0x00000004; } } else { @@ -996,10 +996,10 @@ public final class RotateMapCsReqOuterClass { static class FieldNames { static final FieldName x = FieldName.forField("x"); - static final FieldName z = FieldName.forField("z"); - static final FieldName y = FieldName.forField("y"); + static final FieldName z = FieldName.forField("z"); + static final FieldName w = FieldName.forField("w"); } } @@ -1010,16 +1010,16 @@ public final class RotateMapCsReqOuterClass { public static final class NewMapRot extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional .Vector vector3 = 2; - */ - private final VectorOuterClass.Vector vector3 = VectorOuterClass.Vector.newInstance(); - /** * optional .RotateMapCsReq.Vector4 vector4 = 10; */ private final Vector4 vector4 = Vector4.newInstance(); + /** + * optional .Vector vector3 = 15; + */ + private final VectorOuterClass.Vector vector3 = VectorOuterClass.Vector.newInstance(); + private NewMapRot() { } @@ -1030,69 +1030,12 @@ public final class RotateMapCsReqOuterClass { return new NewMapRot(); } - /** - * optional .Vector vector3 = 2; - * @return whether the vector3 field is set - */ - public boolean hasVector3() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional .Vector vector3 = 2; - * @return this - */ - public NewMapRot clearVector3() { - bitField0_ &= ~0x00000001; - vector3.clear(); - return this; - } - - /** - * optional .Vector vector3 = 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 #getMutableVector3()} if you want to modify it. - * - * @return internal storage object for reading - */ - public VectorOuterClass.Vector getVector3() { - return vector3; - } - - /** - * optional .Vector vector3 = 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 VectorOuterClass.Vector getMutableVector3() { - bitField0_ |= 0x00000001; - return vector3; - } - - /** - * optional .Vector vector3 = 2; - * @param value the vector3 to set - * @return this - */ - public NewMapRot setVector3(final VectorOuterClass.Vector value) { - bitField0_ |= 0x00000001; - vector3.copyFrom(value); - return this; - } - /** * optional .RotateMapCsReq.Vector4 vector4 = 10; * @return whether the vector4 field is set */ public boolean hasVector4() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -1100,7 +1043,7 @@ public final class RotateMapCsReqOuterClass { * @return this */ public NewMapRot clearVector4() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; vector4.clear(); return this; } @@ -1129,7 +1072,7 @@ public final class RotateMapCsReqOuterClass { * @return internal storage object for modifications */ public Vector4 getMutableVector4() { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return vector4; } @@ -1139,18 +1082,75 @@ public final class RotateMapCsReqOuterClass { * @return this */ public NewMapRot setVector4(final Vector4 value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; vector4.copyFrom(value); return this; } + /** + * optional .Vector vector3 = 15; + * @return whether the vector3 field is set + */ + public boolean hasVector3() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .Vector vector3 = 15; + * @return this + */ + public NewMapRot clearVector3() { + bitField0_ &= ~0x00000002; + vector3.clear(); + return this; + } + + /** + * optional .Vector vector3 = 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 #getMutableVector3()} if you want to modify it. + * + * @return internal storage object for reading + */ + public VectorOuterClass.Vector getVector3() { + return vector3; + } + + /** + * optional .Vector vector3 = 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 VectorOuterClass.Vector getMutableVector3() { + bitField0_ |= 0x00000002; + return vector3; + } + + /** + * optional .Vector vector3 = 15; + * @param value the vector3 to set + * @return this + */ + public NewMapRot setVector3(final VectorOuterClass.Vector value) { + bitField0_ |= 0x00000002; + vector3.copyFrom(value); + return this; + } + @Override public NewMapRot copyFrom(final NewMapRot other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - vector3.copyFrom(other.vector3); vector4.copyFrom(other.vector4); + vector3.copyFrom(other.vector3); } return this; } @@ -1161,12 +1161,12 @@ public final class RotateMapCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasVector3()) { - getMutableVector3().mergeFrom(other.vector3); - } if (other.hasVector4()) { getMutableVector4().mergeFrom(other.vector4); } + if (other.hasVector3()) { + getMutableVector3().mergeFrom(other.vector3); + } return this; } @@ -1177,8 +1177,8 @@ public final class RotateMapCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - vector3.clear(); vector4.clear(); + vector3.clear(); return this; } @@ -1189,8 +1189,8 @@ public final class RotateMapCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - vector3.clearQuick(); vector4.clearQuick(); + vector3.clearQuick(); return this; } @@ -1204,30 +1204,30 @@ public final class RotateMapCsReqOuterClass { } NewMapRot other = (NewMapRot) o; return bitField0_ == other.bitField0_ - && (!hasVector3() || vector3.equals(other.vector3)) - && (!hasVector4() || vector4.equals(other.vector4)); + && (!hasVector4() || vector4.equals(other.vector4)) + && (!hasVector3() || vector3.equals(other.vector3)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 18); - output.writeMessageNoTag(vector3); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 82); output.writeMessageNoTag(vector4); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(vector3); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(vector3); + size += 1 + ProtoSink.computeMessageSizeNoTag(vector4); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(vector4); + size += 1 + ProtoSink.computeMessageSizeNoTag(vector3); } return size; } @@ -1239,18 +1239,18 @@ public final class RotateMapCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 18: { - // vector3 - input.readMessage(vector3); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 82) { - break; - } - } case 82: { // vector4 input.readMessage(vector4); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // vector3 + input.readMessage(vector3); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -1275,10 +1275,10 @@ public final class RotateMapCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeMessage(FieldNames.vector3, vector3); + output.writeMessage(FieldNames.vector4, vector4); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.vector4, vector4); + output.writeMessage(FieldNames.vector3, vector3); } output.endObject(); } @@ -1290,10 +1290,10 @@ public final class RotateMapCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 337790800: { - if (input.isAtField(FieldNames.vector3)) { + case 337790801: { + if (input.isAtField(FieldNames.vector4)) { if (!input.trySkipNullValue()) { - input.readMessage(vector3); + input.readMessage(vector4); bitField0_ |= 0x00000001; } } else { @@ -1301,10 +1301,10 @@ public final class RotateMapCsReqOuterClass { } break; } - case 337790801: { - if (input.isAtField(FieldNames.vector4)) { + case 337790800: { + if (input.isAtField(FieldNames.vector3)) { if (!input.trySkipNullValue()) { - input.readMessage(vector4); + input.readMessage(vector3); bitField0_ |= 0x00000002; } } else { @@ -1364,9 +1364,9 @@ public final class RotateMapCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName vector3 = FieldName.forField("vector3"); - static final FieldName vector4 = FieldName.forField("vector4"); + + static final FieldName vector3 = FieldName.forField("vector3"); } } diff --git a/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotateMapScRspOuterClass.java index aaabb47..277f01f 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 = 13; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 11; */ private int clientPosVersion; /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 6; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -44,7 +44,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -52,7 +52,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return this */ public RotateMapScRsp clearRetcode() { @@ -62,7 +62,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -70,7 +70,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ @@ -81,7 +81,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 11; * @return whether the clientPosVersion field is set */ public boolean hasClientPosVersion() { @@ -89,7 +89,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 11; * @return this */ public RotateMapScRsp clearClientPosVersion() { @@ -99,7 +99,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 11; * @return the clientPosVersion */ public int getClientPosVersion() { @@ -107,7 +107,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional uint32 client_pos_version = 15; + * optional uint32 client_pos_version = 11; * @param value the clientPosVersion to set * @return this */ @@ -118,7 +118,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 6; * @return whether the motion field is set */ public boolean hasMotion() { @@ -126,7 +126,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 6; * @return this */ public RotateMapScRsp clearMotion() { @@ -136,7 +136,7 @@ public final class RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * 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 RotateMapScRspOuterClass { } /** - * optional .MotionInfo motion = 10; + * optional .MotionInfo motion = 6; * @param value the motion to set * @return this */ @@ -246,15 +246,15 @@ public final class RotateMapScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); + output.writeRawByte((byte) 50); output.writeMessageNoTag(motion); } } @@ -281,25 +281,25 @@ public final class RotateMapScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 8: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 88) { break; } } - case 120: { + case 88: { // clientPosVersion clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 50) { break; } } - case 82: { + case 50: { // motion input.readMessage(motion); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java index 4420db2..243b13e 100644 --- a/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotaterDataOuterClass.java @@ -20,17 +20,17 @@ public final class RotaterDataOuterClass { private static final long serialVersionUID = 0L; /** - * optional float APDIFCCFAGG = 8; + * optional float APDIFCCFAGG = 1; */ private float aPDIFCCFAGG; /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 9; */ private int groupId; /** - * optional uint32 unk_int = 15; + * optional uint32 unk_int = 13; */ private int unkInt; @@ -45,7 +45,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 8; + * optional float APDIFCCFAGG = 1; * @return whether the aPDIFCCFAGG field is set */ public boolean hasAPDIFCCFAGG() { @@ -53,7 +53,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 8; + * optional float APDIFCCFAGG = 1; * @return this */ public RotaterData clearAPDIFCCFAGG() { @@ -63,7 +63,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 8; + * optional float APDIFCCFAGG = 1; * @return the aPDIFCCFAGG */ public float getAPDIFCCFAGG() { @@ -71,7 +71,7 @@ public final class RotaterDataOuterClass { } /** - * optional float APDIFCCFAGG = 8; + * optional float APDIFCCFAGG = 1; * @param value the aPDIFCCFAGG to set * @return this */ @@ -82,7 +82,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 9; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -90,7 +90,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 9; * @return this */ public RotaterData clearGroupId() { @@ -100,7 +100,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 9; * @return the groupId */ public int getGroupId() { @@ -108,7 +108,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 9; * @param value the groupId to set * @return this */ @@ -119,7 +119,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 unk_int = 15; + * optional uint32 unk_int = 13; * @return whether the unkInt field is set */ public boolean hasUnkInt() { @@ -127,7 +127,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 unk_int = 15; + * optional uint32 unk_int = 13; * @return this */ public RotaterData clearUnkInt() { @@ -137,7 +137,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 unk_int = 15; + * optional uint32 unk_int = 13; * @return the unkInt */ public int getUnkInt() { @@ -145,7 +145,7 @@ public final class RotaterDataOuterClass { } /** - * optional uint32 unk_int = 15; + * optional uint32 unk_int = 13; * @param value the unkInt to set * @return this */ @@ -226,15 +226,15 @@ public final class RotaterDataOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 69); + output.writeRawByte((byte) 13); output.writeFloatNoTag(aPDIFCCFAGG); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(unkInt); } } @@ -261,25 +261,25 @@ public final class RotaterDataOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 69: { + case 13: { // aPDIFCCFAGG aPDIFCCFAGG = input.readFloat(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 72) { break; } } - case 32: { + case 72: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 120) { + if (tag != 104) { break; } } - case 120: { + case 104: { // unkInt unkInt = input.readUInt32(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java index 98cf638..fbc6030 100644 --- a/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/RotatorEnergyInfoOuterClass.java @@ -19,7 +19,7 @@ public final class RotatorEnergyInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 max_num = 3; + * optional uint32 max_num = 6; */ private int maxNum; @@ -39,7 +39,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 3; + * optional uint32 max_num = 6; * @return whether the maxNum field is set */ public boolean hasMaxNum() { @@ -47,7 +47,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 3; + * optional uint32 max_num = 6; * @return this */ public RotatorEnergyInfo clearMaxNum() { @@ -57,7 +57,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 3; + * optional uint32 max_num = 6; * @return the maxNum */ public int getMaxNum() { @@ -65,7 +65,7 @@ public final class RotatorEnergyInfoOuterClass { } /** - * optional uint32 max_num = 3; + * optional uint32 max_num = 6; * @param value the maxNum to set * @return this */ @@ -177,7 +177,7 @@ public final class RotatorEnergyInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(maxNum); } if ((bitField0_ & 0x00000002) != 0) { @@ -205,7 +205,7 @@ public final class RotatorEnergyInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 48: { // maxNum maxNum = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneActorInfoOuterClass.java index 6a87987..017f9ed 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 map_layer = 6; - */ - private int mapLayer; - - /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 5; */ private int baseAvatarId; + /** + * optional uint32 map_layer = 13; + */ + private int mapLayer; + /** * optional uint32 uid = 15; */ private int uid; /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 10; */ private int avatarType; @@ -49,62 +49,25 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 map_layer = 6; - * @return whether the mapLayer field is set + * optional uint32 base_avatar_id = 5; + * @return whether the baseAvatarId field is set */ - public boolean hasMapLayer() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 map_layer = 6; - * @return this - */ - public SceneActorInfo clearMapLayer() { - bitField0_ &= ~0x00000001; - mapLayer = 0; - return this; - } - - /** - * optional uint32 map_layer = 6; - * @return the mapLayer - */ - public int getMapLayer() { - return mapLayer; - } - - /** - * optional uint32 map_layer = 6; - * @param value the mapLayer to set - * @return this - */ - public SceneActorInfo setMapLayer(final int value) { - bitField0_ |= 0x00000001; - mapLayer = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 14; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 5; * @return this */ public SceneActorInfo clearBaseAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 5; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -112,16 +75,53 @@ public final class SceneActorInfoOuterClass { } /** - * optional uint32 base_avatar_id = 14; + * optional uint32 base_avatar_id = 5; * @param value the baseAvatarId to set * @return this */ public SceneActorInfo setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } + /** + * optional uint32 map_layer = 13; + * @return whether the mapLayer field is set + */ + public boolean hasMapLayer() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 map_layer = 13; + * @return this + */ + public SceneActorInfo clearMapLayer() { + bitField0_ &= ~0x00000002; + mapLayer = 0; + return this; + } + + /** + * optional uint32 map_layer = 13; + * @return the mapLayer + */ + public int getMapLayer() { + return mapLayer; + } + + /** + * optional uint32 map_layer = 13; + * @param value the mapLayer to set + * @return this + */ + public SceneActorInfo setMapLayer(final int value) { + bitField0_ |= 0x00000002; + mapLayer = value; + return this; + } + /** * optional uint32 uid = 15; * @return whether the uid field is set @@ -160,7 +160,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 10; * @return whether the avatarType field is set */ public boolean hasAvatarType() { @@ -168,7 +168,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 10; * @return this */ public SceneActorInfo clearAvatarType() { @@ -178,7 +178,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 10; * @return the avatarType */ public AvatarTypeOuterClass.AvatarType getAvatarType() { @@ -211,7 +211,7 @@ public final class SceneActorInfoOuterClass { } /** - * optional .AvatarType avatar_type = 8; + * optional .AvatarType avatar_type = 10; * @param value the avatarType to set * @return this */ @@ -226,8 +226,8 @@ public final class SceneActorInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - mapLayer = other.mapLayer; baseAvatarId = other.baseAvatarId; + mapLayer = other.mapLayer; uid = other.uid; avatarType = other.avatarType; } @@ -240,12 +240,12 @@ public final class SceneActorInfoOuterClass { return this; } cachedSize = -1; - if (other.hasMapLayer()) { - setMapLayer(other.mapLayer); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasMapLayer()) { + setMapLayer(other.mapLayer); + } if (other.hasUid()) { setUid(other.uid); } @@ -262,8 +262,8 @@ public final class SceneActorInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - mapLayer = 0; baseAvatarId = 0; + mapLayer = 0; uid = 0; avatarType = 0; return this; @@ -289,8 +289,8 @@ public final class SceneActorInfoOuterClass { } SceneActorInfo other = (SceneActorInfo) o; return bitField0_ == other.bitField0_ - && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasMapLayer() || mapLayer == other.mapLayer) && (!hasUid() || uid == other.uid) && (!hasAvatarType() || avatarType == other.avatarType); } @@ -298,19 +298,19 @@ public final class SceneActorInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(mapLayer); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 80); output.writeEnumNoTag(avatarType); } } @@ -319,10 +319,10 @@ public final class SceneActorInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(mapLayer); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(uid); @@ -340,18 +340,18 @@ public final class SceneActorInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { - // mapLayer - mapLayer = input.readUInt32(); + case 40: { + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 104) { break; } } - case 112: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 104: { + // mapLayer + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 120) { @@ -363,11 +363,11 @@ public final class SceneActorInfoOuterClass { uid = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 64) { + if (tag != 80) { break; } } - case 64: { + case 80: { // avatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -397,10 +397,10 @@ public final class SceneActorInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.mapLayer, mapLayer); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.mapLayer, mapLayer); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.uid, uid); @@ -418,11 +418,11 @@ public final class SceneActorInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 160971093: - case 1248553134: { - if (input.isAtField(FieldNames.mapLayer)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - mapLayer = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -430,11 +430,11 @@ public final class SceneActorInfoOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case 160971093: + case 1248553134: { + if (input.isAtField(FieldNames.mapLayer)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + mapLayer = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -523,10 +523,10 @@ public final class SceneActorInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + static final FieldName mapLayer = FieldName.forField("mapLayer", "map_layer"); + static final FieldName uid = FieldName.forField("uid"); 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 8134a30..d040b53 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneBattleInfoOuterClass.java @@ -20,52 +20,52 @@ public final class SceneBattleInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 stage_id = 1; - */ - private int stageId; - - /** - * optional uint32 world_level = 2; + * optional uint32 world_level = 1; */ private int worldLevel; /** - * optional uint32 battle_id = 3; - */ - private int battleId; - - /** - * optional uint32 rounds_limit = 5; - */ - private int roundsLimit; - - /** - * optional uint32 logic_random_seed = 9; + * optional uint32 logic_random_seed = 3; */ private int logicRandomSeed; /** - * repeated .SceneMonsterWave monster_wave_list = 10; + * optional uint32 rounds_limit = 8; */ - private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + private int roundsLimit; /** - * repeated .BattleBuff buff_list = 12; + * optional uint32 stage_id = 11; */ - private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); + private int stageId; /** - * repeated .BattleAvatar battle_avatar_list = 14; + * optional uint32 battle_id = 15; + */ + private int battleId; + + /** + * repeated .BattleAvatar battle_avatar_list = 4; */ private final RepeatedMessage battleAvatarList = RepeatedMessage.newEmptyInstance(BattleAvatarOuterClass.BattleAvatar.getFactory()); /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleBuff buff_list = 6; + */ + private final RepeatedMessage buffList = RepeatedMessage.newEmptyInstance(BattleBuffOuterClass.BattleBuff.getFactory()); + + /** + * repeated .SceneMonsterWave monster_wave_list = 7; + */ + private final RepeatedMessage monsterWaveList = RepeatedMessage.newEmptyInstance(SceneMonsterWaveOuterClass.SceneMonsterWave.getFactory()); + + /** + * repeated .BattleEventBattleInfo event_battle_info_list = 413; */ private final RepeatedMessage eventBattleInfoList = RepeatedMessage.newEmptyInstance(BattleEventBattleInfoOuterClass.BattleEventBattleInfo.getFactory()); /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; */ private final RepeatedMessage battleTargetInfo = RepeatedMessage.newEmptyInstance(BattleTargetInfoEntry.getFactory()); @@ -80,62 +80,25 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 stage_id = 1; - * @return whether the stageId field is set + * optional uint32 world_level = 1; + * @return whether the worldLevel field is set */ - public boolean hasStageId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 stage_id = 1; - * @return this - */ - public SceneBattleInfo clearStageId() { - bitField0_ &= ~0x00000001; - stageId = 0; - return this; - } - - /** - * optional uint32 stage_id = 1; - * @return the stageId - */ - public int getStageId() { - return stageId; - } - - /** - * optional uint32 stage_id = 1; - * @param value the stageId to set - * @return this - */ - public SceneBattleInfo setStageId(final int value) { - bitField0_ |= 0x00000001; - stageId = value; - return this; - } - - /** - * optional uint32 world_level = 2; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 world_level = 2; + * optional uint32 world_level = 1; * @return this */ public SceneBattleInfo clearWorldLevel() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; worldLevel = 0; return this; } /** - * optional uint32 world_level = 2; + * optional uint32 world_level = 1; * @return the worldLevel */ public int getWorldLevel() { @@ -143,110 +106,36 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 world_level = 2; + * optional uint32 world_level = 1; * @param value the worldLevel to set * @return this */ public SceneBattleInfo setWorldLevel(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; worldLevel = value; return this; } /** - * optional uint32 battle_id = 3; - * @return whether the battleId field is set - */ - public boolean hasBattleId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 battle_id = 3; - * @return this - */ - public SceneBattleInfo clearBattleId() { - bitField0_ &= ~0x00000004; - battleId = 0; - return this; - } - - /** - * optional uint32 battle_id = 3; - * @return the battleId - */ - public int getBattleId() { - return battleId; - } - - /** - * optional uint32 battle_id = 3; - * @param value the battleId to set - * @return this - */ - public SceneBattleInfo setBattleId(final int value) { - bitField0_ |= 0x00000004; - battleId = value; - return this; - } - - /** - * optional uint32 rounds_limit = 5; - * @return whether the roundsLimit field is set - */ - public boolean hasRoundsLimit() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 rounds_limit = 5; - * @return this - */ - public SceneBattleInfo clearRoundsLimit() { - bitField0_ &= ~0x00000008; - roundsLimit = 0; - return this; - } - - /** - * optional uint32 rounds_limit = 5; - * @return the roundsLimit - */ - public int getRoundsLimit() { - return roundsLimit; - } - - /** - * optional uint32 rounds_limit = 5; - * @param value the roundsLimit to set - * @return this - */ - public SceneBattleInfo setRoundsLimit(final int value) { - bitField0_ |= 0x00000008; - roundsLimit = value; - return this; - } - - /** - * optional uint32 logic_random_seed = 9; + * optional uint32 logic_random_seed = 3; * @return whether the logicRandomSeed field is set */ public boolean hasLogicRandomSeed() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 logic_random_seed = 9; + * optional uint32 logic_random_seed = 3; * @return this */ public SceneBattleInfo clearLogicRandomSeed() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000002; logicRandomSeed = 0; return this; } /** - * optional uint32 logic_random_seed = 9; + * optional uint32 logic_random_seed = 3; * @return the logicRandomSeed */ public int getLogicRandomSeed() { @@ -254,175 +143,147 @@ public final class SceneBattleInfoOuterClass { } /** - * optional uint32 logic_random_seed = 9; + * optional uint32 logic_random_seed = 3; * @param value the logicRandomSeed to set * @return this */ public SceneBattleInfo setLogicRandomSeed(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000002; logicRandomSeed = value; return this; } /** - * repeated .SceneMonsterWave monster_wave_list = 10; - * @return whether the monsterWaveList field is set + * optional uint32 rounds_limit = 8; + * @return whether the roundsLimit field is set */ - public boolean hasMonsterWaveList() { + public boolean hasRoundsLimit() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 rounds_limit = 8; + * @return this + */ + public SceneBattleInfo clearRoundsLimit() { + bitField0_ &= ~0x00000004; + roundsLimit = 0; + return this; + } + + /** + * optional uint32 rounds_limit = 8; + * @return the roundsLimit + */ + public int getRoundsLimit() { + return roundsLimit; + } + + /** + * optional uint32 rounds_limit = 8; + * @param value the roundsLimit to set + * @return this + */ + public SceneBattleInfo setRoundsLimit(final int value) { + bitField0_ |= 0x00000004; + roundsLimit = value; + return this; + } + + /** + * optional uint32 stage_id = 11; + * @return whether the stageId field is set + */ + public boolean hasStageId() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 stage_id = 11; + * @return this + */ + public SceneBattleInfo clearStageId() { + bitField0_ &= ~0x00000008; + stageId = 0; + return this; + } + + /** + * optional uint32 stage_id = 11; + * @return the stageId + */ + public int getStageId() { + return stageId; + } + + /** + * optional uint32 stage_id = 11; + * @param value the stageId to set + * @return this + */ + public SceneBattleInfo setStageId(final int value) { + bitField0_ |= 0x00000008; + stageId = value; + return this; + } + + /** + * optional uint32 battle_id = 15; + * @return whether the battleId field is set + */ + public boolean hasBattleId() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 battle_id = 15; + * @return this + */ + public SceneBattleInfo clearBattleId() { + bitField0_ &= ~0x00000010; + battleId = 0; + return this; + } + + /** + * optional uint32 battle_id = 15; + * @return the battleId + */ + public int getBattleId() { + return battleId; + } + + /** + * optional uint32 battle_id = 15; + * @param value the battleId to set + * @return this + */ + public SceneBattleInfo setBattleId(final int value) { + bitField0_ |= 0x00000010; + battleId = value; + return this; + } + + /** + * repeated .BattleAvatar battle_avatar_list = 4; + * @return whether the battleAvatarList field is set + */ + public boolean hasBattleAvatarList() { return (bitField0_ & 0x00000020) != 0; } /** - * repeated .SceneMonsterWave monster_wave_list = 10; - * @return this - */ - public SceneBattleInfo clearMonsterWaveList() { - bitField0_ &= ~0x00000020; - monsterWaveList.clear(); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_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 #getMutableMonsterWaveList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getMonsterWaveList() { - return monsterWaveList; - } - - /** - * repeated .SceneMonsterWave monster_wave_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 getMutableMonsterWaveList( - ) { - bitField0_ |= 0x00000020; - return monsterWaveList; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 10; - * @param value the monsterWaveList to add - * @return this - */ - public SceneBattleInfo addMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave value) { - bitField0_ |= 0x00000020; - monsterWaveList.add(value); - return this; - } - - /** - * repeated .SceneMonsterWave monster_wave_list = 10; - * @param values the monsterWaveList to add - * @return this - */ - public SceneBattleInfo addAllMonsterWaveList( - final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { - bitField0_ |= 0x00000020; - monsterWaveList.addAll(values); - return this; - } - - /** - * repeated .BattleBuff buff_list = 12; - * @return whether the buffList field is set - */ - public boolean hasBuffList() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * repeated .BattleBuff buff_list = 12; - * @return this - */ - public SceneBattleInfo clearBuffList() { - bitField0_ &= ~0x00000040; - buffList.clear(); - return this; - } - - /** - * repeated .BattleBuff buff_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 #getMutableBuffList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedMessage getBuffList() { - return buffList; - } - - /** - * repeated .BattleBuff buff_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 getMutableBuffList() { - bitField0_ |= 0x00000040; - return buffList; - } - - /** - * repeated .BattleBuff buff_list = 12; - * @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 = 12; - * @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 = 14; - * @return whether the battleAvatarList field is set - */ - public boolean hasBattleAvatarList() { - return (bitField0_ & 0x00000080) != 0; - } - - /** - * repeated .BattleAvatar battle_avatar_list = 14; + * repeated .BattleAvatar battle_avatar_list = 4; * @return this */ public SceneBattleInfo clearBattleAvatarList() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000020; battleAvatarList.clear(); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 14; + * 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. @@ -436,7 +297,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleAvatar battle_avatar_list = 14; + * 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 @@ -445,35 +306,174 @@ public final class SceneBattleInfoOuterClass { * @return internal storage object for modifications */ public RepeatedMessage getMutableBattleAvatarList() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; return battleAvatarList; } /** - * repeated .BattleAvatar battle_avatar_list = 14; + * repeated .BattleAvatar battle_avatar_list = 4; * @param value the battleAvatarList to add * @return this */ public SceneBattleInfo addBattleAvatarList(final BattleAvatarOuterClass.BattleAvatar value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; battleAvatarList.add(value); return this; } /** - * repeated .BattleAvatar battle_avatar_list = 14; + * repeated .BattleAvatar battle_avatar_list = 4; * @param values the battleAvatarList to add * @return this */ public SceneBattleInfo addAllBattleAvatarList( final BattleAvatarOuterClass.BattleAvatar... values) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000020; battleAvatarList.addAll(values); return this; } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * 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; + * @return this + */ + public SceneBattleInfo clearMonsterWaveList() { + bitField0_ &= ~0x00000080; + monsterWaveList.clear(); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_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 #getMutableMonsterWaveList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getMonsterWaveList() { + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_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 getMutableMonsterWaveList( + ) { + bitField0_ |= 0x00000080; + return monsterWaveList; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 7; + * @param value the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave value) { + bitField0_ |= 0x00000080; + monsterWaveList.add(value); + return this; + } + + /** + * repeated .SceneMonsterWave monster_wave_list = 7; + * @param values the monsterWaveList to add + * @return this + */ + public SceneBattleInfo addAllMonsterWaveList( + final SceneMonsterWaveOuterClass.SceneMonsterWave... values) { + bitField0_ |= 0x00000080; + monsterWaveList.addAll(values); + return this; + } + + /** + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * @return whether the eventBattleInfoList field is set */ public boolean hasEventBattleInfoList() { @@ -481,7 +481,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * @return this */ public SceneBattleInfo clearEventBattleInfoList() { @@ -491,7 +491,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * * This 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 +506,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -521,7 +521,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * @param value the eventBattleInfoList to add * @return this */ @@ -533,7 +533,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .BattleEventBattleInfo event_battle_info_list = 1179; + * repeated .BattleEventBattleInfo event_battle_info_list = 413; * @param values the eventBattleInfoList to add * @return this */ @@ -545,7 +545,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; * @return whether the battleTargetInfo field is set */ public boolean hasBattleTargetInfo() { @@ -553,7 +553,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; * @return this */ public SceneBattleInfo clearBattleTargetInfo() { @@ -563,7 +563,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * 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. @@ -577,7 +577,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * 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 @@ -591,7 +591,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; * @param value the battleTargetInfo to add * @return this */ @@ -602,7 +602,7 @@ public final class SceneBattleInfoOuterClass { } /** - * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 1433; + * repeated .SceneBattleInfo.BattleTargetInfoEntry battle_target_info = 583; * @param values the battleTargetInfo to add * @return this */ @@ -617,14 +617,14 @@ public final class SceneBattleInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - stageId = other.stageId; worldLevel = other.worldLevel; - battleId = other.battleId; - roundsLimit = other.roundsLimit; logicRandomSeed = other.logicRandomSeed; - monsterWaveList.copyFrom(other.monsterWaveList); - buffList.copyFrom(other.buffList); + roundsLimit = other.roundsLimit; + stageId = other.stageId; + battleId = other.battleId; battleAvatarList.copyFrom(other.battleAvatarList); + buffList.copyFrom(other.buffList); + monsterWaveList.copyFrom(other.monsterWaveList); eventBattleInfoList.copyFrom(other.eventBattleInfoList); battleTargetInfo.copyFrom(other.battleTargetInfo); } @@ -637,29 +637,29 @@ public final class SceneBattleInfoOuterClass { return this; } cachedSize = -1; - if (other.hasStageId()) { - setStageId(other.stageId); - } if (other.hasWorldLevel()) { setWorldLevel(other.worldLevel); } - if (other.hasBattleId()) { - setBattleId(other.battleId); - } - if (other.hasRoundsLimit()) { - setRoundsLimit(other.roundsLimit); - } if (other.hasLogicRandomSeed()) { setLogicRandomSeed(other.logicRandomSeed); } - if (other.hasMonsterWaveList()) { - getMutableMonsterWaveList().addAll(other.monsterWaveList); + if (other.hasRoundsLimit()) { + setRoundsLimit(other.roundsLimit); + } + if (other.hasStageId()) { + setStageId(other.stageId); + } + if (other.hasBattleId()) { + setBattleId(other.battleId); + } + if (other.hasBattleAvatarList()) { + getMutableBattleAvatarList().addAll(other.battleAvatarList); } if (other.hasBuffList()) { getMutableBuffList().addAll(other.buffList); } - if (other.hasBattleAvatarList()) { - getMutableBattleAvatarList().addAll(other.battleAvatarList); + if (other.hasMonsterWaveList()) { + getMutableMonsterWaveList().addAll(other.monsterWaveList); } if (other.hasEventBattleInfoList()) { getMutableEventBattleInfoList().addAll(other.eventBattleInfoList); @@ -677,14 +677,14 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - stageId = 0; worldLevel = 0; - battleId = 0; - roundsLimit = 0; logicRandomSeed = 0; - monsterWaveList.clear(); - buffList.clear(); + roundsLimit = 0; + stageId = 0; + battleId = 0; battleAvatarList.clear(); + buffList.clear(); + monsterWaveList.clear(); eventBattleInfoList.clear(); battleTargetInfo.clear(); return this; @@ -697,9 +697,9 @@ public final class SceneBattleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - monsterWaveList.clearQuick(); - buffList.clearQuick(); battleAvatarList.clearQuick(); + buffList.clearQuick(); + monsterWaveList.clearQuick(); eventBattleInfoList.clearQuick(); battleTargetInfo.clearQuick(); return this; @@ -715,14 +715,14 @@ public final class SceneBattleInfoOuterClass { } SceneBattleInfo other = (SceneBattleInfo) o; return bitField0_ == other.bitField0_ - && (!hasStageId() || stageId == other.stageId) && (!hasWorldLevel() || worldLevel == other.worldLevel) - && (!hasBattleId() || battleId == other.battleId) - && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) && (!hasLogicRandomSeed() || logicRandomSeed == other.logicRandomSeed) - && (!hasMonsterWaveList() || monsterWaveList.equals(other.monsterWaveList)) - && (!hasBuffList() || buffList.equals(other.buffList)) + && (!hasRoundsLimit() || roundsLimit == other.roundsLimit) + && (!hasStageId() || stageId == other.stageId) + && (!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)); } @@ -731,51 +731,51 @@ public final class SceneBattleInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(stageId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 16); output.writeUInt32NoTag(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 24); - output.writeUInt32NoTag(battleId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(roundsLimit); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); output.writeUInt32NoTag(logicRandomSeed); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(roundsLimit); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { - for (int i = 0; i < monsterWaveList.length(); i++) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(monsterWaveList.get(i)); + for (int i = 0; i < battleAvatarList.length(); i++) { + output.writeRawByte((byte) 34); + output.writeMessageNoTag(battleAvatarList.get(i)); } } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < buffList.length(); i++) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 50); output.writeMessageNoTag(buffList.get(i)); } } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < battleAvatarList.length(); i++) { - output.writeRawByte((byte) 114); - output.writeMessageNoTag(battleAvatarList.get(i)); + for (int i = 0; i < monsterWaveList.length(); i++) { + output.writeRawByte((byte) 58); + output.writeMessageNoTag(monsterWaveList.get(i)); } } if ((bitField0_ & 0x00000100) != 0) { for (int i = 0; i < eventBattleInfoList.length(); i++) { - output.writeRawLittleEndian16((short) 18906); + output.writeRawLittleEndian16((short) 6634); output.writeMessageNoTag(eventBattleInfoList.get(i)); } } if ((bitField0_ & 0x00000200) != 0) { for (int i = 0; i < battleTargetInfo.length(); i++) { - output.writeRawLittleEndian16((short) 22986); + output.writeRawLittleEndian16((short) 9402); output.writeMessageNoTag(battleTargetInfo.get(i)); } } @@ -785,28 +785,28 @@ public final class SceneBattleInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); - } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(logicRandomSeed); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(roundsLimit); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(battleId); + } if ((bitField0_ & 0x00000020) != 0) { - size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); + size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); } if ((bitField0_ & 0x00000040) != 0) { size += (1 * buffList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(buffList); } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * battleAvatarList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(battleAvatarList); + size += (1 * monsterWaveList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(monsterWaveList); } if ((bitField0_ & 0x00000100) != 0) { size += (2 * eventBattleInfoList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(eventBattleInfoList); @@ -825,83 +825,83 @@ public final class SceneBattleInfoOuterClass { while (true) { switch (tag) { case 8: { - // stageId - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } - case 16: { // worldLevel worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 24) { break; } } case 24: { - // battleId - battleId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 40) { - break; - } - } - case 40: { - // roundsLimit - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { // logicRandomSeed logicRandomSeed = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // roundsLimit + roundsLimit = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // stageId + stageId = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // battleId + battleId = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 82) { + if (tag != 34) { break; } } - case 82: { - // monsterWaveList - tag = input.readRepeatedMessage(monsterWaveList, tag); + case 34: { + // battleAvatarList + tag = input.readRepeatedMessage(battleAvatarList, tag); bitField0_ |= 0x00000020; - if (tag != 98) { + if (tag != 50) { break; } } - case 98: { + case 50: { // buffList tag = input.readRepeatedMessage(buffList, tag); bitField0_ |= 0x00000040; - if (tag != 114) { + if (tag != 58) { break; } } - case 114: { - // battleAvatarList - tag = input.readRepeatedMessage(battleAvatarList, tag); + case 58: { + // monsterWaveList + tag = input.readRepeatedMessage(monsterWaveList, tag); bitField0_ |= 0x00000080; - if (tag != 9434) { + if (tag != 3306) { break; } } - case 9434: { + case 3306: { // eventBattleInfoList tag = input.readRepeatedMessage(eventBattleInfoList, tag); bitField0_ |= 0x00000100; - if (tag != 11466) { + if (tag != 4666) { break; } } - case 11466: { + case 4666: { // battleTargetInfo tag = input.readRepeatedMessage(battleTargetInfo, tag); bitField0_ |= 0x00000200; @@ -927,28 +927,28 @@ public final class SceneBattleInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.worldLevel, worldLevel); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.battleId, battleId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.roundsLimit, roundsLimit); - } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.logicRandomSeed, logicRandomSeed); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.roundsLimit, roundsLimit); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.stageId, stageId); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.battleId, battleId); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); + output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.buffList, buffList); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.battleAvatarList, battleAvatarList); + output.writeRepeatedMessage(FieldNames.monsterWaveList, monsterWaveList); } if ((bitField0_ & 0x00000100) != 0) { output.writeRepeatedMessage(FieldNames.eventBattleInfoList, eventBattleInfoList); @@ -966,48 +966,12 @@ public final class SceneBattleInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { - if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case 440007442: case 1305257111: { if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { worldLevel = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1678308365: - case -487930366: { - if (input.isAtField(FieldNames.battleId)) { - if (!input.trySkipNullValue()) { - battleId = input.readUInt32(); - bitField0_ |= 0x00000004; - } - } else { - input.skipUnknownField(); - } - break; - } - case 306477590: - case 1457479585: { - if (input.isAtField(FieldNames.roundsLimit)) { - if (!input.trySkipNullValue()) { - roundsLimit = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1019,6 +983,42 @@ public final class SceneBattleInfoOuterClass { 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { + if (!input.trySkipNullValue()) { + stageId = 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 { @@ -1026,11 +1026,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_ |= 0x00000020; } } else { @@ -1050,11 +1050,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_ |= 0x00000080; } } else { @@ -1486,21 +1486,21 @@ public final class SceneBattleInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); - static final FieldName worldLevel = FieldName.forField("worldLevel", "world_level"); - static final FieldName battleId = FieldName.forField("battleId", "battle_id"); - - static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); - static final FieldName logicRandomSeed = FieldName.forField("logicRandomSeed", "logic_random_seed"); - static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); + static final FieldName roundsLimit = FieldName.forField("roundsLimit", "rounds_limit"); + + static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + + 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 battleAvatarList = FieldName.forField("battleAvatarList", "battle_avatar_list"); + static final FieldName monsterWaveList = FieldName.forField("monsterWaveList", "monster_wave_list"); 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 new file mode 100644 index 0000000..8af8479 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpCsReqOuterClass.java @@ -0,0 +1,422 @@ +// 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 SceneCastSkillCostMpCsReqOuterClass { + /** + * Protobuf type {@code SceneCastSkillCostMpCsReq} + */ + public static final class SceneCastSkillCostMpCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 skill_index = 1; + */ + private int skillIndex; + + /** + * optional uint32 caster_id = 4; + */ + private int casterId; + + /** + * optional uint32 attacked_group_id = 12; + */ + private int attackedGroupId; + + private SceneCastSkillCostMpCsReq() { + } + + /** + * @return a new empty instance of {@code SceneCastSkillCostMpCsReq} + */ + public static SceneCastSkillCostMpCsReq newInstance() { + return new SceneCastSkillCostMpCsReq(); + } + + /** + * optional uint32 skill_index = 1; + * @return whether the skillIndex field is set + */ + public boolean hasSkillIndex() { + 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; + * @return this + */ + public SceneCastSkillCostMpCsReq clearCasterId() { + bitField0_ &= ~0x00000002; + casterId = 0; + return this; + } + + /** + * optional uint32 caster_id = 4; + * @return the casterId + */ + public int getCasterId() { + return casterId; + } + + /** + * optional uint32 caster_id = 4; + * @param value the casterId to set + * @return this + */ + public SceneCastSkillCostMpCsReq setCasterId(final int value) { + bitField0_ |= 0x00000002; + casterId = value; + return this; + } + + /** + * optional uint32 attacked_group_id = 12; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 attacked_group_id = 12; + * @return this + */ + public SceneCastSkillCostMpCsReq clearAttackedGroupId() { + bitField0_ &= ~0x00000004; + 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 SceneCastSkillCostMpCsReq setAttackedGroupId(final int value) { + bitField0_ |= 0x00000004; + attackedGroupId = 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; + } + return this; + } + + @Override + public SceneCastSkillCostMpCsReq mergeFrom(final SceneCastSkillCostMpCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasSkillIndex()) { + setSkillIndex(other.skillIndex); + } + if (other.hasCasterId()) { + setCasterId(other.casterId); + } + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } + return this; + } + + @Override + public SceneCastSkillCostMpCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + skillIndex = 0; + casterId = 0; + attackedGroupId = 0; + return this; + } + + @Override + public SceneCastSkillCostMpCsReq 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 SceneCastSkillCostMpCsReq)) { + return false; + } + SceneCastSkillCostMpCsReq other = (SceneCastSkillCostMpCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasSkillIndex() || skillIndex == other.skillIndex) + && (!hasCasterId() || casterId == other.casterId) + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId); + } + + @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.writeUInt32NoTag(casterId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(attackedGroupId); + } + } + + @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) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SceneCastSkillCostMpCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + 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: { + // casterId + casterId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // attackedGroupId + attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.skillIndex, skillIndex); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.casterId, casterId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + } + output.endObject(); + } + + @Override + public SceneCastSkillCostMpCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { + if (!input.trySkipNullValue()) { + attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SceneCastSkillCostMpCsReq clone() { + return new SceneCastSkillCostMpCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SceneCastSkillCostMpCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpCsReq(), data).checkInitialized(); + } + + public static SceneCastSkillCostMpCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpCsReq(), input).checkInitialized(); + } + + public static SceneCastSkillCostMpCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SceneCastSkillCostMpCsReq messages + */ + public static MessageFactory getFactory() { + return SceneCastSkillCostMpCsReqFactory.INSTANCE; + } + + private enum SceneCastSkillCostMpCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SceneCastSkillCostMpCsReq create() { + return SceneCastSkillCostMpCsReq.newInstance(); + } + } + + /** + * 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"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.java new file mode 100644 index 0000000..d49afee --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCostMpScRspOuterClass.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 SceneCastSkillCostMpScRspOuterClass { + /** + * Protobuf type {@code SceneCastSkillCostMpScRsp} + */ + public static final class SceneCastSkillCostMpScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 attacked_group_id = 6; + */ + private int attackedGroupId; + + /** + * optional uint32 retcode = 8; + */ + private int retcode; + + private SceneCastSkillCostMpScRsp() { + } + + /** + * @return a new empty instance of {@code SceneCastSkillCostMpScRsp} + */ + public static SceneCastSkillCostMpScRsp newInstance() { + return new SceneCastSkillCostMpScRsp(); + } + + /** + * optional uint32 attacked_group_id = 6; + * @return whether the attackedGroupId field is set + */ + public boolean hasAttackedGroupId() { + 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; + * @return this + */ + public SceneCastSkillCostMpScRsp 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 SceneCastSkillCostMpScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = 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; + } + return this; + } + + @Override + public SceneCastSkillCostMpScRsp mergeFrom(final SceneCastSkillCostMpScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasAttackedGroupId()) { + setAttackedGroupId(other.attackedGroupId); + } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + return this; + } + + @Override + public SceneCastSkillCostMpScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + attackedGroupId = 0; + retcode = 0; + return this; + } + + @Override + public SceneCastSkillCostMpScRsp 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 SceneCastSkillCostMpScRsp)) { + return false; + } + SceneCastSkillCostMpScRsp other = (SceneCastSkillCostMpScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasRetcode() || retcode == other.retcode); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(attackedGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(retcode); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SceneCastSkillCostMpScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 48: { + // attackedGroupId + attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // retcode + retcode = 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.attackedGroupId, attackedGroupId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + output.endObject(); + } + + @Override + public SceneCastSkillCostMpScRsp mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { + if (!input.trySkipNullValue()) { + attackedGroupId = 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; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SceneCastSkillCostMpScRsp clone() { + return new SceneCastSkillCostMpScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SceneCastSkillCostMpScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpScRsp(), data).checkInitialized(); + } + + public static SceneCastSkillCostMpScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpScRsp(), input).checkInitialized(); + } + + public static SceneCastSkillCostMpScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SceneCastSkillCostMpScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SceneCastSkillCostMpScRsp messages + */ + public static MessageFactory getFactory() { + return SceneCastSkillCostMpScRspFactory.INSTANCE; + } + + private enum SceneCastSkillCostMpScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SceneCastSkillCostMpScRsp create() { + return SceneCastSkillCostMpScRsp.newInstance(); + } + } + + /** + * 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"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java index 6413b53..ef9304a 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneCastSkillCsReqOuterClass.java @@ -21,32 +21,32 @@ public final class SceneCastSkillCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 skill_index = 4; + * optional uint32 skill_index = 9; */ private int skillIndex; /** - * optional uint32 caster_id = 5; - */ - private int casterId; - - /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 12; */ private int attackedGroupId; /** - * optional .MotionInfo target_motion = 2; + * optional uint32 caster_id = 13; + */ + private int casterId; + + /** + * optional .MotionInfo target_motion = 6; */ private final MotionInfoOuterClass.MotionInfo targetMotion = MotionInfoOuterClass.MotionInfo.newInstance(); /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_id_list = 2; */ private final RepeatedInt hitTargetEntityIdList = RepeatedInt.newEmptyInstance(); /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_monster_wave_list = 1; */ private final RepeatedMessage assistMonsterWaveList = RepeatedMessage.newEmptyInstance(AssistMonsterWaveOuterClass.AssistMonsterWave.getFactory()); @@ -61,7 +61,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 4; + * optional uint32 skill_index = 9; * @return whether the skillIndex field is set */ public boolean hasSkillIndex() { @@ -69,7 +69,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 4; + * optional uint32 skill_index = 9; * @return this */ public SceneCastSkillCsReq clearSkillIndex() { @@ -79,7 +79,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 4; + * optional uint32 skill_index = 9; * @return the skillIndex */ public int getSkillIndex() { @@ -87,7 +87,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 skill_index = 4; + * optional uint32 skill_index = 9; * @param value the skillIndex to set * @return this */ @@ -98,62 +98,25 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 caster_id = 5; - * @return whether the casterId field is set + * optional uint32 attacked_group_id = 12; + * @return whether the attackedGroupId field is set */ - public boolean hasCasterId() { + public boolean hasAttackedGroupId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 caster_id = 5; - * @return this - */ - public SceneCastSkillCsReq clearCasterId() { - bitField0_ &= ~0x00000002; - casterId = 0; - return this; - } - - /** - * optional uint32 caster_id = 5; - * @return the casterId - */ - public int getCasterId() { - return casterId; - } - - /** - * optional uint32 caster_id = 5; - * @param value the casterId to set - * @return this - */ - public SceneCastSkillCsReq setCasterId(final int value) { - bitField0_ |= 0x00000002; - casterId = value; - return this; - } - - /** - * optional uint32 attacked_group_id = 8; - * @return whether the attackedGroupId field is set - */ - public boolean hasAttackedGroupId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 12; * @return this */ public SceneCastSkillCsReq clearAttackedGroupId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; attackedGroupId = 0; return this; } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 12; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -161,18 +124,55 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional uint32 attacked_group_id = 8; + * optional uint32 attacked_group_id = 12; * @param value the attackedGroupId to set * @return this */ public SceneCastSkillCsReq setAttackedGroupId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; attackedGroupId = value; return this; } /** - * optional .MotionInfo target_motion = 2; + * optional uint32 caster_id = 13; + * @return whether the casterId field is set + */ + public boolean hasCasterId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 caster_id = 13; + * @return this + */ + public SceneCastSkillCsReq clearCasterId() { + bitField0_ &= ~0x00000004; + casterId = 0; + return this; + } + + /** + * optional uint32 caster_id = 13; + * @return the casterId + */ + public int getCasterId() { + return casterId; + } + + /** + * optional uint32 caster_id = 13; + * @param value the casterId to set + * @return this + */ + public SceneCastSkillCsReq setCasterId(final int value) { + bitField0_ |= 0x00000004; + casterId = value; + return this; + } + + /** + * optional .MotionInfo target_motion = 6; * @return whether the targetMotion field is set */ public boolean hasTargetMotion() { @@ -180,7 +180,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 2; + * optional .MotionInfo target_motion = 6; * @return this */ public SceneCastSkillCsReq clearTargetMotion() { @@ -190,7 +190,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 2; + * optional .MotionInfo target_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. @@ -204,7 +204,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 2; + * optional .MotionInfo target_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 @@ -218,7 +218,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * optional .MotionInfo target_motion = 2; + * optional .MotionInfo target_motion = 6; * @param value the targetMotion to set * @return this */ @@ -229,7 +229,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_id_list = 2; * @return whether the hitTargetEntityIdList field is set */ public boolean hasHitTargetEntityIdList() { @@ -237,7 +237,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_id_list = 2; * @return this */ public SceneCastSkillCsReq clearHitTargetEntityIdList() { @@ -247,7 +247,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_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. @@ -261,7 +261,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_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 @@ -275,7 +275,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_id_list = 2; * @param value the hitTargetEntityIdList to add * @return this */ @@ -286,7 +286,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated uint32 hit_target_entity_id_list = 13; + * repeated uint32 hit_target_entity_id_list = 2; * @param values the hitTargetEntityIdList to add * @return this */ @@ -297,7 +297,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_monster_wave_list = 1; * @return whether the assistMonsterWaveList field is set */ public boolean hasAssistMonsterWaveList() { @@ -305,7 +305,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_monster_wave_list = 1; * @return this */ public SceneCastSkillCsReq clearAssistMonsterWaveList() { @@ -315,7 +315,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_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. @@ -330,7 +330,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_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 @@ -345,7 +345,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_monster_wave_list = 1; * @param value the assistMonsterWaveList to add * @return this */ @@ -357,7 +357,7 @@ public final class SceneCastSkillCsReqOuterClass { } /** - * repeated .AssistMonsterWave assist_monster_wave_list = 6; + * repeated .AssistMonsterWave assist_monster_wave_list = 1; * @param values the assistMonsterWaveList to add * @return this */ @@ -374,8 +374,8 @@ public final class SceneCastSkillCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; skillIndex = other.skillIndex; - casterId = other.casterId; attackedGroupId = other.attackedGroupId; + casterId = other.casterId; targetMotion.copyFrom(other.targetMotion); hitTargetEntityIdList.copyFrom(other.hitTargetEntityIdList); assistMonsterWaveList.copyFrom(other.assistMonsterWaveList); @@ -392,12 +392,12 @@ public final class SceneCastSkillCsReqOuterClass { if (other.hasSkillIndex()) { setSkillIndex(other.skillIndex); } - if (other.hasCasterId()) { - setCasterId(other.casterId); - } if (other.hasAttackedGroupId()) { setAttackedGroupId(other.attackedGroupId); } + if (other.hasCasterId()) { + setCasterId(other.casterId); + } if (other.hasTargetMotion()) { getMutableTargetMotion().mergeFrom(other.targetMotion); } @@ -418,8 +418,8 @@ public final class SceneCastSkillCsReqOuterClass { cachedSize = -1; bitField0_ = 0; skillIndex = 0; - casterId = 0; attackedGroupId = 0; + casterId = 0; targetMotion.clear(); hitTargetEntityIdList.clear(); assistMonsterWaveList.clear(); @@ -450,8 +450,8 @@ public final class SceneCastSkillCsReqOuterClass { SceneCastSkillCsReq other = (SceneCastSkillCsReq) o; return bitField0_ == other.bitField0_ && (!hasSkillIndex() || skillIndex == other.skillIndex) - && (!hasCasterId() || casterId == other.casterId) && (!hasAttackedGroupId() || attackedGroupId == other.attackedGroupId) + && (!hasCasterId() || casterId == other.casterId) && (!hasTargetMotion() || targetMotion.equals(other.targetMotion)) && (!hasHitTargetEntityIdList() || hitTargetEntityIdList.equals(other.hitTargetEntityIdList)) && (!hasAssistMonsterWaveList() || assistMonsterWaveList.equals(other.assistMonsterWaveList)); @@ -460,30 +460,30 @@ public final class SceneCastSkillCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(skillIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(casterId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(attackedGroupId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(casterId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 50); output.writeMessageNoTag(targetMotion); } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < hitTargetEntityIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(hitTargetEntityIdList.array()[i]); } } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < assistMonsterWaveList.length(); i++) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 10); output.writeMessageNoTag(assistMonsterWaveList.get(i)); } } @@ -496,10 +496,10 @@ public final class SceneCastSkillCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(skillIndex); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(attackedGroupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(casterId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(targetMotion); @@ -520,52 +520,52 @@ public final class SceneCastSkillCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 72: { // skillIndex skillIndex = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 96) { break; } } - case 40: { - // casterId - casterId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 96: { // attackedGroupId attackedGroupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // casterId + casterId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { - break; - } - } - case 18: { - // targetMotion - input.readMessage(targetMotion); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 106) { - break; - } - } - case 106: { - // hitTargetEntityIdList [packed=true] - input.readPackedUInt32(hitTargetEntityIdList, tag); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 50) { break; } } case 50: { + // targetMotion + input.readMessage(targetMotion); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // hitTargetEntityIdList [packed=true] + input.readPackedUInt32(hitTargetEntityIdList, tag); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // assistMonsterWaveList tag = input.readRepeatedMessage(assistMonsterWaveList, tag); bitField0_ |= 0x00000020; @@ -583,7 +583,7 @@ public final class SceneCastSkillCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 16: { // hitTargetEntityIdList [packed=false] tag = input.readRepeatedUInt32(hitTargetEntityIdList, tag); bitField0_ |= 0x00000010; @@ -600,10 +600,10 @@ public final class SceneCastSkillCsReqOuterClass { output.writeUInt32(FieldNames.skillIndex, skillIndex); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.casterId, casterId); + output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.attackedGroupId, attackedGroupId); + output.writeUInt32(FieldNames.casterId, casterId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.targetMotion, targetMotion); @@ -636,11 +636,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case 35676775: - case 1106001422: { - if (input.isAtField(FieldNames.casterId)) { + case -1725961965: + case -715836621: { + if (input.isAtField(FieldNames.attackedGroupId)) { if (!input.trySkipNullValue()) { - casterId = input.readUInt32(); + attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -648,11 +648,11 @@ public final class SceneCastSkillCsReqOuterClass { } break; } - case -1725961965: - case -715836621: { - if (input.isAtField(FieldNames.attackedGroupId)) { + case 35676775: + case 1106001422: { + if (input.isAtField(FieldNames.casterId)) { if (!input.trySkipNullValue()) { - attackedGroupId = input.readUInt32(); + casterId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -751,10 +751,10 @@ public final class SceneCastSkillCsReqOuterClass { 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 casterId = FieldName.forField("casterId", "caster_id"); + 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 a180af2..23be5d4 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 = 10; + * optional uint32 mp = 8; */ private int mp; /** - * optional uint32 attacked_group_id = 11; + * optional uint32 attacked_group_id = 10; */ private int attackedGroupId; @@ -39,7 +39,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 10; + * optional uint32 mp = 8; * @return whether the mp field is set */ public boolean hasMp() { @@ -47,7 +47,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 10; + * optional uint32 mp = 8; * @return this */ public SceneCastSkillMpUpdateScNotify clearMp() { @@ -57,7 +57,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 10; + * optional uint32 mp = 8; * @return the mp */ public int getMp() { @@ -65,7 +65,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 mp = 10; + * optional uint32 mp = 8; * @param value the mp to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 11; + * optional uint32 attacked_group_id = 10; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -84,7 +84,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 11; + * optional uint32 attacked_group_id = 10; * @return this */ public SceneCastSkillMpUpdateScNotify clearAttackedGroupId() { @@ -94,7 +94,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 11; + * optional uint32 attacked_group_id = 10; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -102,7 +102,7 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { } /** - * optional uint32 attacked_group_id = 11; + * optional uint32 attacked_group_id = 10; * @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) 80); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(mp); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(attackedGroupId); } } @@ -205,16 +205,16 @@ public final class SceneCastSkillMpUpdateScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 64: { // mp mp = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 80) { break; } } - case 88: { + case 80: { // 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 66a7261..019cbbe 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 = 3; + * optional uint32 attacked_group_id = 12; */ private int attackedGroupId; /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_info = 10; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 3; + * optional uint32 attacked_group_id = 12; * @return whether the attackedGroupId field is set */ public boolean hasAttackedGroupId() { @@ -52,7 +52,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 3; + * optional uint32 attacked_group_id = 12; * @return this */ public SceneCastSkillScRsp clearAttackedGroupId() { @@ -62,7 +62,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 3; + * optional uint32 attacked_group_id = 12; * @return the attackedGroupId */ public int getAttackedGroupId() { @@ -70,7 +70,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 attacked_group_id = 3; + * optional uint32 attacked_group_id = 12; * @param value the attackedGroupId to set * @return this */ @@ -81,7 +81,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -89,7 +89,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 15; * @return this */ public SceneCastSkillScRsp clearRetcode() { @@ -99,7 +99,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -107,7 +107,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional uint32 retcode = 6; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -118,7 +118,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_info = 10; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -126,7 +126,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_info = 10; * @return this */ public SceneCastSkillScRsp clearBattleInfo() { @@ -136,7 +136,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_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. @@ -150,7 +150,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_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 @@ -164,7 +164,7 @@ public final class SceneCastSkillScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 7; + * optional .SceneBattleInfo battle_info = 10; * @param value the battleInfo to set * @return this */ @@ -247,15 +247,15 @@ public final class SceneCastSkillScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(attackedGroupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 82); output.writeMessageNoTag(battleInfo); } } @@ -282,25 +282,25 @@ public final class SceneCastSkillScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 96: { // attackedGroupId attackedGroupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 82) { break; } } - case 58: { + case 82: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneEnterStageScRspOuterClass.java index 3208f58..3fca31b 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 = 2; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 2; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return this */ public SceneEnterStageScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional uint32 retcode = 2; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 2; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -84,7 +84,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 2; * @return this */ public SceneEnterStageScRsp clearBattleInfo() { @@ -94,7 +94,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_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. @@ -108,7 +108,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_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 @@ -122,7 +122,7 @@ public final class SceneEnterStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 6; + * optional .SceneBattleInfo battle_info = 2; * @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) 16); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 18); output.writeMessageNoTag(battleInfo); } } @@ -227,16 +227,16 @@ public final class SceneEnterStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 18) { break; } } - case 50: { + case 18: { // 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 708d011..ca52c1c 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 = 4; + * optional uint32 group_id = 8; */ private int groupId; /** - * optional uint32 state = 6; + * optional uint32 state = 15; */ private int state; /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_list = 2; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); @@ -45,7 +45,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 8; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -53,7 +53,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 8; * @return this */ public SceneEntityGroupInfo clearGroupId() { @@ -63,7 +63,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 8; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 group_id = 4; + * optional uint32 group_id = 8; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 15; * @return whether the state field is set */ public boolean hasState() { @@ -90,7 +90,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 15; * @return this */ public SceneEntityGroupInfo clearState() { @@ -100,7 +100,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 15; * @return the state */ public int getState() { @@ -108,7 +108,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * optional uint32 state = 6; + * optional uint32 state = 15; * @param value the state to set * @return this */ @@ -119,7 +119,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_list = 2; * @return whether the entityList field is set */ public boolean hasEntityList() { @@ -127,7 +127,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_list = 2; * @return this */ public SceneEntityGroupInfo clearEntityList() { @@ -137,7 +137,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_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 SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_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 SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_list = 2; * @param value the entityList to add * @return this */ @@ -177,7 +177,7 @@ public final class SceneEntityGroupInfoOuterClass { } /** - * repeated .SceneEntityInfo entity_list = 7; + * repeated .SceneEntityInfo entity_list = 2; * @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) 32); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < entityList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 18); output.writeMessageNoTag(entityList.get(i)); } } @@ -297,25 +297,25 @@ public final class SceneEntityGroupInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 64: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 48) { + if (tag != 120) { break; } } - case 48: { + case 120: { // state state = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 18) { break; } } - case 58: { + case 18: { // 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 a4cff4b..8254818 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityInfoOuterClass.java @@ -18,46 +18,46 @@ public final class SceneEntityInfoOuterClass { public static final class SceneEntityInfo extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 inst_id = 1; - */ - private int instId; - /** * optional uint32 group_id = 2; */ private int groupId; /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 6; */ private int entityId; /** - * optional .SceneNpcInfo npc = 3; + * optional uint32 inst_id = 15; */ - private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + private int instId; /** - * optional .MotionInfo motion = 5; - */ - private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); - - /** - * optional .SceneActorInfo actor = 8; - */ - private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); - - /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 5; */ private final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo npcMonster = SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo.newInstance(); /** - * optional .ScenePropInfo prop = 13; + * optional .MotionInfo motion = 7; + */ + private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); + + /** + * optional .SceneActorInfo actor = 9; + */ + private final SceneActorInfoOuterClass.SceneActorInfo actor = SceneActorInfoOuterClass.SceneActorInfo.newInstance(); + + /** + * optional .ScenePropInfo prop = 10; */ private final ScenePropInfoOuterClass.ScenePropInfo prop = ScenePropInfoOuterClass.ScenePropInfo.newInstance(); + /** + * optional .SceneNpcInfo npc = 12; + */ + private final SceneNpcInfoOuterClass.SceneNpcInfo npc = SceneNpcInfoOuterClass.SceneNpcInfo.newInstance(); + /** * optional .SceneSummonUnitInfo summon_unit = 14; */ @@ -73,49 +73,12 @@ public final class SceneEntityInfoOuterClass { return new SceneEntityInfo(); } - /** - * optional uint32 inst_id = 1; - * @return whether the instId field is set - */ - public boolean hasInstId() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 inst_id = 1; - * @return this - */ - public SceneEntityInfo clearInstId() { - bitField0_ &= ~0x00000001; - instId = 0; - return this; - } - - /** - * optional uint32 inst_id = 1; - * @return the instId - */ - public int getInstId() { - return instId; - } - - /** - * optional uint32 inst_id = 1; - * @param value the instId to set - * @return this - */ - public SceneEntityInfo setInstId(final int value) { - bitField0_ |= 0x00000001; - instId = value; - return this; - } - /** * optional uint32 group_id = 2; * @return whether the groupId field is set */ public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -123,7 +86,7 @@ public final class SceneEntityInfoOuterClass { * @return this */ public SceneEntityInfo clearGroupId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; groupId = 0; return this; } @@ -142,31 +105,31 @@ public final class SceneEntityInfoOuterClass { * @return this */ public SceneEntityInfo setGroupId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; groupId = value; return this; } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 6; * @return whether the entityId field is set */ public boolean hasEntityId() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 6; * @return this */ public SceneEntityInfo clearEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; entityId = 0; return this; } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 6; * @return the entityId */ public int getEntityId() { @@ -174,207 +137,73 @@ public final class SceneEntityInfoOuterClass { } /** - * optional uint32 entity_id = 12; + * optional uint32 entity_id = 6; * @param value the entityId to set * @return this */ public SceneEntityInfo setEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; entityId = value; return this; } /** - * optional .SceneNpcInfo npc = 3; - * @return whether the npc field is set + * optional uint32 inst_id = 15; + * @return whether the instId field is set */ - public boolean hasNpc() { + public boolean hasInstId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 inst_id = 15; + * @return this + */ + public SceneEntityInfo clearInstId() { + bitField0_ &= ~0x00000004; + instId = 0; + return this; + } + + /** + * optional uint32 inst_id = 15; + * @return the instId + */ + public int getInstId() { + return instId; + } + + /** + * optional uint32 inst_id = 15; + * @param value the instId to set + * @return this + */ + public SceneEntityInfo setInstId(final int value) { + bitField0_ |= 0x00000004; + instId = value; + return this; + } + + /** + * optional .SceneNpcMonsterInfo npc_monster = 5; + * @return whether the npcMonster field is set + */ + public boolean hasNpcMonster() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .SceneNpcInfo npc = 3; - * @return this - */ - public SceneEntityInfo clearNpc() { - bitField0_ &= ~0x00000008; - npc.clear(); - return this; - } - - /** - * optional .SceneNpcInfo npc = 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 #getMutableNpc()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { - return npc; - } - - /** - * optional .SceneNpcInfo npc = 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 SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { - bitField0_ |= 0x00000008; - return npc; - } - - /** - * optional .SceneNpcInfo npc = 3; - * @param value the npc to set - * @return this - */ - public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { - bitField0_ |= 0x00000008; - npc.copyFrom(value); - return this; - } - - /** - * optional .MotionInfo motion = 5; - * @return whether the motion field is set - */ - public boolean hasMotion() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional .MotionInfo motion = 5; - * @return this - */ - public SceneEntityInfo clearMotion() { - bitField0_ &= ~0x00000010; - motion.clear(); - return this; - } - - /** - * optional .MotionInfo 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. - * - * Use {@link #getMutableMotion()} if you want to modify it. - * - * @return internal storage object for reading - */ - public MotionInfoOuterClass.MotionInfo getMotion() { - return motion; - } - - /** - * optional .MotionInfo 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 - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public MotionInfoOuterClass.MotionInfo getMutableMotion() { - bitField0_ |= 0x00000010; - return motion; - } - - /** - * optional .MotionInfo motion = 5; - * @param value the motion to set - * @return this - */ - public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { - bitField0_ |= 0x00000010; - motion.copyFrom(value); - return this; - } - - /** - * optional .SceneActorInfo actor = 8; - * @return whether the actor field is set - */ - public boolean hasActor() { - return (bitField0_ & 0x00000020) != 0; - } - - /** - * optional .SceneActorInfo actor = 8; - * @return this - */ - public SceneEntityInfo clearActor() { - bitField0_ &= ~0x00000020; - actor.clear(); - return this; - } - - /** - * optional .SceneActorInfo actor = 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 #getMutableActor()} if you want to modify it. - * - * @return internal storage object for reading - */ - public SceneActorInfoOuterClass.SceneActorInfo getActor() { - return actor; - } - - /** - * optional .SceneActorInfo actor = 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 SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { - bitField0_ |= 0x00000020; - return actor; - } - - /** - * optional .SceneActorInfo actor = 8; - * @param value the actor to set - * @return this - */ - public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { - bitField0_ |= 0x00000020; - actor.copyFrom(value); - return this; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 10; - * @return whether the npcMonster field is set - */ - public boolean hasNpcMonster() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 5; * @return this */ public SceneEntityInfo clearNpcMonster() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000008; npcMonster.clear(); return this; } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 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. @@ -388,7 +217,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 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 @@ -397,42 +226,156 @@ public final class SceneEntityInfoOuterClass { * @return internal storage object for modifications */ public SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo getMutableNpcMonster() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; return npcMonster; } /** - * optional .SceneNpcMonsterInfo npc_monster = 10; + * optional .SceneNpcMonsterInfo npc_monster = 5; * @param value the npcMonster to set * @return this */ public SceneEntityInfo setNpcMonster( final SceneNpcMonsterInfoOuterClass.SceneNpcMonsterInfo value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; npcMonster.copyFrom(value); return this; } /** - * optional .ScenePropInfo prop = 13; - * @return whether the prop field is set + * optional .MotionInfo motion = 7; + * @return whether the motion field is set */ - public boolean hasProp() { - return (bitField0_ & 0x00000080) != 0; + public boolean hasMotion() { + return (bitField0_ & 0x00000010) != 0; } /** - * optional .ScenePropInfo prop = 13; + * optional .MotionInfo motion = 7; + * @return this + */ + public SceneEntityInfo clearMotion() { + bitField0_ &= ~0x00000010; + motion.clear(); + return this; + } + + /** + * optional .MotionInfo motion = 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 #getMutableMotion()} if you want to modify it. + * + * @return internal storage object for reading + */ + public MotionInfoOuterClass.MotionInfo getMotion() { + return motion; + } + + /** + * optional .MotionInfo motion = 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 MotionInfoOuterClass.MotionInfo getMutableMotion() { + bitField0_ |= 0x00000010; + return motion; + } + + /** + * optional .MotionInfo motion = 7; + * @param value the motion to set + * @return this + */ + public SceneEntityInfo setMotion(final MotionInfoOuterClass.MotionInfo value) { + bitField0_ |= 0x00000010; + motion.copyFrom(value); + return this; + } + + /** + * optional .SceneActorInfo actor = 9; + * @return whether the actor field is set + */ + public boolean hasActor() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional .SceneActorInfo actor = 9; + * @return this + */ + public SceneEntityInfo clearActor() { + bitField0_ &= ~0x00000020; + actor.clear(); + return this; + } + + /** + * optional .SceneActorInfo actor = 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 #getMutableActor()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneActorInfoOuterClass.SceneActorInfo getActor() { + return actor; + } + + /** + * optional .SceneActorInfo actor = 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 SceneActorInfoOuterClass.SceneActorInfo getMutableActor() { + bitField0_ |= 0x00000020; + return actor; + } + + /** + * optional .SceneActorInfo actor = 9; + * @param value the actor to set + * @return this + */ + public SceneEntityInfo setActor(final SceneActorInfoOuterClass.SceneActorInfo value) { + bitField0_ |= 0x00000020; + actor.copyFrom(value); + return this; + } + + /** + * optional .ScenePropInfo prop = 10; + * @return whether the prop field is set + */ + public boolean hasProp() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .ScenePropInfo prop = 10; * @return this */ public SceneEntityInfo clearProp() { - bitField0_ &= ~0x00000080; + bitField0_ &= ~0x00000040; prop.clear(); return this; } /** - * optional .ScenePropInfo prop = 13; + * optional .ScenePropInfo prop = 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. @@ -446,7 +389,7 @@ public final class SceneEntityInfoOuterClass { } /** - * optional .ScenePropInfo prop = 13; + * optional .ScenePropInfo prop = 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 @@ -455,21 +398,78 @@ public final class SceneEntityInfoOuterClass { * @return internal storage object for modifications */ public ScenePropInfoOuterClass.ScenePropInfo getMutableProp() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return prop; } /** - * optional .ScenePropInfo prop = 13; + * optional .ScenePropInfo prop = 10; * @param value the prop to set * @return this */ public SceneEntityInfo setProp(final ScenePropInfoOuterClass.ScenePropInfo value) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; prop.copyFrom(value); return this; } + /** + * optional .SceneNpcInfo npc = 12; + * @return whether the npc field is set + */ + public boolean hasNpc() { + return (bitField0_ & 0x00000080) != 0; + } + + /** + * optional .SceneNpcInfo npc = 12; + * @return this + */ + public SceneEntityInfo clearNpc() { + bitField0_ &= ~0x00000080; + npc.clear(); + return this; + } + + /** + * optional .SceneNpcInfo npc = 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 #getMutableNpc()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneNpcInfoOuterClass.SceneNpcInfo getNpc() { + return npc; + } + + /** + * optional .SceneNpcInfo npc = 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 SceneNpcInfoOuterClass.SceneNpcInfo getMutableNpc() { + bitField0_ |= 0x00000080; + return npc; + } + + /** + * optional .SceneNpcInfo npc = 12; + * @param value the npc to set + * @return this + */ + public SceneEntityInfo setNpc(final SceneNpcInfoOuterClass.SceneNpcInfo value) { + bitField0_ |= 0x00000080; + npc.copyFrom(value); + return this; + } + /** * optional .SceneSummonUnitInfo summon_unit = 14; * @return whether the summonUnit field is set @@ -533,14 +533,14 @@ public final class SceneEntityInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - instId = other.instId; groupId = other.groupId; entityId = other.entityId; - npc.copyFrom(other.npc); + instId = other.instId; + npcMonster.copyFrom(other.npcMonster); motion.copyFrom(other.motion); actor.copyFrom(other.actor); - npcMonster.copyFrom(other.npcMonster); prop.copyFrom(other.prop); + npc.copyFrom(other.npc); summonUnit.copyFrom(other.summonUnit); } return this; @@ -552,17 +552,17 @@ public final class SceneEntityInfoOuterClass { return this; } cachedSize = -1; - if (other.hasInstId()) { - setInstId(other.instId); - } if (other.hasGroupId()) { setGroupId(other.groupId); } if (other.hasEntityId()) { setEntityId(other.entityId); } - if (other.hasNpc()) { - getMutableNpc().mergeFrom(other.npc); + if (other.hasInstId()) { + setInstId(other.instId); + } + if (other.hasNpcMonster()) { + getMutableNpcMonster().mergeFrom(other.npcMonster); } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); @@ -570,12 +570,12 @@ public final class SceneEntityInfoOuterClass { if (other.hasActor()) { getMutableActor().mergeFrom(other.actor); } - if (other.hasNpcMonster()) { - getMutableNpcMonster().mergeFrom(other.npcMonster); - } if (other.hasProp()) { getMutableProp().mergeFrom(other.prop); } + if (other.hasNpc()) { + getMutableNpc().mergeFrom(other.npc); + } if (other.hasSummonUnit()) { getMutableSummonUnit().mergeFrom(other.summonUnit); } @@ -589,14 +589,14 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - instId = 0; groupId = 0; entityId = 0; - npc.clear(); + instId = 0; + npcMonster.clear(); motion.clear(); actor.clear(); - npcMonster.clear(); prop.clear(); + npc.clear(); summonUnit.clear(); return this; } @@ -608,11 +608,11 @@ public final class SceneEntityInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - npc.clearQuick(); + npcMonster.clearQuick(); motion.clearQuick(); actor.clearQuick(); - npcMonster.clearQuick(); prop.clearQuick(); + npc.clearQuick(); summonUnit.clearQuick(); return this; } @@ -627,50 +627,50 @@ public final class SceneEntityInfoOuterClass { } SceneEntityInfo other = (SceneEntityInfo) o; return bitField0_ == other.bitField0_ - && (!hasInstId() || instId == other.instId) && (!hasGroupId() || groupId == other.groupId) && (!hasEntityId() || entityId == other.entityId) - && (!hasNpc() || npc.equals(other.npc)) + && (!hasInstId() || instId == other.instId) + && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) && (!hasMotion() || motion.equals(other.motion)) && (!hasActor() || actor.equals(other.actor)) - && (!hasNpcMonster() || npcMonster.equals(other.npcMonster)) && (!hasProp() || prop.equals(other.prop)) + && (!hasNpc() || npc.equals(other.npc)) && (!hasSummonUnit() || summonUnit.equals(other.summonUnit)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(instId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); output.writeUInt32NoTag(groupId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 48); output.writeUInt32NoTag(entityId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(instId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 26); - output.writeMessageNoTag(npc); + output.writeRawByte((byte) 42); + output.writeMessageNoTag(npcMonster); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 58); output.writeMessageNoTag(motion); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 66); + output.writeRawByte((byte) 74); output.writeMessageNoTag(actor); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 82); - output.writeMessageNoTag(npcMonster); + output.writeMessageNoTag(prop); } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 106); - output.writeMessageNoTag(prop); + output.writeRawByte((byte) 98); + output.writeMessageNoTag(npc); } if ((bitField0_ & 0x00000100) != 0) { output.writeRawByte((byte) 114); @@ -682,16 +682,16 @@ public final class SceneEntityInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(instId); + } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npc); + size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); } if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -700,10 +700,10 @@ public final class SceneEntityInfoOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(actor); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(npcMonster); + size += 1 + ProtoSink.computeMessageSizeNoTag(prop); } if ((bitField0_ & 0x00000080) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(prop); + size += 1 + ProtoSink.computeMessageSizeNoTag(npc); } 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 8: { - // instId - instId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } case 16: { // groupId groupId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 48) { break; } } - case 96: { + case 48: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 120) { break; } } - case 26: { - // npc - input.readMessage(npc); - bitField0_ |= 0x00000008; + case 120: { + // instId + instId = input.readUInt32(); + bitField0_ |= 0x00000004; 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); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 66) { + if (tag != 74) { break; } } - case 66: { + case 74: { // actor input.readMessage(actor); bitField0_ |= 0x00000020; @@ -773,17 +773,17 @@ public final class SceneEntityInfoOuterClass { } } case 82: { - // npcMonster - input.readMessage(npcMonster); + // prop + input.readMessage(prop); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 106) { + if (tag != 98) { break; } } - case 106: { - // prop - input.readMessage(prop); + case 98: { + // npc + input.readMessage(npc); bitField0_ |= 0x00000080; tag = input.readTag(); if (tag != 114) { @@ -817,16 +817,16 @@ public final class SceneEntityInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.instId, instId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.groupId, groupId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.entityId, entityId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.instId, instId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.npc, npc); + output.writeMessage(FieldNames.npcMonster, npcMonster); } if ((bitField0_ & 0x00000010) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -835,10 +835,10 @@ public final class SceneEntityInfoOuterClass { output.writeMessage(FieldNames.actor, actor); } if ((bitField0_ & 0x00000040) != 0) { - output.writeMessage(FieldNames.npcMonster, npcMonster); + output.writeMessage(FieldNames.prop, prop); } if ((bitField0_ & 0x00000080) != 0) { - output.writeMessage(FieldNames.prop, prop); + output.writeMessage(FieldNames.npc, npc); } if ((bitField0_ & 0x00000100) != 0) { output.writeMessage(FieldNames.summonUnit, summonUnit); @@ -853,24 +853,12 @@ public final class SceneEntityInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -1183779327: - case 1957567924: { - if (input.isAtField(FieldNames.instId)) { - if (!input.trySkipNullValue()) { - instId = 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; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -882,6 +870,18 @@ public final class SceneEntityInfoOuterClass { if (input.isAtField(FieldNames.entityId)) { if (!input.trySkipNullValue()) { entityId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1183779327: + case 1957567924: { + if (input.isAtField(FieldNames.instId)) { + if (!input.trySkipNullValue()) { + instId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -889,10 +889,11 @@ public final class SceneEntityInfoOuterClass { } break; } - case 109281: { - if (input.isAtField(FieldNames.npc)) { + case -1367251527: + case 119679100: { + if (input.isAtField(FieldNames.npcMonster)) { if (!input.trySkipNullValue()) { - input.readMessage(npc); + input.readMessage(npcMonster); bitField0_ |= 0x00000008; } } else { @@ -922,11 +923,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case -1367251527: - case 119679100: { - if (input.isAtField(FieldNames.npcMonster)) { + case 3449699: { + if (input.isAtField(FieldNames.prop)) { if (!input.trySkipNullValue()) { - input.readMessage(npcMonster); + input.readMessage(prop); bitField0_ |= 0x00000040; } } else { @@ -934,10 +934,10 @@ public final class SceneEntityInfoOuterClass { } break; } - case 3449699: { - if (input.isAtField(FieldNames.prop)) { + case 109281: { + if (input.isAtField(FieldNames.npc)) { if (!input.trySkipNullValue()) { - input.readMessage(prop); + input.readMessage(npc); bitField0_ |= 0x00000080; } } else { @@ -1010,22 +1010,22 @@ public final class SceneEntityInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName instId = FieldName.forField("instId", "inst_id"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); static final FieldName entityId = FieldName.forField("entityId", "entity_id"); - static final FieldName npc = FieldName.forField("npc"); + static final FieldName instId = FieldName.forField("instId", "inst_id"); + + static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); static final FieldName motion = FieldName.forField("motion"); static final FieldName actor = FieldName.forField("actor"); - static final FieldName npcMonster = FieldName.forField("npcMonster", "npc_monster"); - static final FieldName prop = FieldName.forField("prop"); + static final FieldName npc = FieldName.forField("npc"); + 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 451e3db..7170f91 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveCsReqOuterClass.java @@ -25,7 +25,7 @@ public final class SceneEntityMoveCsReqOuterClass { private int entryId; /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_list = 4; */ private final RepeatedMessage entityMotionList = RepeatedMessage.newEmptyInstance(EntityMotionOuterClass.EntityMotion.getFactory()); @@ -77,7 +77,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_list = 4; * @return whether the entityMotionList field is set */ public boolean hasEntityMotionList() { @@ -85,7 +85,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_list = 4; * @return this */ public SceneEntityMoveCsReq clearEntityMotionList() { @@ -95,7 +95,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_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 SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_list = 4; * @param value the entityMotionList to add * @return this */ @@ -135,7 +135,7 @@ public final class SceneEntityMoveCsReqOuterClass { } /** - * repeated .EntityMotion entity_motion_list = 11; + * repeated .EntityMotion entity_motion_list = 4; * @param values the entityMotionList to add * @return this */ @@ -217,7 +217,7 @@ public final class SceneEntityMoveCsReqOuterClass { } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < entityMotionList.length(); i++) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 34); output.writeMessageNoTag(entityMotionList.get(i)); } } @@ -247,11 +247,11 @@ public final class SceneEntityMoveCsReqOuterClass { entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 90) { + if (tag != 34) { break; } } - case 90: { + case 34: { // 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 fa021a2..15829cb 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneEntityMoveScNotifyOuterClass.java @@ -19,22 +19,22 @@ public final class SceneEntityMoveScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_pos_version = 8; - */ - private int clientPosVersion; - - /** - * optional uint32 entry_id = 13; - */ - private int entryId; - - /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 3; */ private int entityId; /** - * optional .MotionInfo motion = 12; + * optional uint32 client_pos_version = 5; + */ + private int clientPosVersion; + + /** + * optional uint32 entry_id = 14; + */ + private int entryId; + + /** + * optional .MotionInfo motion = 4; */ private final MotionInfoOuterClass.MotionInfo motion = MotionInfoOuterClass.MotionInfo.newInstance(); @@ -49,99 +49,25 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 client_pos_version = 8; - * @return whether the clientPosVersion field is set + * optional uint32 entity_id = 3; + * @return whether the entityId field is set */ - public boolean hasClientPosVersion() { + public boolean hasEntityId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 8; - * @return this - */ - public SceneEntityMoveScNotify clearClientPosVersion() { - bitField0_ &= ~0x00000001; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 8; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 8; - * @param value the clientPosVersion to set - * @return this - */ - public SceneEntityMoveScNotify setClientPosVersion(final int value) { - bitField0_ |= 0x00000001; - clientPosVersion = value; - return this; - } - - /** - * optional uint32 entry_id = 13; - * @return whether the entryId field is set - */ - public boolean hasEntryId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 entry_id = 13; - * @return this - */ - public SceneEntityMoveScNotify clearEntryId() { - bitField0_ &= ~0x00000002; - entryId = 0; - return this; - } - - /** - * optional uint32 entry_id = 13; - * @return the entryId - */ - public int getEntryId() { - return entryId; - } - - /** - * optional uint32 entry_id = 13; - * @param value the entryId to set - * @return this - */ - public SceneEntityMoveScNotify setEntryId(final int value) { - bitField0_ |= 0x00000002; - entryId = value; - return this; - } - - /** - * optional uint32 entity_id = 15; - * @return whether the entityId field is set - */ - public boolean hasEntityId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 3; * @return this */ public SceneEntityMoveScNotify clearEntityId() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; entityId = 0; return this; } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 3; * @return the entityId */ public int getEntityId() { @@ -149,18 +75,92 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional uint32 entity_id = 15; + * optional uint32 entity_id = 3; * @param value the entityId to set * @return this */ public SceneEntityMoveScNotify setEntityId(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; entityId = value; return this; } /** - * optional .MotionInfo motion = 12; + * 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; + * @return this + */ + public SceneEntityMoveScNotify clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 5; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 5; + * @param value the clientPosVersion to set + * @return this + */ + public SceneEntityMoveScNotify setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional uint32 entry_id = 14; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 entry_id = 14; + * @return this + */ + public SceneEntityMoveScNotify clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 14; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 14; + * @param value the entryId to set + * @return this + */ + public SceneEntityMoveScNotify setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = value; + return this; + } + + /** + * optional .MotionInfo motion = 4; * @return whether the motion field is set */ public boolean hasMotion() { @@ -168,7 +168,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * @return this */ public SceneEntityMoveScNotify clearMotion() { @@ -178,7 +178,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 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. @@ -192,7 +192,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 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 @@ -206,7 +206,7 @@ public final class SceneEntityMoveScNotifyOuterClass { } /** - * optional .MotionInfo motion = 12; + * optional .MotionInfo motion = 4; * @param value the motion to set * @return this */ @@ -221,9 +221,9 @@ public final class SceneEntityMoveScNotifyOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + entityId = other.entityId; clientPosVersion = other.clientPosVersion; entryId = other.entryId; - entityId = other.entityId; motion.copyFrom(other.motion); } return this; @@ -235,15 +235,15 @@ public final class SceneEntityMoveScNotifyOuterClass { return this; } cachedSize = -1; + if (other.hasEntityId()) { + setEntityId(other.entityId); + } if (other.hasClientPosVersion()) { setClientPosVersion(other.clientPosVersion); } if (other.hasEntryId()) { setEntryId(other.entryId); } - if (other.hasEntityId()) { - setEntityId(other.entityId); - } if (other.hasMotion()) { getMutableMotion().mergeFrom(other.motion); } @@ -257,9 +257,9 @@ public final class SceneEntityMoveScNotifyOuterClass { } cachedSize = -1; bitField0_ = 0; + entityId = 0; clientPosVersion = 0; entryId = 0; - entityId = 0; motion.clear(); return this; } @@ -285,28 +285,28 @@ public final class SceneEntityMoveScNotifyOuterClass { } SceneEntityMoveScNotify other = (SceneEntityMoveScNotify) o; return bitField0_ == other.bitField0_ + && (!hasEntityId() || entityId == other.entityId) && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntryId() || entryId == other.entryId) - && (!hasEntityId() || entityId == other.entityId) && (!hasMotion() || motion.equals(other.motion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(entryId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 24); output.writeUInt32NoTag(entityId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(clientPosVersion); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(entryId); + } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(motion); } } @@ -315,13 +315,13 @@ public final class SceneEntityMoveScNotifyOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(entityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(motion); @@ -336,34 +336,34 @@ public final class SceneEntityMoveScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // entryId - entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { + case 24: { // entityId entityId = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 40) { break; } } - case 98: { + case 40: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 34) { + break; + } + } + case 34: { // motion input.readMessage(motion); bitField0_ |= 0x00000008; @@ -390,13 +390,13 @@ public final class SceneEntityMoveScNotifyOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.entityId, entityId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.entryId, entryId); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.entityId, entityId); + output.writeUInt32(FieldNames.entryId, entryId); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.motion, motion); @@ -411,12 +411,24 @@ public final class SceneEntityMoveScNotifyOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -2102099874: + case -740565257: { + if (input.isAtField(FieldNames.entityId)) { + if (!input.trySkipNullValue()) { + entityId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 1787644431: case 1278860153: { if (input.isAtField(FieldNames.clientPosVersion)) { if (!input.trySkipNullValue()) { clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -428,18 +440,6 @@ public final class SceneEntityMoveScNotifyOuterClass { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -2102099874: - case -740565257: { - if (input.isAtField(FieldNames.entityId)) { - if (!input.trySkipNullValue()) { - entityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -511,12 +511,12 @@ 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 entryId = FieldName.forField("entryId", "entry_id"); - static final FieldName entityId = FieldName.forField("entityId", "entity_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 342f326..fa16cfe 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 = 8; + * optional uint32 del_entity = 5; */ private int delEntity; /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 4; */ private final SceneEntityInfoOuterClass.SceneEntityInfo addEntity = SceneEntityInfoOuterClass.SceneEntityInfo.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 5; * @return whether the delEntity field is set */ public boolean hasDelEntity() { @@ -47,7 +47,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 5; * @return this */ public SceneEntityRefreshInfo clearDelEntity() { @@ -57,7 +57,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 5; * @return the delEntity */ public int getDelEntity() { @@ -65,7 +65,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional uint32 del_entity = 8; + * optional uint32 del_entity = 5; * @param value the delEntity to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 4; * @return whether the addEntity field is set */ public boolean hasAddEntity() { @@ -84,7 +84,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 4; * @return this */ public SceneEntityRefreshInfo clearAddEntity() { @@ -94,7 +94,7 @@ public final class SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 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 SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 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 SceneEntityRefreshInfoOuterClass { } /** - * optional .SceneEntityInfo add_entity = 3; + * optional .SceneEntityInfo add_entity = 4; * @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) 64); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(delEntity); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 34); output.writeMessageNoTag(addEntity); } } @@ -227,16 +227,16 @@ public final class SceneEntityRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 40: { // delEntity delEntity = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 26) { + if (tag != 34) { break; } } - case 26: { + case 34: { // 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 f7d470b..63e6ffb 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 = 2; + * optional uint32 entry_id = 9; */ private int entryId; /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 13; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -39,7 +39,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 9; * @return whether the entryId field is set */ public boolean hasEntryId() { @@ -47,7 +47,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 9; * @return this */ public SceneEntityTeleportCsReq clearEntryId() { @@ -57,7 +57,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 9; * @return the entryId */ public int getEntryId() { @@ -65,7 +65,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional uint32 entry_id = 2; + * optional uint32 entry_id = 9; * @param value the entryId to set * @return this */ @@ -76,7 +76,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 13; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -84,7 +84,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 13; * @return this */ public SceneEntityTeleportCsReq clearEntityMotion() { @@ -94,7 +94,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_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. @@ -108,7 +108,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_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 @@ -122,7 +122,7 @@ public final class SceneEntityTeleportCsReqOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 13; * @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) 16); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(entityMotion); } } @@ -227,16 +227,16 @@ public final class SceneEntityTeleportCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 72: { // entryId entryId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // 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 6d0b51b..f88d551 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 client_pos_version = 1; - */ - private int clientPosVersion; - - /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; */ private int retcode; /** - * optional .EntityMotion entity_motion = 7; + * optional uint32 client_pos_version = 15; + */ + private int clientPosVersion; + + /** + * optional .EntityMotion entity_motion = 11; */ private final EntityMotionOuterClass.EntityMotion entityMotion = EntityMotionOuterClass.EntityMotion.newInstance(); @@ -44,62 +44,25 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 client_pos_version = 1; - * @return whether the clientPosVersion field is set + * optional uint32 retcode = 14; + * @return whether the retcode field is set */ - public boolean hasClientPosVersion() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 client_pos_version = 1; - * @return this - */ - public SceneEntityTeleportScRsp clearClientPosVersion() { - bitField0_ &= ~0x00000001; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 1; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 1; - * @param value the clientPosVersion to set - * @return this - */ - public SceneEntityTeleportScRsp setClientPosVersion(final int value) { - bitField0_ |= 0x00000001; - clientPosVersion = 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 = 14; * @return this */ public SceneEntityTeleportScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -107,18 +70,55 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional uint32 retcode = 9; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ public SceneEntityTeleportScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional .EntityMotion entity_motion = 7; + * optional uint32 client_pos_version = 15; + * @return whether the clientPosVersion field is set + */ + public boolean hasClientPosVersion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 client_pos_version = 15; + * @return this + */ + public SceneEntityTeleportScRsp clearClientPosVersion() { + bitField0_ &= ~0x00000002; + clientPosVersion = 0; + return this; + } + + /** + * optional uint32 client_pos_version = 15; + * @return the clientPosVersion + */ + public int getClientPosVersion() { + return clientPosVersion; + } + + /** + * optional uint32 client_pos_version = 15; + * @param value the clientPosVersion to set + * @return this + */ + public SceneEntityTeleportScRsp setClientPosVersion(final int value) { + bitField0_ |= 0x00000002; + clientPosVersion = value; + return this; + } + + /** + * optional .EntityMotion entity_motion = 11; * @return whether the entityMotion field is set */ public boolean hasEntityMotion() { @@ -126,7 +126,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 11; * @return this */ public SceneEntityTeleportScRsp clearEntityMotion() { @@ -136,7 +136,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * 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. @@ -150,7 +150,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * 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 @@ -164,7 +164,7 @@ public final class SceneEntityTeleportScRspOuterClass { } /** - * optional .EntityMotion entity_motion = 7; + * optional .EntityMotion entity_motion = 11; * @param value the entityMotion to set * @return this */ @@ -180,8 +180,8 @@ public final class SceneEntityTeleportScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - clientPosVersion = other.clientPosVersion; retcode = other.retcode; + clientPosVersion = other.clientPosVersion; entityMotion.copyFrom(other.entityMotion); } return this; @@ -193,12 +193,12 @@ public final class SceneEntityTeleportScRspOuterClass { return this; } cachedSize = -1; - if (other.hasClientPosVersion()) { - setClientPosVersion(other.clientPosVersion); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasClientPosVersion()) { + setClientPosVersion(other.clientPosVersion); + } if (other.hasEntityMotion()) { getMutableEntityMotion().mergeFrom(other.entityMotion); } @@ -212,8 +212,8 @@ public final class SceneEntityTeleportScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - clientPosVersion = 0; retcode = 0; + clientPosVersion = 0; entityMotion.clear(); return this; } @@ -239,23 +239,23 @@ public final class SceneEntityTeleportScRspOuterClass { } SceneEntityTeleportScRsp other = (SceneEntityTeleportScRsp) o; return bitField0_ == other.bitField0_ - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasRetcode() || retcode == other.retcode) + && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) && (!hasEntityMotion() || entityMotion.equals(other.entityMotion)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(clientPosVersion); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 90); output.writeMessageNoTag(entityMotion); } } @@ -264,10 +264,10 @@ public final class SceneEntityTeleportScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(entityMotion); @@ -282,25 +282,25 @@ public final class SceneEntityTeleportScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + case 112: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 120) { break; } } - case 58: { + case 120: { + // clientPosVersion + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 90) { + break; + } + } + case 90: { // entityMotion input.readMessage(entityMotion); bitField0_ |= 0x00000004; @@ -327,10 +327,10 @@ public final class SceneEntityTeleportScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.entityMotion, entityMotion); @@ -345,11 +345,10 @@ public final class SceneEntityTeleportScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -357,10 +356,11 @@ public final class SceneEntityTeleportScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -433,10 +433,10 @@ public final class SceneEntityTeleportScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName clientPosVersion = FieldName.forField("clientPosVersion", "client_pos_version"); + static final FieldName entityMotion = FieldName.forField("entityMotion", "entity_motion"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshInfoOuterClass.java index af8c019..3541023 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 = 1; + * optional uint32 group_id = 6; */ private int groupId; /** - * optional uint32 state = 4; + * optional uint32 state = 7; */ private int state; /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 2; */ private int groupRefreshType; /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 15; */ private final RepeatedMessage refreshEntity = RepeatedMessage.newEmptyInstance(SceneEntityRefreshInfoOuterClass.SceneEntityRefreshInfo.getFactory()); @@ -50,7 +50,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 6; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -58,7 +58,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 6; * @return this */ public SceneGroupRefreshInfo clearGroupId() { @@ -68,7 +68,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 6; * @return the groupId */ public int getGroupId() { @@ -76,7 +76,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 group_id = 1; + * optional uint32 group_id = 6; * @param value the groupId to set * @return this */ @@ -87,7 +87,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 4; + * optional uint32 state = 7; * @return whether the state field is set */ public boolean hasState() { @@ -95,7 +95,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 4; + * optional uint32 state = 7; * @return this */ public SceneGroupRefreshInfo clearState() { @@ -105,7 +105,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 4; + * optional uint32 state = 7; * @return the state */ public int getState() { @@ -113,7 +113,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional uint32 state = 4; + * optional uint32 state = 7; * @param value the state to set * @return this */ @@ -124,7 +124,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 2; * @return whether the groupRefreshType field is set */ public boolean hasGroupRefreshType() { @@ -132,7 +132,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 2; * @return this */ public SceneGroupRefreshInfo clearGroupRefreshType() { @@ -142,7 +142,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 2; * @return the groupRefreshType */ public SceneGroupRefreshTypeOuterClass.SceneGroupRefreshType getGroupRefreshType() { @@ -175,7 +175,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * optional .SceneGroupRefreshType group_refresh_type = 7; + * optional .SceneGroupRefreshType group_refresh_type = 2; * @param value the groupRefreshType to set * @return this */ @@ -187,7 +187,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 15; * @return whether the refreshEntity field is set */ public boolean hasRefreshEntity() { @@ -195,7 +195,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 15; * @return this */ public SceneGroupRefreshInfo clearRefreshEntity() { @@ -205,7 +205,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 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. @@ -220,7 +220,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 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 @@ -235,7 +235,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 15; * @param value the refreshEntity to add * @return this */ @@ -247,7 +247,7 @@ public final class SceneGroupRefreshInfoOuterClass { } /** - * repeated .SceneEntityRefreshInfo refresh_entity = 14; + * repeated .SceneEntityRefreshInfo refresh_entity = 15; * @param values the refreshEntity to add * @return this */ @@ -336,20 +336,20 @@ public final class SceneGroupRefreshInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(state); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 16); output.writeEnumNoTag(groupRefreshType); } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < refreshEntity.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 122); output.writeMessageNoTag(refreshEntity.get(i)); } } @@ -380,25 +380,25 @@ public final class SceneGroupRefreshInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { - break; - } - } - case 32: { - // state - state = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); if (tag != 56) { break; } } case 56: { + // state + state = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { // 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 != 114) { + if (tag != 122) { break; } } - case 114: { + case 122: { // refreshEntity tag = input.readRepeatedMessage(refreshEntity, tag); bitField0_ |= 0x00000008; diff --git a/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneGroupRefreshScNotifyOuterClass.java index 644c768..44cb090 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 = 14; + * repeated .SceneGroupRefreshInfo group_refresh_info = 1; */ private final RepeatedMessage groupRefreshInfo = RepeatedMessage.newEmptyInstance(SceneGroupRefreshInfoOuterClass.SceneGroupRefreshInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_info = 1; * @return whether the groupRefreshInfo field is set */ public boolean hasGroupRefreshInfo() { @@ -43,7 +43,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_info = 1; * @return this */ public SceneGroupRefreshScNotify clearGroupRefreshInfo() { @@ -53,7 +53,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_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. @@ -68,7 +68,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_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 @@ -83,7 +83,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_info = 1; * @param value the groupRefreshInfo to add * @return this */ @@ -95,7 +95,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { } /** - * repeated .SceneGroupRefreshInfo group_refresh_info = 14; + * repeated .SceneGroupRefreshInfo group_refresh_info = 1; * @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) 114); + output.writeRawByte((byte) 10); output.writeMessageNoTag(groupRefreshInfo.get(i)); } } @@ -189,7 +189,7 @@ public final class SceneGroupRefreshScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 114: { + case 10: { // 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 c183505..ce5398d 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneGroupStateOuterClass.java @@ -18,18 +18,18 @@ public final class SceneGroupStateOuterClass { public static final class SceneGroupState extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; + /** + * optional uint32 group_id = 6; + */ + private int groupId; + /** * optional uint32 state = 8; */ private int state; /** - * optional uint32 group_id = 11; - */ - private int groupId; - - /** - * optional bool is_default = 10; + * optional bool is_default = 3; */ private boolean isDefault; @@ -43,12 +43,49 @@ public final class SceneGroupStateOuterClass { return new SceneGroupState(); } + /** + * optional uint32 group_id = 6; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + 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_ & 0x00000001) != 0; + return (bitField0_ & 0x00000002) != 0; } /** @@ -56,7 +93,7 @@ public final class SceneGroupStateOuterClass { * @return this */ public SceneGroupState clearState() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000002; state = 0; return this; } @@ -75,50 +112,13 @@ public final class SceneGroupStateOuterClass { * @return this */ public SceneGroupState setState(final int value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; state = value; return this; } /** - * optional uint32 group_id = 11; - * @return whether the groupId field is set - */ - public boolean hasGroupId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 group_id = 11; - * @return this - */ - public SceneGroupState clearGroupId() { - bitField0_ &= ~0x00000002; - groupId = 0; - return this; - } - - /** - * optional uint32 group_id = 11; - * @return the groupId - */ - public int getGroupId() { - return groupId; - } - - /** - * optional uint32 group_id = 11; - * @param value the groupId to set - * @return this - */ - public SceneGroupState setGroupId(final int value) { - bitField0_ |= 0x00000002; - groupId = value; - return this; - } - - /** - * optional bool is_default = 10; + * optional bool is_default = 3; * @return whether the isDefault field is set */ public boolean hasIsDefault() { @@ -126,7 +126,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 10; + * optional bool is_default = 3; * @return this */ public SceneGroupState clearIsDefault() { @@ -136,7 +136,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 10; + * optional bool is_default = 3; * @return the isDefault */ public boolean getIsDefault() { @@ -144,7 +144,7 @@ public final class SceneGroupStateOuterClass { } /** - * optional bool is_default = 10; + * optional bool is_default = 3; * @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_; - state = other.state; groupId = other.groupId; + state = other.state; isDefault = other.isDefault; } return this; @@ -172,12 +172,12 @@ public final class SceneGroupStateOuterClass { return this; } cachedSize = -1; - if (other.hasState()) { - setState(other.state); - } if (other.hasGroupId()) { setGroupId(other.groupId); } + if (other.hasState()) { + setState(other.state); + } if (other.hasIsDefault()) { setIsDefault(other.isDefault); } @@ -191,8 +191,8 @@ public final class SceneGroupStateOuterClass { } cachedSize = -1; bitField0_ = 0; - state = 0; groupId = 0; + state = 0; isDefault = false; return this; } @@ -217,23 +217,23 @@ public final class SceneGroupStateOuterClass { } SceneGroupState other = (SceneGroupState) o; return bitField0_ == other.bitField0_ - && (!hasState() || state == other.state) && (!hasGroupId() || groupId == other.groupId) + && (!hasState() || state == other.state) && (!hasIsDefault() || isDefault == other.isDefault); } @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) 64); output.writeUInt32NoTag(state); } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); - output.writeUInt32NoTag(groupId); - } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 24); 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(state); + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(state); } if ((bitField0_ & 0x00000004) != 0) { size += 2; @@ -260,25 +260,25 @@ public final class SceneGroupStateOuterClass { int tag = input.readTag(); 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_ |= 0x00000001; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // groupId - groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 80) { + if (tag != 24) { break; } } - case 80: { + case 24: { // 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.state, state); + output.writeUInt32(FieldNames.groupId, groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.groupId, groupId); + output.writeUInt32(FieldNames.state, state); } if ((bitField0_ & 0x00000004) != 0) { output.writeBool(FieldNames.isDefault, isDefault); @@ -323,10 +323,11 @@ public final class SceneGroupStateOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -334,11 +335,10 @@ public final class SceneGroupStateOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -411,10 +411,10 @@ public final class SceneGroupStateOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName state = FieldName.forField("state"); - static final FieldName groupId = FieldName.forField("groupId", "group_id"); + static final FieldName state = FieldName.forField("state"); + 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 add4f0d..7945b08 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneInfoOuterClass.java @@ -22,70 +22,78 @@ public final class SceneInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 game_mode_type = 1; + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 1; */ - private int gameModeType; + private int worldId; /** - * optional uint32 leader_entity_id = 2; + * optional uint32 entry_id = 2; + */ + private int entryId; + + /** + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 5; */ private int leaderEntityId; - /** - * optional uint32 plane_id = 5; - */ - private int planeId; - - /** - * optional uint32 client_pos_version = 6; - */ - private int clientPosVersion; - /** * optional uint32 floor_id = 8; */ private int floorId; /** - * optional uint32 world_id = 12; + * optional uint32 game_mode_type = 13; */ - private int worldId; + private int gameModeType; /** - * optional uint32 entry_id = 15; + * optional uint32 plane_id = 14; */ - private int entryId; + private int planeId; /** - * repeated uint32 group_id_list = 3; + * optional uint32 client_pos_version = 15; */ - private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); + private int clientPosVersion; /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 7; */ private final RepeatedInt lightenSectionList = RepeatedInt.newEmptyInstance(); + /** + * repeated uint32 group_id_list = 12; + */ + private final RepeatedInt groupIdList = RepeatedInt.newEmptyInstance(); + /** * repeated .SceneEntityInfo entity_list = 10; */ private final RepeatedMessage entityList = RepeatedMessage.newEmptyInstance(SceneEntityInfoOuterClass.SceneEntityInfo.getFactory()); /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; - */ - private final RepeatedMessage entityGroupList = RepeatedMessage.newEmptyInstance(SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo.getFactory()); - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 1331; + * repeated .SceneInfo.ExtraDataEntry extra_data = 211; */ private final RepeatedMessage extraData = RepeatedMessage.newEmptyInstance(ExtraDataEntry.getFactory()); /** - * repeated .SceneGroupState group_state_list = 1768; + * repeated .SceneGroupState group_state_list = 605; */ 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() { } @@ -97,62 +105,127 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 game_mode_type = 1; - * @return whether the gameModeType field is set + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 1; + * @return whether the worldId field is set */ - public boolean hasGameModeType() { + public boolean hasWorldId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 game_mode_type = 1; + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 1; * @return this */ - public SceneInfo clearGameModeType() { + public SceneInfo clearWorldId() { bitField0_ &= ~0x00000001; - gameModeType = 0; + worldId = 0; return this; } /** - * optional uint32 game_mode_type = 1; - * @return the gameModeType + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 1; + * @return the worldId */ - public int getGameModeType() { - return gameModeType; + public int getWorldId() { + return worldId; } /** - * optional uint32 game_mode_type = 1; - * @param value the gameModeType to set + * 
+     *  Guessed
+     *
+ * + * optional uint32 world_id = 1; + * @param value the worldId to set * @return this */ - public SceneInfo setGameModeType(final int value) { + public SceneInfo setWorldId(final int value) { bitField0_ |= 0x00000001; - gameModeType = value; + worldId = value; return this; } /** - * optional uint32 leader_entity_id = 2; - * @return whether the leaderEntityId field is set + * optional uint32 entry_id = 2; + * @return whether the entryId field is set */ - public boolean hasLeaderEntityId() { + public boolean hasEntryId() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 leader_entity_id = 2; + * optional uint32 entry_id = 2; + * @return this + */ + public SceneInfo clearEntryId() { + bitField0_ &= ~0x00000002; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 2; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 2; + * @param value the entryId to set + * @return this + */ + public SceneInfo setEntryId(final int value) { + bitField0_ |= 0x00000002; + entryId = value; + return this; + } + + /** + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 5; + * @return whether the leaderEntityId field is set + */ + public boolean hasLeaderEntityId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 5; * @return this */ public SceneInfo clearLeaderEntityId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000004; leaderEntityId = 0; return this; } /** - * optional uint32 leader_entity_id = 2; + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 5; * @return the leaderEntityId */ public int getLeaderEntityId() { @@ -160,87 +233,17 @@ public final class SceneInfoOuterClass { } /** - * optional uint32 leader_entity_id = 2; + * 
+     *  Guessed
+     *
+ * + * optional uint32 leader_entity_id = 5; * @param value the leaderEntityId to set * @return this */ public SceneInfo setLeaderEntityId(final int value) { - bitField0_ |= 0x00000002; - leaderEntityId = value; - return this; - } - - /** - * optional uint32 plane_id = 5; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 plane_id = 5; - * @return this - */ - public SceneInfo clearPlaneId() { - bitField0_ &= ~0x00000004; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 5; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 5; - * @param value the planeId to set - * @return this - */ - public SceneInfo setPlaneId(final int value) { bitField0_ |= 0x00000004; - planeId = value; - return this; - } - - /** - * optional uint32 client_pos_version = 6; - * @return whether the clientPosVersion field is set - */ - public boolean hasClientPosVersion() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 client_pos_version = 6; - * @return this - */ - public SceneInfo clearClientPosVersion() { - bitField0_ &= ~0x00000008; - clientPosVersion = 0; - return this; - } - - /** - * optional uint32 client_pos_version = 6; - * @return the clientPosVersion - */ - public int getClientPosVersion() { - return clientPosVersion; - } - - /** - * optional uint32 client_pos_version = 6; - * @param value the clientPosVersion to set - * @return this - */ - public SceneInfo setClientPosVersion(final int value) { - bitField0_ |= 0x00000008; - clientPosVersion = value; + leaderEntityId = value; return this; } @@ -249,7 +252,7 @@ public final class SceneInfoOuterClass { * @return whether the floorId field is set */ public boolean hasFloorId() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -257,7 +260,7 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo clearFloorId() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; floorId = 0; return this; } @@ -276,173 +279,142 @@ public final class SceneInfoOuterClass { * @return this */ public SceneInfo setFloorId(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; floorId = value; return this; } /** - * optional uint32 world_id = 12; - * @return whether the worldId field is set + * optional uint32 game_mode_type = 13; + * @return whether the gameModeType field is set */ - public boolean hasWorldId() { + 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 world_id = 12; + * optional uint32 plane_id = 14; * @return this */ - public SceneInfo clearWorldId() { + public SceneInfo clearPlaneId() { bitField0_ &= ~0x00000020; - worldId = 0; + planeId = 0; return this; } /** - * optional uint32 world_id = 12; - * @return the worldId + * optional uint32 plane_id = 14; + * @return the planeId */ - public int getWorldId() { - return worldId; + public int getPlaneId() { + return planeId; } /** - * optional uint32 world_id = 12; - * @param value the worldId to set + * optional uint32 plane_id = 14; + * @param value the planeId to set * @return this */ - public SceneInfo setWorldId(final int value) { + public SceneInfo setPlaneId(final int value) { bitField0_ |= 0x00000020; - worldId = value; + planeId = value; return this; } /** - * optional uint32 entry_id = 15; - * @return whether the entryId field is set + * optional uint32 client_pos_version = 15; + * @return whether the clientPosVersion field is set */ - public boolean hasEntryId() { + public boolean hasClientPosVersion() { return (bitField0_ & 0x00000040) != 0; } /** - * optional uint32 entry_id = 15; + * optional uint32 client_pos_version = 15; * @return this */ - public SceneInfo clearEntryId() { + public SceneInfo clearClientPosVersion() { bitField0_ &= ~0x00000040; - entryId = 0; + clientPosVersion = 0; return this; } /** - * optional uint32 entry_id = 15; - * @return the entryId + * optional uint32 client_pos_version = 15; + * @return the clientPosVersion */ - public int getEntryId() { - return entryId; + public int getClientPosVersion() { + return clientPosVersion; } /** - * optional uint32 entry_id = 15; - * @param value the entryId to set + * optional uint32 client_pos_version = 15; + * @param value the clientPosVersion to set * @return this */ - public SceneInfo setEntryId(final int value) { + public SceneInfo setClientPosVersion(final int value) { bitField0_ |= 0x00000040; - entryId = value; + clientPosVersion = value; return this; } /** - * repeated uint32 group_id_list = 3; - * @return whether the groupIdList field is set + * repeated uint32 lighten_section_list = 7; + * @return whether the lightenSectionList field is set */ - public boolean hasGroupIdList() { + public boolean hasLightenSectionList() { return (bitField0_ & 0x00000080) != 0; } /** - * repeated uint32 group_id_list = 3; - * @return this - */ - public SceneInfo clearGroupIdList() { - bitField0_ &= ~0x00000080; - groupIdList.clear(); - return this; - } - - /** - * repeated uint32 group_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 #getMutableGroupIdList()} if you want to modify it. - * - * @return internal storage object for reading - */ - public RepeatedInt getGroupIdList() { - return groupIdList; - } - - /** - * repeated uint32 group_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 getMutableGroupIdList() { - bitField0_ |= 0x00000080; - return groupIdList; - } - - /** - * repeated uint32 group_id_list = 3; - * @param value the groupIdList to add - * @return this - */ - public SceneInfo addGroupIdList(final int value) { - bitField0_ |= 0x00000080; - groupIdList.add(value); - return this; - } - - /** - * repeated uint32 group_id_list = 3; - * @param values the groupIdList to add - * @return this - */ - public SceneInfo addAllGroupIdList(final int... values) { - bitField0_ |= 0x00000080; - groupIdList.addAll(values); - return this; - } - - /** - * repeated uint32 lighten_section_list = 9; - * @return whether the lightenSectionList field is set - */ - public boolean hasLightenSectionList() { - return (bitField0_ & 0x00000100) != 0; - } - - /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 7; * @return this */ public SceneInfo clearLightenSectionList() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000080; lightenSectionList.clear(); return this; } /** - * repeated uint32 lighten_section_list = 9; + * 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. @@ -456,7 +428,7 @@ public final class SceneInfoOuterClass { } /** - * repeated uint32 lighten_section_list = 9; + * 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 @@ -465,32 +437,100 @@ public final class SceneInfoOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableLightenSectionList() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return lightenSectionList; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 7; * @param value the lightenSectionList to add * @return this */ public SceneInfo addLightenSectionList(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; lightenSectionList.add(value); return this; } /** - * repeated uint32 lighten_section_list = 9; + * repeated uint32 lighten_section_list = 7; * @param values the lightenSectionList to add * @return this */ public SceneInfo addAllLightenSectionList(final int... values) { - bitField0_ |= 0x00000100; + 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; + * @return this + */ + public SceneInfo clearGroupIdList() { + bitField0_ &= ~0x00000100; + groupIdList.clear(); + return this; + } + + /** + * repeated uint32 group_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 #getMutableGroupIdList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getGroupIdList() { + return groupIdList; + } + + /** + * repeated uint32 group_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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableGroupIdList() { + bitField0_ |= 0x00000100; + return groupIdList; + } + + /** + * repeated uint32 group_id_list = 12; + * @param value the groupIdList to add + * @return this + */ + public SceneInfo addGroupIdList(final int value) { + bitField0_ |= 0x00000100; + groupIdList.add(value); + return this; + } + + /** + * repeated uint32 group_id_list = 12; + * @param values the groupIdList to add + * @return this + */ + public SceneInfo addAllGroupIdList(final int... values) { + bitField0_ |= 0x00000100; + groupIdList.addAll(values); + return this; + } + /** * repeated .SceneEntityInfo entity_list = 10; * @return whether the entityList field is set @@ -560,25 +600,162 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; - * @return whether the entityGroupList field is set + * repeated .SceneInfo.ExtraDataEntry extra_data = 211; + * @return whether the extraData field is set */ - public boolean hasEntityGroupList() { + public boolean hasExtraData() { return (bitField0_ & 0x00000400) != 0; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; + * 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; * @return this */ public SceneInfo clearEntityGroupList() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00001000; entityGroupList.clear(); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; + * repeated .SceneEntityGroupInfo entity_group_list = 1132; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -593,7 +770,7 @@ public final class SceneInfoOuterClass { } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; + * repeated .SceneEntityGroupInfo entity_group_list = 1132; * * 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,189 +780,52 @@ public final class SceneInfoOuterClass { */ public RepeatedMessage getMutableEntityGroupList( ) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00001000; return entityGroupList; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; + * repeated .SceneEntityGroupInfo entity_group_list = 1132; * @param value the entityGroupList to add * @return this */ public SceneInfo addEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00001000; entityGroupList.add(value); return this; } /** - * repeated .SceneEntityGroupInfo entity_group_list = 497; + * repeated .SceneEntityGroupInfo entity_group_list = 1132; * @param values the entityGroupList to add * @return this */ public SceneInfo addAllEntityGroupList( final SceneEntityGroupInfoOuterClass.SceneEntityGroupInfo... values) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00001000; entityGroupList.addAll(values); return this; } - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 1331; - * @return whether the extraData field is set - */ - public boolean hasExtraData() { - return (bitField0_ & 0x00000800) != 0; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 1331; - * @return this - */ - public SceneInfo clearExtraData() { - bitField0_ &= ~0x00000800; - extraData.clear(); - return this; - } - - /** - * repeated .SceneInfo.ExtraDataEntry extra_data = 1331; - * - * This 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 = 1331; - * - * 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 = 1331; - * @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 = 1331; - * @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 = 1768; - * @return whether the groupStateList field is set - */ - public boolean hasGroupStateList() { - return (bitField0_ & 0x00001000) != 0; - } - - /** - * repeated .SceneGroupState group_state_list = 1768; - * @return this - */ - public SceneInfo clearGroupStateList() { - bitField0_ &= ~0x00001000; - groupStateList.clear(); - return this; - } - - /** - * repeated .SceneGroupState group_state_list = 1768; - * - * This 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 = 1768; - * - * 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 = 1768; - * @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 = 1768; - * @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_; - gameModeType = other.gameModeType; - leaderEntityId = other.leaderEntityId; - planeId = other.planeId; - clientPosVersion = other.clientPosVersion; - floorId = other.floorId; worldId = other.worldId; entryId = other.entryId; - groupIdList.copyFrom(other.groupIdList); + leaderEntityId = other.leaderEntityId; + floorId = other.floorId; + gameModeType = other.gameModeType; + planeId = other.planeId; + clientPosVersion = other.clientPosVersion; lightenSectionList.copyFrom(other.lightenSectionList); + groupIdList.copyFrom(other.groupIdList); entityList.copyFrom(other.entityList); - entityGroupList.copyFrom(other.entityGroupList); extraData.copyFrom(other.extraData); groupStateList.copyFrom(other.groupStateList); + entityGroupList.copyFrom(other.entityGroupList); } return this; } @@ -796,45 +836,45 @@ public final class SceneInfoOuterClass { return this; } cachedSize = -1; - if (other.hasGameModeType()) { - setGameModeType(other.gameModeType); + if (other.hasWorldId()) { + setWorldId(other.worldId); + } + 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.hasFloorId()) { - setFloorId(other.floorId); - } - if (other.hasWorldId()) { - setWorldId(other.worldId); - } - if (other.hasEntryId()) { - setEntryId(other.entryId); + if (other.hasLightenSectionList()) { + getMutableLightenSectionList().addAll(other.lightenSectionList); } 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; } @@ -845,19 +885,19 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - gameModeType = 0; - leaderEntityId = 0; - planeId = 0; - clientPosVersion = 0; - floorId = 0; worldId = 0; entryId = 0; - groupIdList.clear(); + leaderEntityId = 0; + floorId = 0; + gameModeType = 0; + planeId = 0; + clientPosVersion = 0; lightenSectionList.clear(); + groupIdList.clear(); entityList.clear(); - entityGroupList.clear(); extraData.clear(); groupStateList.clear(); + entityGroupList.clear(); return this; } @@ -868,12 +908,12 @@ public final class SceneInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - groupIdList.clear(); lightenSectionList.clear(); + groupIdList.clear(); entityList.clearQuick(); - entityGroupList.clearQuick(); extraData.clearQuick(); groupStateList.clearQuick(); + entityGroupList.clearQuick(); return this; } @@ -887,61 +927,61 @@ public final class SceneInfoOuterClass { } SceneInfo other = (SceneInfo) o; return bitField0_ == other.bitField0_ - && (!hasGameModeType() || gameModeType == other.gameModeType) - && (!hasLeaderEntityId() || leaderEntityId == other.leaderEntityId) - && (!hasPlaneId() || planeId == other.planeId) - && (!hasClientPosVersion() || clientPosVersion == other.clientPosVersion) - && (!hasFloorId() || floorId == other.floorId) && (!hasWorldId() || worldId == other.worldId) && (!hasEntryId() || entryId == other.entryId) - && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) + && (!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)) + && (!hasGroupIdList() || groupIdList.equals(other.groupIdList)) && (!hasEntityList() || entityList.equals(other.entityList)) - && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)) && (!hasExtraData() || extraData.equals(other.extraData)) - && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)); + && (!hasGroupStateList() || groupStateList.equals(other.groupStateList)) + && (!hasEntityGroupList() || entityGroupList.equals(other.entityGroupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(gameModeType); + output.writeUInt32NoTag(worldId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 16); - output.writeUInt32NoTag(leaderEntityId); + output.writeUInt32NoTag(entryId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(leaderEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 64); output.writeUInt32NoTag(floorId); } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(gameModeType); + } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(worldId); + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000040) != 0) { output.writeRawByte((byte) 120); - output.writeUInt32NoTag(entryId); + output.writeUInt32NoTag(clientPosVersion); } if ((bitField0_ & 0x00000080) != 0) { - for (int i = 0; i < groupIdList.length(); i++) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(groupIdList.array()[i]); + for (int i = 0; i < lightenSectionList.length(); i++) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(lightenSectionList.array()[i]); } } if ((bitField0_ & 0x00000100) != 0) { - for (int i = 0; i < lightenSectionList.length(); i++) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(lightenSectionList.array()[i]); + for (int i = 0; i < groupIdList.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(groupIdList.array()[i]); } } if ((bitField0_ & 0x00000200) != 0) { @@ -951,67 +991,67 @@ public final class SceneInfoOuterClass { } } if ((bitField0_ & 0x00000400) != 0) { - for (int i = 0; i < entityGroupList.length(); i++) { - output.writeRawLittleEndian16((short) 8074); - output.writeMessageNoTag(entityGroupList.get(i)); - } - } - if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < extraData.length(); i++) { - output.writeRawLittleEndian16((short) 21402); + output.writeRawLittleEndian16((short) 3482); output.writeMessageNoTag(extraData.get(i)); } } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000800) != 0) { for (int i = 0; i < groupStateList.length(); i++) { - output.writeRawLittleEndian16((short) 28354); + output.writeRawLittleEndian16((short) 9706); output.writeMessageNoTag(groupStateList.get(i)); } } + if ((bitField0_ & 0x00001000) != 0) { + for (int i = 0; i < entityGroupList.length(); i++) { + output.writeRawLittleEndian16((short) 18146); + output.writeMessageNoTag(entityGroupList.get(i)); + } + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(leaderEntityId); - } - if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); - } - if ((bitField0_ & 0x00000010) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(floorId); - } - if ((bitField0_ & 0x00000020) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(worldId); } - if ((bitField0_ & 0x00000040) != 0) { + 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) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(gameModeType); + } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + } + if ((bitField0_ & 0x00000040) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(clientPosVersion); + } if ((bitField0_ & 0x00000080) != 0) { - size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); + size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - size += (1 * lightenSectionList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lightenSectionList); + size += (1 * groupIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(groupIdList); } if ((bitField0_ & 0x00000200) != 0) { size += (1 * entityList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityList); } if ((bitField0_ & 0x00000400) != 0) { - size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); - } - if ((bitField0_ & 0x00000800) != 0) { size += (2 * extraData.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(extraData); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000800) != 0) { size += (2 * groupStateList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(groupStateList); } + if ((bitField0_ & 0x00001000) != 0) { + size += (2 * entityGroupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(entityGroupList); + } return size; } @@ -1023,8 +1063,8 @@ public final class SceneInfoOuterClass { while (true) { switch (tag) { case 8: { - // gameModeType - gameModeType = input.readUInt32(); + // worldId + worldId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 16) { @@ -1032,8 +1072,8 @@ public final class SceneInfoOuterClass { } } case 16: { - // leaderEntityId - leaderEntityId = input.readUInt32(); + // entryId + entryId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 40) { @@ -1041,19 +1081,10 @@ public final class SceneInfoOuterClass { } } case 40: { - // planeId - planeId = input.readUInt32(); + // leaderEntityId + leaderEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // clientPosVersion - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); if (tag != 64) { break; } @@ -1061,15 +1092,24 @@ public final class SceneInfoOuterClass { case 64: { // floorId floorId = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { - // worldId - worldId = input.readUInt32(); + case 104: { + // gameModeType + gameModeType = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 120) { @@ -1077,26 +1117,26 @@ public final class SceneInfoOuterClass { } } case 120: { - // entryId - entryId = input.readUInt32(); + // clientPosVersion + clientPosVersion = input.readUInt32(); bitField0_ |= 0x00000040; tag = input.readTag(); - if (tag != 26) { + if (tag != 58) { break; } } - case 26: { - // groupIdList [packed=true] - input.readPackedUInt32(groupIdList, tag); - bitField0_ |= 0x00000080; - tag = input.readTag(); - if (tag != 74) { - break; - } - } - case 74: { + case 58: { // lightenSectionList [packed=true] input.readPackedUInt32(lightenSectionList, tag); + bitField0_ |= 0x00000080; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // groupIdList [packed=true] + input.readPackedUInt32(groupIdList, tag); bitField0_ |= 0x00000100; tag = input.readTag(); if (tag != 82) { @@ -1107,29 +1147,29 @@ public final class SceneInfoOuterClass { // entityList tag = input.readRepeatedMessage(entityList, tag); bitField0_ |= 0x00000200; - if (tag != 3978) { + if (tag != 1690) { break; } } - case 3978: { - // entityGroupList - tag = input.readRepeatedMessage(entityGroupList, tag); - bitField0_ |= 0x00000400; - if (tag != 10650) { - break; - } - } - case 10650: { + case 1690: { // extraData tag = input.readRepeatedMessage(extraData, tag); - bitField0_ |= 0x00000800; - if (tag != 14146) { + bitField0_ |= 0x00000400; + if (tag != 4842) { break; } } - case 14146: { + case 4842: { // groupStateList tag = input.readRepeatedMessage(groupStateList, tag); + bitField0_ |= 0x00000800; + if (tag != 9058) { + break; + } + } + case 9058: { + // entityGroupList + tag = input.readRepeatedMessage(entityGroupList, tag); bitField0_ |= 0x00001000; if (tag != 0) { break; @@ -1145,15 +1185,15 @@ public final class SceneInfoOuterClass { tag = input.readTag(); break; } - case 24: { - // groupIdList [packed=false] - tag = input.readRepeatedUInt32(groupIdList, tag); + case 56: { + // lightenSectionList [packed=false] + tag = input.readRepeatedUInt32(lightenSectionList, tag); bitField0_ |= 0x00000080; break; } - case 72: { - // lightenSectionList [packed=false] - tag = input.readRepeatedUInt32(lightenSectionList, tag); + case 96: { + // groupIdList [packed=false] + tag = input.readRepeatedUInt32(groupIdList, tag); bitField0_ |= 0x00000100; break; } @@ -1165,44 +1205,44 @@ public final class SceneInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.gameModeType, gameModeType); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.leaderEntityId, leaderEntityId); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeUInt32(FieldNames.floorId, floorId); - } - if ((bitField0_ & 0x00000020) != 0) { output.writeUInt32(FieldNames.worldId, worldId); } - if ((bitField0_ & 0x00000040) != 0) { + 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) { + output.writeUInt32(FieldNames.gameModeType, gameModeType); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.planeId, planeId); + } + if ((bitField0_ & 0x00000040) != 0) { + output.writeUInt32(FieldNames.clientPosVersion, clientPosVersion); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); + output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRepeatedUInt32(FieldNames.lightenSectionList, lightenSectionList); + output.writeRepeatedUInt32(FieldNames.groupIdList, groupIdList); } if ((bitField0_ & 0x00000200) != 0) { output.writeRepeatedMessage(FieldNames.entityList, entityList); } if ((bitField0_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); - } - if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.extraData, extraData); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00000800) != 0) { output.writeRepeatedMessage(FieldNames.groupStateList, groupStateList); } + if ((bitField0_ & 0x00001000) != 0) { + output.writeRepeatedMessage(FieldNames.entityGroupList, entityGroupList); + } output.endObject(); } @@ -1213,72 +1253,12 @@ public final class SceneInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -464498289: - case 1937775689: { - if (input.isAtField(FieldNames.gameModeType)) { - if (!input.trySkipNullValue()) { - gameModeType = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } - case 1693061255: - case 794634049: { - if (input.isAtField(FieldNames.leaderEntityId)) { - if (!input.trySkipNullValue()) { - leaderEntityId = 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 { - input.skipUnknownField(); - } - break; - } - case 1787644431: - case 1278860153: { - if (input.isAtField(FieldNames.clientPosVersion)) { - if (!input.trySkipNullValue()) { - clientPosVersion = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case -766027193: - case 2022982190: { - if (input.isAtField(FieldNames.floorId)) { - if (!input.trySkipNullValue()) { - floorId = input.readUInt32(); - bitField0_ |= 0x00000010; - } - } else { - input.skipUnknownField(); - } - break; - } case 1525188685: case 36230376: { if (input.isAtField(FieldNames.worldId)) { if (!input.trySkipNullValue()) { worldId = input.readUInt32(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -1290,19 +1270,67 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.entryId)) { if (!input.trySkipNullValue()) { entryId = input.readUInt32(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); } break; } - case 457110456: - case 1703805826: { - if (input.isAtField(FieldNames.groupIdList)) { + case 1693061255: + case 794634049: { + if (input.isAtField(FieldNames.leaderEntityId)) { if (!input.trySkipNullValue()) { - input.readRepeatedUInt32(groupIdList); - bitField0_ |= 0x00000080; + 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case -464498289: + case 1937775689: { + 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1787644431: + case 1278860153: { + if (input.isAtField(FieldNames.clientPosVersion)) { + if (!input.trySkipNullValue()) { + clientPosVersion = input.readUInt32(); + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -1314,6 +1342,18 @@ public final class SceneInfoOuterClass { if (input.isAtField(FieldNames.lightenSectionList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(lightenSectionList); + bitField0_ |= 0x00000080; + } + } else { + input.skipUnknownField(); + } + break; + } + case 457110456: + case 1703805826: { + if (input.isAtField(FieldNames.groupIdList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(groupIdList); bitField0_ |= 0x00000100; } } else { @@ -1333,24 +1373,12 @@ 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_ |= 0x00000800; + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -1362,6 +1390,18 @@ 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 { @@ -1775,31 +1815,31 @@ public final class SceneInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName gameModeType = FieldName.forField("gameModeType", "game_mode_type"); + static final FieldName worldId = FieldName.forField("worldId", "world_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 floorId = FieldName.forField("floorId", "floor_id"); - - static final FieldName worldId = FieldName.forField("worldId", "world_id"); - - static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + static final FieldName lightenSectionList = FieldName.forField("lightenSectionList", "lighten_section_list"); static final FieldName groupIdList = FieldName.forField("groupIdList", "group_id_list"); - static final FieldName 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 39ca78f..1807c3d 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 max_hp = 9; - */ - private int maxHp; - - /** - * optional uint32 monster_id = 12; + * optional uint32 monster_id = 2; */ private int monsterId; /** - * optional uint32 cur_hp = 14; + * optional uint32 cur_hp = 3; */ private int curHp; + /** + * optional uint32 max_hp = 9; + */ + private int maxHp; + private SceneMonster() { } @@ -43,12 +43,86 @@ public final class SceneMonsterOuterClass { return new SceneMonster(); } + /** + * optional uint32 monster_id = 2; + * @return whether the monsterId field is set + */ + public boolean hasMonsterId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 monster_id = 2; + * @return this + */ + public SceneMonster clearMonsterId() { + bitField0_ &= ~0x00000001; + monsterId = 0; + return this; + } + + /** + * optional uint32 monster_id = 2; + * @return the monsterId + */ + public int getMonsterId() { + return monsterId; + } + + /** + * optional uint32 monster_id = 2; + * @param value the monsterId to set + * @return this + */ + public SceneMonster setMonsterId(final int value) { + bitField0_ |= 0x00000001; + monsterId = value; + return this; + } + + /** + * optional uint32 cur_hp = 3; + * @return whether the curHp field is set + */ + public boolean hasCurHp() { + 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_ & 0x00000001) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -56,7 +130,7 @@ public final class SceneMonsterOuterClass { * @return this */ public SceneMonster clearMaxHp() { - bitField0_ &= ~0x00000001; + bitField0_ &= ~0x00000004; maxHp = 0; return this; } @@ -75,82 +149,8 @@ public final class SceneMonsterOuterClass { * @return this */ public SceneMonster setMaxHp(final int value) { - bitField0_ |= 0x00000001; - maxHp = value; - return this; - } - - /** - * optional uint32 monster_id = 12; - * @return whether the monsterId field is set - */ - public boolean hasMonsterId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 monster_id = 12; - * @return this - */ - public SceneMonster clearMonsterId() { - bitField0_ &= ~0x00000002; - monsterId = 0; - return this; - } - - /** - * optional uint32 monster_id = 12; - * @return the monsterId - */ - public int getMonsterId() { - return monsterId; - } - - /** - * optional uint32 monster_id = 12; - * @param value the monsterId to set - * @return this - */ - public SceneMonster setMonsterId(final int value) { - bitField0_ |= 0x00000002; - monsterId = value; - return this; - } - - /** - * optional uint32 cur_hp = 14; - * @return whether the curHp field is set - */ - public boolean hasCurHp() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 cur_hp = 14; - * @return this - */ - public SceneMonster clearCurHp() { - bitField0_ &= ~0x00000004; - curHp = 0; - return this; - } - - /** - * optional uint32 cur_hp = 14; - * @return the curHp - */ - public int getCurHp() { - return curHp; - } - - /** - * optional uint32 cur_hp = 14; - * @param value the curHp to set - * @return this - */ - public SceneMonster setCurHp(final int value) { bitField0_ |= 0x00000004; - curHp = value; + maxHp = value; return this; } @@ -159,9 +159,9 @@ public final class SceneMonsterOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - maxHp = other.maxHp; monsterId = other.monsterId; curHp = other.curHp; + maxHp = other.maxHp; } return this; } @@ -172,15 +172,15 @@ public final class SceneMonsterOuterClass { return this; } cachedSize = -1; - if (other.hasMaxHp()) { - setMaxHp(other.maxHp); - } if (other.hasMonsterId()) { setMonsterId(other.monsterId); } if (other.hasCurHp()) { setCurHp(other.curHp); } + if (other.hasMaxHp()) { + setMaxHp(other.maxHp); + } return this; } @@ -191,9 +191,9 @@ public final class SceneMonsterOuterClass { } cachedSize = -1; bitField0_ = 0; - maxHp = 0; monsterId = 0; curHp = 0; + maxHp = 0; return this; } @@ -217,39 +217,39 @@ public final class SceneMonsterOuterClass { } SceneMonster other = (SceneMonster) o; return bitField0_ == other.bitField0_ - && (!hasMaxHp() || maxHp == other.maxHp) && (!hasMonsterId() || monsterId == other.monsterId) - && (!hasCurHp() || curHp == other.curHp); + && (!hasCurHp() || curHp == other.curHp) + && (!hasMaxHp() || maxHp == other.maxHp); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(maxHp); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(monsterId); } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); output.writeUInt32NoTag(curHp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(maxHp); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(monsterId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(curHp); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(maxHp); + } return size; } @@ -260,27 +260,27 @@ public final class SceneMonsterOuterClass { int tag = input.readTag(); while (true) { switch (tag) { + case 16: { + // monsterId + monsterId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // curHp + curHp = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 72) { + break; + } + } case 72: { // maxHp maxHp = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 96) { - break; - } - } - case 96: { - // monsterId - monsterId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // curHp - curHp = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,14 +305,14 @@ public final class SceneMonsterOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.maxHp, maxHp); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.monsterId, monsterId); } - if ((bitField0_ & 0x00000004) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.curHp, curHp); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.maxHp, maxHp); + } output.endObject(); } @@ -323,24 +323,12 @@ public final class SceneMonsterOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 103671180: - case -1081138749: { - if (input.isAtField(FieldNames.maxHp)) { - if (!input.trySkipNullValue()) { - maxHp = input.readUInt32(); - bitField0_ |= 0x00000001; - } - } else { - input.skipUnknownField(); - } - break; - } case -1316830571: case 2127946656: { if (input.isAtField(FieldNames.monsterId)) { if (!input.trySkipNullValue()) { monsterId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -352,6 +340,18 @@ public final class SceneMonsterOuterClass { if (input.isAtField(FieldNames.curHp)) { if (!input.trySkipNullValue()) { curHp = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 103671180: + case -1081138749: { + if (input.isAtField(FieldNames.maxHp)) { + if (!input.trySkipNullValue()) { + maxHp = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -411,11 +411,11 @@ public final class SceneMonsterOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName maxHp = FieldName.forField("maxHp", "max_hp"); - 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java index a621d62..58c4341 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneMonsterWaveOuterClass.java @@ -20,27 +20,27 @@ public final class SceneMonsterWaveOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 wave_id = 9; - */ - private int waveId; - - /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 1; */ private int stageId; + /** + * optional uint32 wave_id = 14; + */ + private int waveId; + /** * optional .SceneMonsterWaveParam wave_param = 8; */ private final SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam waveParam = SceneMonsterWaveParamOuterClass.SceneMonsterWaveParam.newInstance(); /** - * repeated .SceneMonster monster_list = 2; + * repeated .SceneMonster monster_list = 3; */ private final RepeatedMessage monsterList = RepeatedMessage.newEmptyInstance(SceneMonsterOuterClass.SceneMonster.getFactory()); /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 4; */ private final RepeatedMessage dropList = RepeatedMessage.newEmptyInstance(ItemListOuterClass.ItemList.getFactory()); @@ -55,62 +55,25 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 wave_id = 9; - * @return whether the waveId field is set + * optional uint32 stage_id = 1; + * @return whether the stageId field is set */ - public boolean hasWaveId() { + public boolean hasStageId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 wave_id = 9; - * @return this - */ - public SceneMonsterWave clearWaveId() { - bitField0_ &= ~0x00000001; - waveId = 0; - return this; - } - - /** - * optional uint32 wave_id = 9; - * @return the waveId - */ - public int getWaveId() { - return waveId; - } - - /** - * optional uint32 wave_id = 9; - * @param value the waveId to set - * @return this - */ - public SceneMonsterWave setWaveId(final int value) { - bitField0_ |= 0x00000001; - waveId = value; - return this; - } - - /** - * optional uint32 stage_id = 14; - * @return whether the stageId field is set - */ - public boolean hasStageId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 1; * @return this */ public SceneMonsterWave clearStageId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; stageId = 0; return this; } /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 1; * @return the stageId */ public int getStageId() { @@ -118,16 +81,53 @@ public final class SceneMonsterWaveOuterClass { } /** - * optional uint32 stage_id = 14; + * optional uint32 stage_id = 1; * @param value the stageId to set * @return this */ public SceneMonsterWave setStageId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; stageId = value; return this; } + /** + * optional uint32 wave_id = 14; + * @return whether the waveId field is set + */ + public boolean hasWaveId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 wave_id = 14; + * @return this + */ + public SceneMonsterWave clearWaveId() { + bitField0_ &= ~0x00000002; + waveId = 0; + return this; + } + + /** + * optional uint32 wave_id = 14; + * @return the waveId + */ + public int getWaveId() { + return waveId; + } + + /** + * optional uint32 wave_id = 14; + * @param value the waveId to set + * @return this + */ + public SceneMonsterWave setWaveId(final int value) { + bitField0_ |= 0x00000002; + waveId = value; + return this; + } + /** * optional .SceneMonsterWaveParam wave_param = 8; * @return whether the waveParam field is set @@ -187,7 +187,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * repeated .SceneMonster monster_list = 3; * @return whether the monsterList field is set */ public boolean hasMonsterList() { @@ -195,7 +195,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * repeated .SceneMonster monster_list = 3; * @return this */ public SceneMonsterWave clearMonsterList() { @@ -205,7 +205,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * 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. @@ -219,7 +219,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * 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 @@ -233,7 +233,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * repeated .SceneMonster monster_list = 3; * @param value the monsterList to add * @return this */ @@ -244,7 +244,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .SceneMonster monster_list = 2; + * repeated .SceneMonster monster_list = 3; * @param values the monsterList to add * @return this */ @@ -255,7 +255,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 4; * @return whether the dropList field is set */ public boolean hasDropList() { @@ -263,7 +263,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 4; * @return this */ public SceneMonsterWave clearDropList() { @@ -273,7 +273,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_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. @@ -287,7 +287,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_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 @@ -301,7 +301,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 4; * @param value the dropList to add * @return this */ @@ -312,7 +312,7 @@ public final class SceneMonsterWaveOuterClass { } /** - * repeated .ItemList drop_list = 5; + * repeated .ItemList drop_list = 4; * @param values the dropList to add * @return this */ @@ -327,8 +327,8 @@ public final class SceneMonsterWaveOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - waveId = other.waveId; stageId = other.stageId; + waveId = other.waveId; waveParam.copyFrom(other.waveParam); monsterList.copyFrom(other.monsterList); dropList.copyFrom(other.dropList); @@ -342,12 +342,12 @@ public final class SceneMonsterWaveOuterClass { return this; } cachedSize = -1; - if (other.hasWaveId()) { - setWaveId(other.waveId); - } if (other.hasStageId()) { setStageId(other.stageId); } + if (other.hasWaveId()) { + setWaveId(other.waveId); + } if (other.hasWaveParam()) { getMutableWaveParam().mergeFrom(other.waveParam); } @@ -367,8 +367,8 @@ public final class SceneMonsterWaveOuterClass { } cachedSize = -1; bitField0_ = 0; - waveId = 0; stageId = 0; + waveId = 0; waveParam.clear(); monsterList.clear(); dropList.clear(); @@ -398,8 +398,8 @@ public final class SceneMonsterWaveOuterClass { } SceneMonsterWave other = (SceneMonsterWave) o; return bitField0_ == other.bitField0_ - && (!hasWaveId() || waveId == other.waveId) && (!hasStageId() || stageId == other.stageId) + && (!hasWaveId() || waveId == other.waveId) && (!hasWaveParam() || waveParam.equals(other.waveParam)) && (!hasMonsterList() || monsterList.equals(other.monsterList)) && (!hasDropList() || dropList.equals(other.dropList)); @@ -408,12 +408,12 @@ public final class SceneMonsterWaveOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(waveId); + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 112); - output.writeUInt32NoTag(stageId); + output.writeUInt32NoTag(waveId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 66); @@ -421,13 +421,13 @@ public final class SceneMonsterWaveOuterClass { } if ((bitField0_ & 0x00000008) != 0) { for (int i = 0; i < monsterList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 26); output.writeMessageNoTag(monsterList.get(i)); } } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < dropList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 34); output.writeMessageNoTag(dropList.get(i)); } } @@ -437,10 +437,10 @@ public final class SceneMonsterWaveOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(stageId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(waveId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(waveParam); @@ -461,9 +461,9 @@ public final class SceneMonsterWaveOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { - // waveId - waveId = input.readUInt32(); + case 8: { + // stageId + stageId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 112) { @@ -471,8 +471,8 @@ public final class SceneMonsterWaveOuterClass { } } case 112: { - // stageId - stageId = input.readUInt32(); + // waveId + waveId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 66) { @@ -484,19 +484,19 @@ public final class SceneMonsterWaveOuterClass { input.readMessage(waveParam); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 18) { + if (tag != 26) { break; } } - case 18: { + case 26: { // monsterList tag = input.readRepeatedMessage(monsterList, tag); bitField0_ |= 0x00000008; - if (tag != 42) { + if (tag != 34) { break; } } - case 42: { + case 34: { // dropList tag = input.readRepeatedMessage(dropList, tag); bitField0_ |= 0x00000010; @@ -522,10 +522,10 @@ public final class SceneMonsterWaveOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.waveId, waveId); + output.writeUInt32(FieldNames.stageId, stageId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.stageId, stageId); + output.writeUInt32(FieldNames.waveId, waveId); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.waveParam, waveParam); @@ -546,11 +546,11 @@ public final class SceneMonsterWaveOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -794902028: - case 1127862305: { - if (input.isAtField(FieldNames.waveId)) { + case -1897528135: + case 1306191356: { + if (input.isAtField(FieldNames.stageId)) { if (!input.trySkipNullValue()) { - waveId = input.readUInt32(); + stageId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -558,11 +558,11 @@ public final class SceneMonsterWaveOuterClass { } break; } - case -1897528135: - case 1306191356: { - if (input.isAtField(FieldNames.stageId)) { + case -794902028: + case 1127862305: { + if (input.isAtField(FieldNames.waveId)) { if (!input.trySkipNullValue()) { - stageId = input.readUInt32(); + waveId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -659,10 +659,10 @@ public final class SceneMonsterWaveOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName waveId = FieldName.forField("waveId", "wave_id"); - static final FieldName stageId = FieldName.forField("stageId", "stage_id"); + static final FieldName waveId = FieldName.forField("waveId", "wave_id"); + static final FieldName waveParam = FieldName.forField("waveParam", "wave_param"); 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 ac7c9a9..529be43 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 = 7; + * optional uint32 level = 2; */ private int level; @@ -34,7 +34,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 2; * @return whether the level field is set */ public boolean hasLevel() { @@ -42,7 +42,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 2; * @return this */ public SceneMonsterWaveParam clearLevel() { @@ -52,7 +52,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 2; * @return the level */ public int getLevel() { @@ -60,7 +60,7 @@ public final class SceneMonsterWaveParamOuterClass { } /** - * optional uint32 level = 7; + * optional uint32 level = 2; * @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) 56); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(level); } } @@ -150,7 +150,7 @@ public final class SceneMonsterWaveParamOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // 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 ded02fb..10d28f8 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcInfoOuterClass.java @@ -19,7 +19,7 @@ public final class SceneNpcInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 10; */ private int npcId; @@ -39,7 +39,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 10; * @return whether the npcId field is set */ public boolean hasNpcId() { @@ -47,7 +47,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 10; * @return this */ public SceneNpcInfo clearNpcId() { @@ -57,7 +57,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 10; * @return the npcId */ public int getNpcId() { @@ -65,7 +65,7 @@ public final class SceneNpcInfoOuterClass { } /** - * optional uint32 npc_id = 13; + * optional uint32 npc_id = 10; * @param value the npcId to set * @return this */ @@ -198,7 +198,7 @@ public final class SceneNpcInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(npcId); } if ((bitField0_ & 0x00000002) != 0) { @@ -226,7 +226,7 @@ public final class SceneNpcInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 80: { // npcId npcId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java index 223d1b5..bc8775c 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneNpcMonsterInfoOuterClass.java @@ -24,7 +24,7 @@ public final class SceneNpcMonsterInfoOuterClass { private int worldLevel; /** - * optional uint32 event_id = 8; + * optional uint32 event_id = 11; */ private int eventId; @@ -81,7 +81,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 8; + * optional uint32 event_id = 11; * @return whether the eventId field is set */ public boolean hasEventId() { @@ -89,7 +89,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 8; + * optional uint32 event_id = 11; * @return this */ public SceneNpcMonsterInfo clearEventId() { @@ -99,7 +99,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 8; + * optional uint32 event_id = 11; * @return the eventId */ public int getEventId() { @@ -107,7 +107,7 @@ public final class SceneNpcMonsterInfoOuterClass { } /** - * optional uint32 event_id = 8; + * optional uint32 event_id = 11; * @param value the eventId to set * @return this */ @@ -229,7 +229,7 @@ public final class SceneNpcMonsterInfoOuterClass { output.writeUInt32NoTag(worldLevel); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(eventId); } if ((bitField0_ & 0x00000004) != 0) { @@ -265,11 +265,11 @@ public final class SceneNpcMonsterInfoOuterClass { worldLevel = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // eventId eventId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/ScenePlaneEventScNotifyOuterClass.java index bf90150..5583854 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 = 1; + * optional .ItemList get_item_list = 7; */ private final ItemListOuterClass.ItemList getItemList = ItemListOuterClass.ItemList.newInstance(); @@ -34,7 +34,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 7; * @return whether the getItemList field is set */ public boolean hasGetItemList() { @@ -42,7 +42,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 7; * @return this */ public ScenePlaneEventScNotify clearGetItemList() { @@ -52,7 +52,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_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. @@ -66,7 +66,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_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 @@ -80,7 +80,7 @@ public final class ScenePlaneEventScNotifyOuterClass { } /** - * optional .ItemList get_item_list = 1; + * optional .ItemList get_item_list = 7; * @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) 10); + output.writeRawByte((byte) 58); output.writeMessageNoTag(getItemList); } } @@ -171,7 +171,7 @@ public final class ScenePlaneEventScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 58: { // 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 d00ba89..2ef968d 100644 --- a/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ScenePropInfoOuterClass.java @@ -19,27 +19,27 @@ public final class ScenePropInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 1; */ private long createTimeMs; /** - * optional uint32 prop_id = 4; + * optional uint32 prop_id = 5; */ private int propId; /** - * optional uint32 life_time_ms = 7; + * optional uint32 life_time_ms = 6; */ private int lifeTimeMs; /** - * optional uint32 prop_state = 10; + * optional uint32 prop_state = 11; */ private int propState; /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_info = 15; */ private final PropExtraInfoOuterClass.PropExtraInfo extraInfo = PropExtraInfoOuterClass.PropExtraInfo.newInstance(); @@ -54,7 +54,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 1; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -62,7 +62,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 1; * @return this */ public ScenePropInfo clearCreateTimeMs() { @@ -72,7 +72,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 1; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -80,7 +80,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint64 create_time_ms = 11; + * optional uint64 create_time_ms = 1; * @param value the createTimeMs to set * @return this */ @@ -91,7 +91,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 4; + * optional uint32 prop_id = 5; * @return whether the propId field is set */ public boolean hasPropId() { @@ -99,7 +99,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 4; + * optional uint32 prop_id = 5; * @return this */ public ScenePropInfo clearPropId() { @@ -109,7 +109,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 4; + * optional uint32 prop_id = 5; * @return the propId */ public int getPropId() { @@ -117,7 +117,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_id = 4; + * optional uint32 prop_id = 5; * @param value the propId to set * @return this */ @@ -128,7 +128,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 7; + * optional uint32 life_time_ms = 6; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -136,7 +136,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 7; + * optional uint32 life_time_ms = 6; * @return this */ public ScenePropInfo clearLifeTimeMs() { @@ -146,7 +146,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 7; + * optional uint32 life_time_ms = 6; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -154,7 +154,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 life_time_ms = 7; + * optional uint32 life_time_ms = 6; * @param value the lifeTimeMs to set * @return this */ @@ -165,7 +165,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 10; + * optional uint32 prop_state = 11; * @return whether the propState field is set */ public boolean hasPropState() { @@ -173,7 +173,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 10; + * optional uint32 prop_state = 11; * @return this */ public ScenePropInfo clearPropState() { @@ -183,7 +183,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 10; + * optional uint32 prop_state = 11; * @return the propState */ public int getPropState() { @@ -191,7 +191,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional uint32 prop_state = 10; + * optional uint32 prop_state = 11; * @param value the propState to set * @return this */ @@ -202,7 +202,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_info = 15; * @return whether the extraInfo field is set */ public boolean hasExtraInfo() { @@ -210,7 +210,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_info = 15; * @return this */ public ScenePropInfo clearExtraInfo() { @@ -220,7 +220,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_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. @@ -234,7 +234,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_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 @@ -248,7 +248,7 @@ public final class ScenePropInfoOuterClass { } /** - * optional .PropExtraInfo extra_info = 3; + * optional .PropExtraInfo extra_info = 15; * @param value the extraInfo to set * @return this */ @@ -342,23 +342,23 @@ public final class ScenePropInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(propId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(propState); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 122); output.writeMessageNoTag(extraInfo); } } @@ -391,43 +391,43 @@ public final class ScenePropInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 8: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 40) { break; } } - case 32: { + case 40: { // propId propId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 56) { + if (tag != 48) { break; } } - case 56: { + case 48: { // lifeTimeMs lifeTimeMs = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 80) { + if (tag != 88) { break; } } - case 80: { + case 88: { // propState propState = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 26) { + if (tag != 122) { break; } } - case 26: { + case 122: { // extraInfo input.readMessage(extraInfo); bitField0_ |= 0x00000010; diff --git a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java index 3defd98..b66e896 100644 --- a/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SceneSummonUnitInfoOuterClass.java @@ -20,11 +20,15 @@ public final class SceneSummonUnitInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 2; */ private long createTimeMs; /** + * 
+     *  caster_entity_id
+     *
+ * * optional uint32 summon_unit_id = 5; */ private int summonUnitId; @@ -40,20 +44,20 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  summon_unit_id
      *
* - * optional uint32 attach_entity_id = 13; + * optional uint32 attach_entity_id = 9; */ private int attachEntityId; /** - * optional sint32 life_time_ms = 3; + * optional sint32 life_time_ms = 14; */ private int lifeTimeMs; /** - * repeated string trigger_name_list = 2; + * repeated string trigger_name_list = 15; */ private final RepeatedString triggerNameList = RepeatedString.newEmptyInstance(); @@ -68,7 +72,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 2; * @return whether the createTimeMs field is set */ public boolean hasCreateTimeMs() { @@ -76,7 +80,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 2; * @return this */ public SceneSummonUnitInfo clearCreateTimeMs() { @@ -86,7 +90,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 2; * @return the createTimeMs */ public long getCreateTimeMs() { @@ -94,7 +98,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional uint64 create_time_ms = 12; + * optional uint64 create_time_ms = 2; * @param value the createTimeMs to set * @return this */ @@ -105,6 +109,10 @@ public final class SceneSummonUnitInfoOuterClass { } /** + * 
+     *  caster_entity_id
+     *
+ * * optional uint32 summon_unit_id = 5; * @return whether the summonUnitId field is set */ @@ -113,6 +121,10 @@ public final class SceneSummonUnitInfoOuterClass { } /** + * 
+     *  caster_entity_id
+     *
+ * * optional uint32 summon_unit_id = 5; * @return this */ @@ -123,6 +135,10 @@ public final class SceneSummonUnitInfoOuterClass { } /** + * 
+     *  caster_entity_id
+     *
+ * * optional uint32 summon_unit_id = 5; * @return the summonUnitId */ @@ -131,6 +147,10 @@ public final class SceneSummonUnitInfoOuterClass { } /** + * 
+     *  caster_entity_id
+     *
+ * * optional uint32 summon_unit_id = 5; * @param value the summonUnitId to set * @return this @@ -196,10 +216,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  summon_unit_id
      *
* - * optional uint32 attach_entity_id = 13; + * optional uint32 attach_entity_id = 9; * @return whether the attachEntityId field is set */ public boolean hasAttachEntityId() { @@ -208,10 +228,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  summon_unit_id
      *
* - * optional uint32 attach_entity_id = 13; + * optional uint32 attach_entity_id = 9; * @return this */ public SceneSummonUnitInfo clearAttachEntityId() { @@ -222,10 +242,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  summon_unit_id
      *
* - * optional uint32 attach_entity_id = 13; + * optional uint32 attach_entity_id = 9; * @return the attachEntityId */ public int getAttachEntityId() { @@ -234,10 +254,10 @@ public final class SceneSummonUnitInfoOuterClass { /** * 
-     *  caster_entity_id
+     *  summon_unit_id
      *
* - * optional uint32 attach_entity_id = 13; + * optional uint32 attach_entity_id = 9; * @param value the attachEntityId to set * @return this */ @@ -248,7 +268,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 3; + * optional sint32 life_time_ms = 14; * @return whether the lifeTimeMs field is set */ public boolean hasLifeTimeMs() { @@ -256,7 +276,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 3; + * optional sint32 life_time_ms = 14; * @return this */ public SceneSummonUnitInfo clearLifeTimeMs() { @@ -266,7 +286,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 3; + * optional sint32 life_time_ms = 14; * @return the lifeTimeMs */ public int getLifeTimeMs() { @@ -274,7 +294,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * optional sint32 life_time_ms = 3; + * optional sint32 life_time_ms = 14; * @param value the lifeTimeMs to set * @return this */ @@ -285,7 +305,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * repeated string trigger_name_list = 15; * @return whether the triggerNameList field is set */ public boolean hasTriggerNameList() { @@ -293,7 +313,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * repeated string trigger_name_list = 15; * @return this */ public SceneSummonUnitInfo clearTriggerNameList() { @@ -303,7 +323,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * 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. @@ -317,7 +337,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * 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 @@ -331,7 +351,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * repeated string trigger_name_list = 15; * @param value the triggerNameList to add * @return this */ @@ -342,7 +362,7 @@ public final class SceneSummonUnitInfoOuterClass { } /** - * repeated string trigger_name_list = 2; + * repeated string trigger_name_list = 15; * @param values the triggerNameList to add * @return this */ @@ -442,7 +462,7 @@ public final class SceneSummonUnitInfoOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 16); output.writeUInt64NoTag(createTimeMs); } if ((bitField0_ & 0x00000002) != 0) { @@ -454,16 +474,16 @@ public final class SceneSummonUnitInfoOuterClass { output.writeUInt32NoTag(casterEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(attachEntityId); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 112); output.writeSInt32NoTag(lifeTimeMs); } if ((bitField0_ & 0x00000020) != 0) { for (int i = 0; i < triggerNameList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 122); output.writeStringNoTag(triggerNameList.get(i)); } } @@ -500,7 +520,7 @@ public final class SceneSummonUnitInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 96: { + case 16: { // createTimeMs createTimeMs = input.readUInt64(); bitField0_ |= 0x00000001; @@ -523,29 +543,29 @@ public final class SceneSummonUnitInfoOuterClass { casterEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 72) { break; } } - case 104: { + case 72: { // attachEntityId attachEntityId = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 24) { + if (tag != 112) { break; } } - case 24: { + case 112: { // lifeTimeMs lifeTimeMs = input.readSInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 18) { + if (tag != 122) { break; } } - case 18: { + case 122: { // triggerNameList tag = input.readRepeatedString(triggerNameList, tag); bitField0_ |= 0x00000020; diff --git a/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SearchPlayerCsReqOuterClass.java index 17e274a..6000cf1 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 = 1; + * repeated uint32 search_uid_list = 6; */ private final RepeatedInt searchUidList = RepeatedInt.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_list = 6; * @return whether the searchUidList field is set */ public boolean hasSearchUidList() { @@ -43,7 +43,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_list = 6; * @return this */ public SearchPlayerCsReq clearSearchUidList() { @@ -53,7 +53,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_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 SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_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 SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_list = 6; * @param value the searchUidList to add * @return this */ @@ -92,7 +92,7 @@ public final class SearchPlayerCsReqOuterClass { } /** - * repeated uint32 search_uid_list = 1; + * repeated uint32 search_uid_list = 6; * @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) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(searchUidList.array()[i]); } } @@ -185,7 +185,7 @@ public final class SearchPlayerCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 10: { + case 50: { // searchUidList [packed=true] input.readPackedUInt32(searchUidList, tag); bitField0_ |= 0x00000001; @@ -204,7 +204,7 @@ public final class SearchPlayerCsReqOuterClass { tag = input.readTag(); break; } - case 8: { + case 48: { // 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 6783f5d..9c29edc 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 = 7; + * optional uint32 retcode = 14; */ private int retcode; /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_list = 9; */ private final RepeatedMessage searchResultList = RepeatedMessage.newEmptyInstance(SimpleInfoOuterClass.SimpleInfo.getFactory()); @@ -40,7 +40,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return this */ public SearchPlayerScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 14; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_list = 9; * @return whether the searchResultList field is set */ public boolean hasSearchResultList() { @@ -85,7 +85,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_list = 9; * @return this */ public SearchPlayerScRsp clearSearchResultList() { @@ -95,7 +95,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_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 SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_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 SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_list = 9; * @param value the searchResultList to add * @return this */ @@ -134,7 +134,7 @@ public final class SearchPlayerScRspOuterClass { } /** - * repeated .SimpleInfo search_result_list = 14; + * repeated .SimpleInfo search_result_list = 9; * @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) 56); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < searchResultList.length(); i++) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 74); output.writeMessageNoTag(searchResultList.get(i)); } } @@ -241,16 +241,16 @@ public final class SearchPlayerScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 112: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 74) { break; } } - case 114: { + case 74: { // 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 77a94cd..fe885d0 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 = 14; + * optional uint32 bubble_id = 10; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 10; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 10; * @return this */ public SelectChatBubbleCsReq clearBubbleId() { @@ -52,7 +52,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 10; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class SelectChatBubbleCsReqOuterClass { } /** - * optional uint32 bubble_id = 14; + * optional uint32 bubble_id = 10; * @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) 112); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class SelectChatBubbleCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 80: { // 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 78aa00c..a7ca006 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectChatBubbleScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SelectChatBubbleScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 5; - */ - private int retcode; - - /** - * optional uint32 cur_chat_bubble = 10; + * optional uint32 cur_chat_bubble = 3; */ private int curChatBubble; + /** + * optional uint32 retcode = 15; + */ + private int retcode; + private SelectChatBubbleScRsp() { } @@ -39,62 +39,25 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 retcode = 5; - * @return whether the retcode field is set + * optional uint32 cur_chat_bubble = 3; + * @return whether the curChatBubble field is set */ - public boolean hasRetcode() { + public boolean hasCurChatBubble() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 5; - * @return this - */ - public SelectChatBubbleScRsp clearRetcode() { - bitField0_ &= ~0x00000001; - 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 SelectChatBubbleScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 cur_chat_bubble = 10; - * @return whether the curChatBubble field is set - */ - public boolean hasCurChatBubble() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 cur_chat_bubble = 10; + * optional uint32 cur_chat_bubble = 3; * @return this */ public SelectChatBubbleScRsp clearCurChatBubble() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; curChatBubble = 0; return this; } /** - * optional uint32 cur_chat_bubble = 10; + * optional uint32 cur_chat_bubble = 3; * @return the curChatBubble */ public int getCurChatBubble() { @@ -102,23 +65,60 @@ public final class SelectChatBubbleScRspOuterClass { } /** - * optional uint32 cur_chat_bubble = 10; + * optional uint32 cur_chat_bubble = 3; * @param value the curChatBubble to set * @return this */ public SelectChatBubbleScRsp setCurChatBubble(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public SelectChatBubbleScRsp 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 SelectChatBubbleScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SelectChatBubbleScRsp copyFrom(final SelectChatBubbleScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; curChatBubble = other.curChatBubble; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SelectChatBubbleScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasCurChatBubble()) { setCurChatBubble(other.curChatBubble); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SelectChatBubbleScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; curChatBubble = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SelectChatBubbleScRspOuterClass { } SelectChatBubbleScRsp other = (SelectChatBubbleScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasCurChatBubble() || curChatBubble == other.curChatBubble); + && (!hasCurChatBubble() || curChatBubble == other.curChatBubble) + && (!hasRetcode() || retcode == other.retcode); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(curChatBubble); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(curChatBubble); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SelectChatBubbleScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(curChatBubble); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class SelectChatBubbleScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { - // retcode - retcode = input.readUInt32(); + case 24: { + // curChatBubble + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 120) { break; } } - case 80: { - // curChatBubble - curChatBubble = input.readUInt32(); + case 120: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SelectChatBubbleScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.curChatBubble, curChatBubble); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.curChatBubble, curChatBubble); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,11 @@ public final class SelectChatBubbleScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 94167140: + case 1828957140: { + if (input.isAtField(FieldNames.curChatBubble)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + curChatBubble = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class SelectChatBubbleScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class SelectChatBubbleScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName curChatBubble = FieldName.forField("curChatBubble", "cur_chat_bubble"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java index 33ad024..8033616 100644 --- a/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SelectPhoneThemeScRspOuterClass.java @@ -24,7 +24,7 @@ public final class SelectPhoneThemeScRspOuterClass { private int retcode; /** - * optional uint32 cur_phone_theme = 11; + * optional uint32 cur_phone_theme = 14; */ private int curPhoneTheme; @@ -76,7 +76,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 11; + * optional uint32 cur_phone_theme = 14; * @return whether the curPhoneTheme field is set */ public boolean hasCurPhoneTheme() { @@ -84,7 +84,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 11; + * optional uint32 cur_phone_theme = 14; * @return this */ public SelectPhoneThemeScRsp clearCurPhoneTheme() { @@ -94,7 +94,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 11; + * optional uint32 cur_phone_theme = 14; * @return the curPhoneTheme */ public int getCurPhoneTheme() { @@ -102,7 +102,7 @@ public final class SelectPhoneThemeScRspOuterClass { } /** - * optional uint32 cur_phone_theme = 11; + * optional uint32 cur_phone_theme = 14; * @param value the curPhoneTheme to set * @return this */ @@ -181,7 +181,7 @@ public final class SelectPhoneThemeScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(curPhoneTheme); } } @@ -210,11 +210,11 @@ public final class SelectPhoneThemeScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 112) { break; } } - case 88: { + case 112: { // curPhoneTheme curPhoneTheme = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SellItemCsReqOuterClass.java index 333051e..91851e5 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 = 3; + * optional bool to_material = 5; */ private boolean toMaterial; /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 15; */ private final ItemCostListOuterClass.ItemCostList itemCostList = ItemCostListOuterClass.ItemCostList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 3; + * optional bool to_material = 5; * @return whether the toMaterial field is set */ public boolean hasToMaterial() { @@ -47,7 +47,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 3; + * optional bool to_material = 5; * @return this */ public SellItemCsReq clearToMaterial() { @@ -57,7 +57,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 3; + * optional bool to_material = 5; * @return the toMaterial */ public boolean getToMaterial() { @@ -65,7 +65,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional bool to_material = 3; + * optional bool to_material = 5; * @param value the toMaterial to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 15; * @return whether the itemCostList field is set */ public boolean hasItemCostList() { @@ -84,7 +84,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 15; * @return this */ public SellItemCsReq clearItemCostList() { @@ -94,7 +94,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_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. @@ -108,7 +108,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_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 @@ -122,7 +122,7 @@ public final class SellItemCsReqOuterClass { } /** - * optional .ItemCostList item_cost_list = 5; + * optional .ItemCostList item_cost_list = 15; * @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) 24); + output.writeRawByte((byte) 40); output.writeBoolNoTag(toMaterial); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(itemCostList); } } @@ -226,16 +226,16 @@ public final class SellItemCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 40: { // toMaterial toMaterial = input.readBool(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // 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 6ccb4bd..f85bec5 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 = 14; + * optional uint32 retcode = 15; */ private int retcode; /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 11; */ private final ItemListOuterClass.ItemList returnItemList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return this */ public SellItemScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SellItemScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 15; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 11; * @return whether the returnItemList field is set */ public boolean hasReturnItemList() { @@ -84,7 +84,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 11; * @return this */ public SellItemScRsp clearReturnItemList() { @@ -94,7 +94,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_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. @@ -108,7 +108,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_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 @@ -122,7 +122,7 @@ public final class SellItemScRspOuterClass { } /** - * optional .ItemList return_item_list = 4; + * optional .ItemList return_item_list = 11; * @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) 112); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 34); + output.writeRawByte((byte) 90); output.writeMessageNoTag(returnItemList); } } @@ -226,16 +226,16 @@ public final class SellItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 112: { + case 120: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 34) { + if (tag != 90) { break; } } - case 34: { + case 90: { // 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 9e8847e..74cc808 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 = 7; + * optional uint32 emote = 11; */ private int emote; /** - * optional .ChatType chat_type = 8; - */ - private int chatType; - - /** - * optional .MsgType msg_type = 9; + * optional .MsgType msg_type = 7; */ private int msgType; + /** + * optional .ChatType chat_type = 12; + */ + private int chatType; + /** * optional string text = 2; */ private final Utf8String text = Utf8String.newEmptyInstance(); /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 15; */ private final RepeatedInt toUidList = RepeatedInt.newEmptyInstance(); @@ -56,7 +56,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 11; * @return whether the emote field is set */ public boolean hasEmote() { @@ -64,7 +64,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 11; * @return this */ public SendMsgCsReq clearEmote() { @@ -74,7 +74,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 11; * @return the emote */ public int getEmote() { @@ -82,7 +82,7 @@ public final class SendMsgCsReqOuterClass { } /** - * optional uint32 emote = 7; + * optional uint32 emote = 11; * @param value the emote to set * @return this */ @@ -93,87 +93,25 @@ public final class SendMsgCsReqOuterClass { } /** - * optional .ChatType chat_type = 8; - * @return whether the chatType field is set + * optional .MsgType msg_type = 7; + * @return whether the msgType field is set */ - public boolean hasChatType() { + public boolean hasMsgType() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ChatType chat_type = 8; - * @return this - */ - public SendMsgCsReq clearChatType() { - bitField0_ &= ~0x00000002; - chatType = 0; - return this; - } - - /** - * optional .ChatType chat_type = 8; - * @return the chatType - */ - public ChatTypeOuterClass.ChatType getChatType() { - return ChatTypeOuterClass.ChatType.forNumber(chatType); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link SendMsgCsReq#getChatType()}.getNumber(). - * - * @return numeric wire representation - */ - public int getChatTypeValue() { - return chatType; - } - - /** - * 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 ChatTypeOuterClass.ChatType}. Setting an invalid value - * can cause {@link SendMsgCsReq#getChatType()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public SendMsgCsReq setChatTypeValue(final int value) { - bitField0_ |= 0x00000002; - chatType = value; - return this; - } - - /** - * optional .ChatType chat_type = 8; - * @param value the chatType to set - * @return this - */ - public SendMsgCsReq setChatType(final ChatTypeOuterClass.ChatType value) { - bitField0_ |= 0x00000002; - chatType = value.getNumber(); - return this; - } - - /** - * optional .MsgType msg_type = 9; - * @return whether the msgType field is set - */ - public boolean hasMsgType() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .MsgType msg_type = 9; + * optional .MsgType msg_type = 7; * @return this */ public SendMsgCsReq clearMsgType() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; msgType = 0; return this; } /** - * optional .MsgType msg_type = 9; + * optional .MsgType msg_type = 7; * @return the msgType */ public MsgTypeOuterClass.MsgType getMsgType() { @@ -200,22 +138,84 @@ public final class SendMsgCsReqOuterClass { * @return this */ public SendMsgCsReq setMsgTypeValue(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; msgType = value; return this; } /** - * optional .MsgType msg_type = 9; + * optional .MsgType msg_type = 7; * @param value the msgType to set * @return this */ public SendMsgCsReq setMsgType(final MsgTypeOuterClass.MsgType value) { - bitField0_ |= 0x00000004; + 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; + * @return this + */ + public SendMsgCsReq clearChatType() { + bitField0_ &= ~0x00000004; + chatType = 0; + return this; + } + + /** + * optional .ChatType chat_type = 12; + * @return the chatType + */ + public ChatTypeOuterClass.ChatType getChatType() { + return ChatTypeOuterClass.ChatType.forNumber(chatType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SendMsgCsReq#getChatType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getChatTypeValue() { + return chatType; + } + + /** + * 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 ChatTypeOuterClass.ChatType}. Setting an invalid value + * can cause {@link SendMsgCsReq#getChatType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SendMsgCsReq setChatTypeValue(final int value) { + bitField0_ |= 0x00000004; + chatType = value; + return this; + } + + /** + * optional .ChatType chat_type = 12; + * @param value the chatType to set + * @return this + */ + public SendMsgCsReq setChatType(final ChatTypeOuterClass.ChatType value) { + bitField0_ |= 0x00000004; + chatType = value.getNumber(); + return this; + } + /** * optional string text = 2; * @return whether the text field is set @@ -282,7 +282,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 15; * @return whether the toUidList field is set */ public boolean hasToUidList() { @@ -290,7 +290,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 15; * @return this */ public SendMsgCsReq clearToUidList() { @@ -300,7 +300,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_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. @@ -314,7 +314,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_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 @@ -328,7 +328,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 15; * @param value the toUidList to add * @return this */ @@ -339,7 +339,7 @@ public final class SendMsgCsReqOuterClass { } /** - * repeated uint32 to_uid_list = 4; + * repeated uint32 to_uid_list = 15; * @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; - chatType = other.chatType; msgType = other.msgType; + chatType = other.chatType; text.copyFrom(other.text); toUidList.copyFrom(other.toUidList); } @@ -372,12 +372,12 @@ public final class SendMsgCsReqOuterClass { if (other.hasEmote()) { setEmote(other.emote); } - if (other.hasChatType()) { - setChatTypeValue(other.chatType); - } if (other.hasMsgType()) { setMsgTypeValue(other.msgType); } + if (other.hasChatType()) { + setChatTypeValue(other.chatType); + } if (other.hasText()) { getMutableTextBytes().copyFrom(other.text); } @@ -395,8 +395,8 @@ public final class SendMsgCsReqOuterClass { cachedSize = -1; bitField0_ = 0; emote = 0; - chatType = 0; msgType = 0; + chatType = 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) - && (!hasChatType() || chatType == other.chatType) && (!hasMsgType() || msgType == other.msgType) + && (!hasChatType() || chatType == other.chatType) && (!hasText() || text.equals(other.text)) && (!hasToUidList() || toUidList.equals(other.toUidList)); } @@ -434,16 +434,16 @@ public final class SendMsgCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(emote); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeEnumNoTag(chatType); + output.writeRawByte((byte) 56); + output.writeEnumNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 72); - output.writeEnumNoTag(msgType); + output.writeRawByte((byte) 96); + output.writeEnumNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 18); @@ -451,7 +451,7 @@ public final class SendMsgCsReqOuterClass { } if ((bitField0_ & 0x00000010) != 0) { for (int i = 0; i < toUidList.length(); i++) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 120); 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(chatType); + size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(msgType); + size += 1 + ProtoSink.computeEnumSizeNoTag(chatType); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeStringSizeNoTag(text); @@ -485,32 +485,32 @@ public final class SendMsgCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 88: { // emote emote = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 56) { break; } } - case 64: { - // chatType - final int value = input.readInt32(); - if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { - chatType = value; - bitField0_ |= 0x00000002; - } - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { + 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: { + // chatType + final int value = input.readInt32(); + if (ChatTypeOuterClass.ChatType.forNumber(value) != null) { + chatType = value; bitField0_ |= 0x00000004; } tag = input.readTag(); @@ -523,11 +523,11 @@ public final class SendMsgCsReqOuterClass { input.readString(text); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 34) { + if (tag != 122) { break; } } - case 34: { + case 122: { // toUidList [packed=true] input.readPackedUInt32(toUidList, tag); bitField0_ |= 0x00000010; @@ -546,7 +546,7 @@ public final class SendMsgCsReqOuterClass { tag = input.readTag(); break; } - case 32: { + case 120: { // 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.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); + output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); } if ((bitField0_ & 0x00000004) != 0) { - output.writeEnum(FieldNames.msgType, msgType, MsgTypeOuterClass.MsgType.converter()); + output.writeEnum(FieldNames.chatType, chatType, ChatTypeOuterClass.ChatType.converter()); } if ((bitField0_ & 0x00000008) != 0) { output.writeString(FieldNames.text, text); @@ -595,13 +595,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_ |= 0x00000002; } else { input.skipUnknownEnumValue(); @@ -612,13 +612,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_ |= 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 chatType = FieldName.forField("chatType", "chat_type"); - static final FieldName msgType = FieldName.forField("msgType", "msg_type"); + static final FieldName chatType = FieldName.forField("chatType", "chat_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 a862837..e1d0496 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 = 11; + * optional uint32 server_prefs_id = 4; */ private int serverPrefsId; /** - * optional bytes data = 13; + * optional bytes data = 9; */ private final RepeatedByte data = RepeatedByte.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 11; + * optional uint32 server_prefs_id = 4; * @return whether the serverPrefsId field is set */ public boolean hasServerPrefsId() { @@ -48,7 +48,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 11; + * optional uint32 server_prefs_id = 4; * @return this */ public ServerPrefs clearServerPrefsId() { @@ -58,7 +58,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 11; + * optional uint32 server_prefs_id = 4; * @return the serverPrefsId */ public int getServerPrefsId() { @@ -66,7 +66,7 @@ public final class ServerPrefsOuterClass { } /** - * optional uint32 server_prefs_id = 11; + * optional uint32 server_prefs_id = 4; * @param value the serverPrefsId to set * @return this */ @@ -77,7 +77,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 9; * @return whether the data field is set */ public boolean hasData() { @@ -85,7 +85,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 9; * @return this */ public ServerPrefs clearData() { @@ -95,7 +95,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 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 ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 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 ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 9; * @param value the data to add * @return this */ @@ -134,7 +134,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 9; * @param values the data to add * @return this */ @@ -145,7 +145,7 @@ public final class ServerPrefsOuterClass { } /** - * optional bytes data = 13; + * optional bytes data = 9; * @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) 88); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 106); + output.writeRawByte((byte) 74); output.writeBytesNoTag(data); } } @@ -249,16 +249,16 @@ public final class ServerPrefsOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 32: { // serverPrefsId serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 74) { break; } } - case 106: { + case 74: { // 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 01981e5..c5686aa 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 = 1; + * optional uint32 avatar_id = 10; */ private int avatarId; /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; */ private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 10; * @return whether the avatarId field is set */ public boolean hasAvatarId() { @@ -48,7 +48,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 10; * @return this */ public SetAssistAvatarCsReq clearAvatarId() { @@ -58,7 +58,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 10; * @return the avatarId */ public int getAvatarId() { @@ -66,7 +66,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * optional uint32 avatar_id = 1; + * optional uint32 avatar_id = 10; * @param value the avatarId to set * @return this */ @@ -77,7 +77,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * @return whether the avatarIdList field is set */ public boolean hasAvatarIdList() { @@ -85,7 +85,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * @return this */ public SetAssistAvatarCsReq clearAvatarIdList() { @@ -95,7 +95,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * * This method returns the internal storage object without modifying any has state. * The returned object should not be modified and be treated as read-only. @@ -109,7 +109,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * * This method returns the internal storage object and sets the corresponding * has state. The returned object will become part of this message and its @@ -123,7 +123,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * @param value the avatarIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class SetAssistAvatarCsReqOuterClass { } /** - * repeated uint32 avatar_id_list = 13; + * repeated uint32 avatar_id_list = 14; * @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) 8); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < avatarIdList.length(); i++) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(avatarIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class SetAssistAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 80: { // avatarId avatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 106) { + if (tag != 114) { break; } } - case 106: { + case 114: { // avatarIdList [packed=true] input.readPackedUInt32(avatarIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class SetAssistAvatarCsReqOuterClass { tag = input.readTag(); break; } - case 104: { + case 112: { // 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 3f2752b..0f6f9b2 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 avatar_id = 4; - */ - private int avatarId; - - /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 5; */ private int retcode; /** - * repeated uint32 avatar_id_list = 5; + * optional uint32 avatar_id = 12; + */ + private int avatarId; + + /** + * repeated uint32 avatar_id_list = 1; */ private final RepeatedInt avatarIdList = RepeatedInt.newEmptyInstance(); @@ -45,62 +45,25 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 avatar_id = 4; - * @return whether the avatarId field is set + * optional uint32 retcode = 5; + * @return whether the retcode field is set */ - public boolean hasAvatarId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 avatar_id = 4; - * @return this - */ - public SetAssistAvatarScRsp clearAvatarId() { - bitField0_ &= ~0x00000001; - avatarId = 0; - return this; - } - - /** - * optional uint32 avatar_id = 4; - * @return the avatarId - */ - public int getAvatarId() { - return avatarId; - } - - /** - * optional uint32 avatar_id = 4; - * @param value the avatarId to set - * @return this - */ - public SetAssistAvatarScRsp setAvatarId(final int value) { - bitField0_ |= 0x00000001; - avatarId = 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 = 5; * @return this */ public SetAssistAvatarScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -108,18 +71,55 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ public SetAssistAvatarScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * repeated uint32 avatar_id_list = 5; + * optional uint32 avatar_id = 12; + * @return whether the avatarId field is set + */ + public boolean hasAvatarId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 avatar_id = 12; + * @return this + */ + public SetAssistAvatarScRsp clearAvatarId() { + bitField0_ &= ~0x00000002; + avatarId = 0; + return this; + } + + /** + * optional uint32 avatar_id = 12; + * @return the avatarId + */ + public int getAvatarId() { + return avatarId; + } + + /** + * optional uint32 avatar_id = 12; + * @param value the avatarId to set + * @return this + */ + public SetAssistAvatarScRsp setAvatarId(final int value) { + bitField0_ |= 0x00000002; + avatarId = value; + return this; + } + + /** + * repeated uint32 avatar_id_list = 1; * @return whether the avatarIdList field is set */ public boolean hasAvatarIdList() { @@ -127,7 +127,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 5; + * repeated uint32 avatar_id_list = 1; * @return this */ public SetAssistAvatarScRsp clearAvatarIdList() { @@ -137,7 +137,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 5; + * repeated uint32 avatar_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. @@ -151,7 +151,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 5; + * repeated uint32 avatar_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 @@ -165,7 +165,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 5; + * repeated uint32 avatar_id_list = 1; * @param value the avatarIdList to add * @return this */ @@ -176,7 +176,7 @@ public final class SetAssistAvatarScRspOuterClass { } /** - * repeated uint32 avatar_id_list = 5; + * repeated uint32 avatar_id_list = 1; * @param values the avatarIdList to add * @return this */ @@ -191,8 +191,8 @@ public final class SetAssistAvatarScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - avatarId = other.avatarId; retcode = other.retcode; + avatarId = other.avatarId; avatarIdList.copyFrom(other.avatarIdList); } return this; @@ -204,12 +204,12 @@ public final class SetAssistAvatarScRspOuterClass { return this; } cachedSize = -1; - if (other.hasAvatarId()) { - setAvatarId(other.avatarId); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasAvatarId()) { + setAvatarId(other.avatarId); + } if (other.hasAvatarIdList()) { getMutableAvatarIdList().addAll(other.avatarIdList); } @@ -223,8 +223,8 @@ public final class SetAssistAvatarScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - avatarId = 0; retcode = 0; + avatarId = 0; avatarIdList.clear(); return this; } @@ -250,24 +250,24 @@ public final class SetAssistAvatarScRspOuterClass { } SetAssistAvatarScRsp other = (SetAssistAvatarScRsp) o; return bitField0_ == other.bitField0_ - && (!hasAvatarId() || avatarId == other.avatarId) && (!hasRetcode() || retcode == other.retcode) + && (!hasAvatarId() || avatarId == other.avatarId) && (!hasAvatarIdList() || avatarIdList.equals(other.avatarIdList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); - output.writeUInt32NoTag(avatarId); + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < avatarIdList.length(); i++) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(avatarIdList.array()[i]); } } @@ -277,10 +277,10 @@ public final class SetAssistAvatarScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(avatarId); } if ((bitField0_ & 0x00000004) != 0) { size += (1 * avatarIdList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(avatarIdList); @@ -295,25 +295,25 @@ public final class SetAssistAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // avatarId - avatarId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { + case 40: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 96) { break; } } - case 42: { + case 96: { + // avatarId + avatarId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { // avatarIdList [packed=true] input.readPackedUInt32(avatarIdList, tag); bitField0_ |= 0x00000004; @@ -332,7 +332,7 @@ public final class SetAssistAvatarScRspOuterClass { tag = input.readTag(); break; } - case 40: { + case 8: { // avatarIdList [packed=false] tag = input.readRepeatedUInt32(avatarIdList, tag); bitField0_ |= 0x00000004; @@ -346,10 +346,10 @@ public final class SetAssistAvatarScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.avatarId, avatarId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.avatarId, avatarId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.avatarIdList, avatarIdList); @@ -364,11 +364,10 @@ public final class SetAssistAvatarScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - 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_ |= 0x00000001; } } else { @@ -376,10 +375,11 @@ public final class SetAssistAvatarScRspOuterClass { } break; } - 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_ |= 0x00000002; } } else { @@ -452,10 +452,10 @@ public final class SetAssistAvatarScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName avatarId = FieldName.forField("avatarId", "avatar_id"); + static final FieldName avatarIdList = FieldName.forField("avatarIdList", "avatar_id_list"); } } diff --git a/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetClientPausedCsReqOuterClass.java index c59b5f6..50cfb15 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 = 7; + * optional bool paused = 2; */ private boolean paused; @@ -34,7 +34,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 7; + * optional bool paused = 2; * @return whether the paused field is set */ public boolean hasPaused() { @@ -42,7 +42,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 7; + * optional bool paused = 2; * @return this */ public SetClientPausedCsReq clearPaused() { @@ -52,7 +52,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 7; + * optional bool paused = 2; * @return the paused */ public boolean getPaused() { @@ -60,7 +60,7 @@ public final class SetClientPausedCsReqOuterClass { } /** - * optional bool paused = 7; + * optional bool paused = 2; * @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) 56); + output.writeRawByte((byte) 16); output.writeBoolNoTag(paused); } } @@ -150,7 +150,7 @@ public final class SetClientPausedCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 16: { // 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 53a2d81..f17e1f8 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 = 7; + * optional uint32 retcode = 10; */ private int retcode; /** - * optional bool paused = 11; + * optional bool paused = 1; */ private boolean paused; @@ -39,7 +39,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @return this */ public SetClientPausedScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional uint32 retcode = 7; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 11; + * optional bool paused = 1; * @return whether the paused field is set */ public boolean hasPaused() { @@ -84,7 +84,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 11; + * optional bool paused = 1; * @return this */ public SetClientPausedScRsp clearPaused() { @@ -94,7 +94,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 11; + * optional bool paused = 1; * @return the paused */ public boolean getPaused() { @@ -102,7 +102,7 @@ public final class SetClientPausedScRspOuterClass { } /** - * optional bool paused = 11; + * optional bool paused = 1; * @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) 56); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 8); output.writeBoolNoTag(paused); } } @@ -205,16 +205,16 @@ public final class SetClientPausedScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 8) { break; } } - case 88: { + case 8: { // 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 6c7e50a..8249831 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 = 5; + * repeated .DisplayAvatar display_avatar_list = 10; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -35,7 +35,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 10; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -43,7 +43,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 10; * @return this */ public SetDisplayAvatarCsReq clearDisplayAvatarList() { @@ -53,7 +53,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_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 SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_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 SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 10; * @param value the displayAvatarList to add * @return this */ @@ -93,7 +93,7 @@ public final class SetDisplayAvatarCsReqOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 10; * @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) 42); + output.writeRawByte((byte) 82); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -187,7 +187,7 @@ public final class SetDisplayAvatarCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 42: { + case 82: { // 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 d101da7..d79bcbc 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 = 1; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 15; */ private final RepeatedMessage displayAvatarList = RepeatedMessage.newEmptyInstance(DisplayAvatarOuterClass.DisplayAvatar.getFactory()); @@ -40,7 +40,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 13; * @return this */ public SetDisplayAvatarScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 15; * @return whether the displayAvatarList field is set */ public boolean hasDisplayAvatarList() { @@ -85,7 +85,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 15; * @return this */ public SetDisplayAvatarScRsp clearDisplayAvatarList() { @@ -95,7 +95,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_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. @@ -109,7 +109,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_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 @@ -123,7 +123,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 15; * @param value the displayAvatarList to add * @return this */ @@ -135,7 +135,7 @@ public final class SetDisplayAvatarScRspOuterClass { } /** - * repeated .DisplayAvatar display_avatar_list = 5; + * repeated .DisplayAvatar display_avatar_list = 15; * @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) 8); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < displayAvatarList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(displayAvatarList.get(i)); } } @@ -242,16 +242,16 @@ public final class SetDisplayAvatarScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // 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 e8fc65d..c1083c8 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 = 3; + * optional uint32 birthday = 2; */ private int birthday; @@ -34,7 +34,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 2; * @return whether the birthday field is set */ public boolean hasBirthday() { @@ -42,7 +42,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 2; * @return this */ public SetGameplayBirthdayCsReq clearBirthday() { @@ -52,7 +52,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 2; * @return the birthday */ public int getBirthday() { @@ -60,7 +60,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { } /** - * optional uint32 birthday = 3; + * optional uint32 birthday = 2; * @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) 24); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(birthday); } } @@ -150,7 +150,7 @@ public final class SetGameplayBirthdayCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 16: { // 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 df6de52..2487be6 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 retcode = 4; - */ - private int retcode; - - /** - * optional uint32 birthday = 13; + * optional uint32 birthday = 8; */ private int birthday; + /** + * optional uint32 retcode = 12; + */ + private int retcode; + private SetGameplayBirthdayScRsp() { } @@ -39,62 +39,25 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 retcode = 4; - * @return whether the retcode field is set + * optional uint32 birthday = 8; + * @return whether the birthday field is set */ - public boolean hasRetcode() { + public boolean hasBirthday() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 4; - * @return this - */ - public SetGameplayBirthdayScRsp 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 SetGameplayBirthdayScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 birthday = 13; - * @return whether the birthday field is set - */ - public boolean hasBirthday() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 birthday = 13; + * optional uint32 birthday = 8; * @return this */ public SetGameplayBirthdayScRsp clearBirthday() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; birthday = 0; return this; } /** - * optional uint32 birthday = 13; + * optional uint32 birthday = 8; * @return the birthday */ public int getBirthday() { @@ -102,23 +65,60 @@ public final class SetGameplayBirthdayScRspOuterClass { } /** - * optional uint32 birthday = 13; + * optional uint32 birthday = 8; * @param value the birthday to set * @return this */ public SetGameplayBirthdayScRsp setBirthday(final int value) { - bitField0_ |= 0x00000002; + 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; + * @return this + */ + public SetGameplayBirthdayScRsp 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 SetGameplayBirthdayScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + @Override public SetGameplayBirthdayScRsp copyFrom(final SetGameplayBirthdayScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - retcode = other.retcode; birthday = other.birthday; + retcode = other.retcode; } return this; } @@ -129,12 +129,12 @@ public final class SetGameplayBirthdayScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasBirthday()) { setBirthday(other.birthday); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } return this; } @@ -145,8 +145,8 @@ public final class SetGameplayBirthdayScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; birthday = 0; + retcode = 0; return this; } @@ -170,19 +170,19 @@ public final class SetGameplayBirthdayScRspOuterClass { } SetGameplayBirthdayScRsp other = (SetGameplayBirthdayScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) - && (!hasBirthday() || birthday == other.birthday); + && (!hasBirthday() || birthday == other.birthday) + && (!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(birthday); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 104); - output.writeUInt32NoTag(birthday); + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(retcode); } } @@ -190,10 +190,10 @@ public final class SetGameplayBirthdayScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(birthday); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } return size; } @@ -205,18 +205,18 @@ public final class SetGameplayBirthdayScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { - // retcode - retcode = input.readUInt32(); + case 64: { + // birthday + birthday = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 104) { + if (tag != 96) { break; } } - case 104: { - // birthday - birthday = input.readUInt32(); + case 96: { + // retcode + retcode = 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.retcode, retcode); + output.writeUInt32(FieldNames.birthday, birthday); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.birthday, birthday); + output.writeUInt32(FieldNames.retcode, retcode); } output.endObject(); } @@ -256,10 +256,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 1069376125: { + if (input.isAtField(FieldNames.birthday)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + birthday = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,10 +267,10 @@ public final class SetGameplayBirthdayScRspOuterClass { } break; } - case 1069376125: { - if (input.isAtField(FieldNames.birthday)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - birthday = input.readUInt32(); + retcode = 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 retcode = FieldName.forField("retcode"); - static final FieldName birthday = FieldName.forField("birthday"); + + static final FieldName retcode = FieldName.forField("retcode"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataCsReqOuterClass.java new file mode 100644 index 0000000..97fa513 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataCsReqOuterClass.java @@ -0,0 +1,453 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.lunarcore.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.Utf8String; + +public final class SetGroupCustomSaveDataCsReqOuterClass { + /** + * Protobuf type {@code SetGroupCustomSaveDataCsReq} + */ + public static final class SetGroupCustomSaveDataCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 entry_id = 10; + */ + private int entryId; + + /** + * optional uint32 group_id = 14; + */ + private int groupId; + + /** + * optional string group_save_data = 6; + */ + private final Utf8String groupSaveData = Utf8String.newEmptyInstance(); + + private SetGroupCustomSaveDataCsReq() { + } + + /** + * @return a new empty instance of {@code SetGroupCustomSaveDataCsReq} + */ + public static SetGroupCustomSaveDataCsReq newInstance() { + return new SetGroupCustomSaveDataCsReq(); + } + + /** + * optional uint32 entry_id = 10; + * @return whether the entryId field is set + */ + public boolean hasEntryId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 entry_id = 10; + * @return this + */ + public SetGroupCustomSaveDataCsReq clearEntryId() { + bitField0_ &= ~0x00000001; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 10; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 10; + * @param value the entryId to set + * @return this + */ + public SetGroupCustomSaveDataCsReq setEntryId(final int value) { + bitField0_ |= 0x00000001; + entryId = value; + return this; + } + + /** + * optional uint32 group_id = 14; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 group_id = 14; + * @return this + */ + public SetGroupCustomSaveDataCsReq clearGroupId() { + bitField0_ &= ~0x00000002; + 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 SetGroupCustomSaveDataCsReq setGroupId(final int value) { + bitField0_ |= 0x00000002; + groupId = value; + return this; + } + + /** + * optional string group_save_data = 6; + * @return whether the groupSaveData field is set + */ + public boolean hasGroupSaveData() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional string group_save_data = 6; + * @return this + */ + public SetGroupCustomSaveDataCsReq clearGroupSaveData() { + bitField0_ &= ~0x00000004; + groupSaveData.clear(); + return this; + } + + /** + * optional string group_save_data = 6; + * @return the groupSaveData + */ + public String getGroupSaveData() { + return groupSaveData.getString(); + } + + /** + * optional string group_save_data = 6; + * @return internal {@code Utf8String} representation of groupSaveData for reading + */ + public Utf8String getGroupSaveDataBytes() { + return this.groupSaveData; + } + + /** + * optional string group_save_data = 6; + * @return internal {@code Utf8String} representation of groupSaveData for modifications + */ + public Utf8String getMutableGroupSaveDataBytes() { + bitField0_ |= 0x00000004; + return this.groupSaveData; + } + + /** + * optional string group_save_data = 6; + * @param value the groupSaveData to set + * @return this + */ + public SetGroupCustomSaveDataCsReq setGroupSaveData(final CharSequence value) { + bitField0_ |= 0x00000004; + groupSaveData.copyFrom(value); + return this; + } + + /** + * optional string group_save_data = 6; + * @param value the groupSaveData to set + * @return this + */ + public SetGroupCustomSaveDataCsReq setGroupSaveData(final Utf8String value) { + bitField0_ |= 0x00000004; + groupSaveData.copyFrom(value); + return this; + } + + @Override + public SetGroupCustomSaveDataCsReq copyFrom(final SetGroupCustomSaveDataCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + entryId = other.entryId; + groupId = other.groupId; + groupSaveData.copyFrom(other.groupSaveData); + } + return this; + } + + @Override + public SetGroupCustomSaveDataCsReq mergeFrom(final SetGroupCustomSaveDataCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasEntryId()) { + setEntryId(other.entryId); + } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + if (other.hasGroupSaveData()) { + getMutableGroupSaveDataBytes().copyFrom(other.groupSaveData); + } + return this; + } + + @Override + public SetGroupCustomSaveDataCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + entryId = 0; + groupId = 0; + groupSaveData.clear(); + return this; + } + + @Override + public SetGroupCustomSaveDataCsReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + groupSaveData.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof SetGroupCustomSaveDataCsReq)) { + return false; + } + SetGroupCustomSaveDataCsReq other = (SetGroupCustomSaveDataCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasEntryId() || entryId == other.entryId) + && (!hasGroupId() || groupId == other.groupId) + && (!hasGroupSaveData() || groupSaveData.equals(other.groupSaveData)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 50); + output.writeStringNoTag(groupSaveData); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(groupSaveData); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetGroupCustomSaveDataCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 50) { + break; + } + } + case 50: { + // groupSaveData + input.readString(groupSaveData); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeString(FieldNames.groupSaveData, groupSaveData); + } + output.endObject(); + } + + @Override + public SetGroupCustomSaveDataCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + 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 293428218: + case 506361563: { + if (input.isAtField(FieldNames.groupId)) { + if (!input.trySkipNullValue()) { + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -20477338: + case -2125632660: { + if (input.isAtField(FieldNames.groupSaveData)) { + if (!input.trySkipNullValue()) { + input.readString(groupSaveData); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetGroupCustomSaveDataCsReq clone() { + return new SetGroupCustomSaveDataCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetGroupCustomSaveDataCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataCsReq(), data).checkInitialized(); + } + + public static SetGroupCustomSaveDataCsReq parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataCsReq(), input).checkInitialized(); + } + + public static SetGroupCustomSaveDataCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating SetGroupCustomSaveDataCsReq messages + */ + public static MessageFactory getFactory() { + return SetGroupCustomSaveDataCsReqFactory.INSTANCE; + } + + private enum SetGroupCustomSaveDataCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public SetGroupCustomSaveDataCsReq create() { + return SetGroupCustomSaveDataCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName entryId = FieldName.forField("entryId", "entry_id"); + + static final FieldName groupId = FieldName.forField("groupId", "group_id"); + + static final FieldName groupSaveData = FieldName.forField("groupSaveData", "group_save_data"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java new file mode 100644 index 0000000..3336cb5 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/SetGroupCustomSaveDataScRspOuterClass.java @@ -0,0 +1,422 @@ +// 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 SetGroupCustomSaveDataScRspOuterClass { + /** + * Protobuf type {@code SetGroupCustomSaveDataScRsp} + */ + public static final class SetGroupCustomSaveDataScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional uint32 group_id = 7; + */ + private int groupId; + + /** + * optional uint32 entry_id = 13; + */ + private int entryId; + + private SetGroupCustomSaveDataScRsp() { + } + + /** + * @return a new empty instance of {@code SetGroupCustomSaveDataScRsp} + */ + public static SetGroupCustomSaveDataScRsp newInstance() { + return new SetGroupCustomSaveDataScRsp(); + } + + /** + * optional uint32 retcode = 5; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 5; + * @return this + */ + public SetGroupCustomSaveDataScRsp clearRetcode() { + bitField0_ &= ~0x00000001; + 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 SetGroupCustomSaveDataScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional uint32 group_id = 7; + * @return whether the groupId field is set + */ + public boolean hasGroupId() { + 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; + * @return this + */ + public SetGroupCustomSaveDataScRsp clearEntryId() { + bitField0_ &= ~0x00000004; + entryId = 0; + return this; + } + + /** + * optional uint32 entry_id = 13; + * @return the entryId + */ + public int getEntryId() { + return entryId; + } + + /** + * optional uint32 entry_id = 13; + * @param value the entryId to set + * @return this + */ + public SetGroupCustomSaveDataScRsp setEntryId(final int value) { + bitField0_ |= 0x00000004; + entryId = 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; + } + return this; + } + + @Override + public SetGroupCustomSaveDataScRsp mergeFrom(final SetGroupCustomSaveDataScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasGroupId()) { + setGroupId(other.groupId); + } + if (other.hasEntryId()) { + setEntryId(other.entryId); + } + return this; + } + + @Override + public SetGroupCustomSaveDataScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + groupId = 0; + entryId = 0; + return this; + } + + @Override + public SetGroupCustomSaveDataScRsp 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 SetGroupCustomSaveDataScRsp)) { + return false; + } + SetGroupCustomSaveDataScRsp other = (SetGroupCustomSaveDataScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasGroupId() || groupId == other.groupId) + && (!hasEntryId() || entryId == other.entryId); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 104); + output.writeUInt32NoTag(entryId); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(entryId); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public SetGroupCustomSaveDataScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // groupId + groupId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 104) { + break; + } + } + case 104: { + // entryId + entryId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.retcode, retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.groupId, groupId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.entryId, entryId); + } + output.endObject(); + } + + @Override + public SetGroupCustomSaveDataScRsp 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 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; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public SetGroupCustomSaveDataScRsp clone() { + return new SetGroupCustomSaveDataScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static SetGroupCustomSaveDataScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataScRsp(), data).checkInitialized(); + } + + public static SetGroupCustomSaveDataScRsp parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataScRsp(), input).checkInitialized(); + } + + public static SetGroupCustomSaveDataScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new SetGroupCustomSaveDataScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating SetGroupCustomSaveDataScRsp messages + */ + public static MessageFactory getFactory() { + return SetGroupCustomSaveDataScRspFactory.INSTANCE; + } + + private enum SetGroupCustomSaveDataScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public SetGroupCustomSaveDataScRsp create() { + return SetGroupCustomSaveDataScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + 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"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeadIconCsReqOuterClass.java index ecf0393..22cef88 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 = 6; + * optional uint32 id = 8; */ private int id; @@ -34,7 +34,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 8; * @return whether the id field is set */ public boolean hasId() { @@ -42,7 +42,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 8; * @return this */ public SetHeadIconCsReq clearId() { @@ -52,7 +52,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 8; * @return the id */ public int getId() { @@ -60,7 +60,7 @@ public final class SetHeadIconCsReqOuterClass { } /** - * optional uint32 id = 6; + * optional uint32 id = 8; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(id); } } @@ -150,7 +150,7 @@ public final class SetHeadIconCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // 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 7155b33..e1bfe20 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeadIconScRspOuterClass.java @@ -24,7 +24,7 @@ public final class SetHeadIconScRspOuterClass { private int retcode; /** - * optional uint32 current_head_icon_id = 15; + * optional uint32 current_head_icon_id = 14; */ private int currentHeadIconId; @@ -76,7 +76,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 15; + * optional uint32 current_head_icon_id = 14; * @return whether the currentHeadIconId field is set */ public boolean hasCurrentHeadIconId() { @@ -84,7 +84,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 15; + * optional uint32 current_head_icon_id = 14; * @return this */ public SetHeadIconScRsp clearCurrentHeadIconId() { @@ -94,7 +94,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 15; + * optional uint32 current_head_icon_id = 14; * @return the currentHeadIconId */ public int getCurrentHeadIconId() { @@ -102,7 +102,7 @@ public final class SetHeadIconScRspOuterClass { } /** - * optional uint32 current_head_icon_id = 15; + * optional uint32 current_head_icon_id = 14; * @param value the currentHeadIconId to set * @return this */ @@ -181,7 +181,7 @@ public final class SetHeadIconScRspOuterClass { output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 112); output.writeUInt32NoTag(currentHeadIconId); } } @@ -210,11 +210,11 @@ public final class SetHeadIconScRspOuterClass { retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 120) { + if (tag != 112) { break; } } - case 120: { + case 112: { // currentHeadIconId currentHeadIconId = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java index 27d2a87..fc833db 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeCsReqOuterClass.java @@ -19,7 +19,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional .HeroBasicType basic_type = 11; + * optional .HeroBasicType basic_type = 3; */ private int basicType; @@ -34,7 +34,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 11; + * optional .HeroBasicType basic_type = 3; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -42,7 +42,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 11; + * optional .HeroBasicType basic_type = 3; * @return this */ public SetHeroBasicTypeCsReq clearBasicType() { @@ -52,7 +52,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 11; + * optional .HeroBasicType basic_type = 3; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -85,7 +85,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { } /** - * optional .HeroBasicType basic_type = 11; + * optional .HeroBasicType basic_type = 3; * @param value the basicType to set * @return this */ @@ -154,7 +154,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 24); output.writeEnumNoTag(basicType); } } @@ -175,7 +175,7 @@ public final class SetHeroBasicTypeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 24: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java index f570cb3..3728eda 100644 --- a/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetHeroBasicTypeScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SetHeroBasicTypeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; */ private int retcode; /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 13; */ private int basicType; @@ -39,7 +39,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return this */ public SetHeroBasicTypeScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 11; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 13; * @return whether the basicType field is set */ public boolean hasBasicType() { @@ -84,7 +84,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 13; * @return this */ public SetHeroBasicTypeScRsp clearBasicType() { @@ -94,7 +94,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 13; * @return the basicType */ public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { @@ -127,7 +127,7 @@ public final class SetHeroBasicTypeScRspOuterClass { } /** - * optional .HeroBasicType basic_type = 12; + * optional .HeroBasicType basic_type = 13; * @param value the basicType to set * @return this */ @@ -202,11 +202,11 @@ public final class SetHeroBasicTypeScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); + output.writeRawByte((byte) 104); output.writeEnumNoTag(basicType); } } @@ -230,16 +230,16 @@ public final class SetHeroBasicTypeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 88: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 104) { break; } } - case 96: { + case 104: { // basicType final int value = input.readInt32(); if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { diff --git a/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SetLineupNameCsReqOuterClass.java index f8c4ee4..6c66b2c 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 = 10; + * optional uint32 index = 5; */ private int index; /** - * optional string name = 12; + * optional string name = 13; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 5; * @return whether the index field is set */ public boolean hasIndex() { @@ -48,7 +48,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 5; * @return this */ public SetLineupNameCsReq clearIndex() { @@ -58,7 +58,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 5; * @return the index */ public int getIndex() { @@ -66,7 +66,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 5; * @param value the index to set * @return this */ @@ -77,7 +77,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @return whether the name field is set */ public boolean hasName() { @@ -85,7 +85,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @return this */ public SetLineupNameCsReq clearName() { @@ -95,7 +95,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @return the name */ public String getName() { @@ -103,7 +103,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -111,7 +111,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -120,7 +120,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @param value the name to set * @return this */ @@ -131,7 +131,7 @@ public final class SetLineupNameCsReqOuterClass { } /** - * optional string name = 12; + * optional string name = 13; * @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) 80); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 106); output.writeStringNoTag(name); } } @@ -235,16 +235,16 @@ public final class SetLineupNameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 40: { // index index = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 106) { break; } } - case 98: { + case 106: { // 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 a088c50..649900a 100644 --- a/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SetLineupNameScRspOuterClass.java @@ -20,17 +20,17 @@ public final class SetLineupNameScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 7; - */ - private int retcode; - - /** - * optional uint32 index = 8; + * optional uint32 index = 4; */ private int index; /** - * optional string name = 6; + * optional uint32 retcode = 5; + */ + private int retcode; + + /** + * optional string name = 10; */ private final Utf8String name = Utf8String.newEmptyInstance(); @@ -45,62 +45,25 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 retcode = 7; - * @return whether the retcode field is set + * optional uint32 index = 4; + * @return whether the index field is set */ - public boolean hasRetcode() { + public boolean hasIndex() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 retcode = 7; - * @return this - */ - public SetLineupNameScRsp 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 SetLineupNameScRsp setRetcode(final int value) { - bitField0_ |= 0x00000001; - retcode = value; - return this; - } - - /** - * optional uint32 index = 8; - * @return whether the index field is set - */ - public boolean hasIndex() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 index = 8; + * optional uint32 index = 4; * @return this */ public SetLineupNameScRsp clearIndex() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; index = 0; return this; } /** - * optional uint32 index = 8; + * optional uint32 index = 4; * @return the index */ public int getIndex() { @@ -108,18 +71,55 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional uint32 index = 8; + * optional uint32 index = 4; * @param value the index to set * @return this */ public SetLineupNameScRsp setIndex(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; index = value; return this; } /** - * optional string name = 6; + * 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 SetLineupNameScRsp 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 SetLineupNameScRsp setRetcode(final int value) { + bitField0_ |= 0x00000002; + retcode = value; + return this; + } + + /** + * optional string name = 10; * @return whether the name field is set */ public boolean hasName() { @@ -127,7 +127,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @return this */ public SetLineupNameScRsp clearName() { @@ -137,7 +137,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @return the name */ public String getName() { @@ -145,7 +145,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @return internal {@code Utf8String} representation of name for reading */ public Utf8String getNameBytes() { @@ -153,7 +153,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @return internal {@code Utf8String} representation of name for modifications */ public Utf8String getMutableNameBytes() { @@ -162,7 +162,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @param value the name to set * @return this */ @@ -173,7 +173,7 @@ public final class SetLineupNameScRspOuterClass { } /** - * optional string name = 6; + * optional string name = 10; * @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_; - retcode = other.retcode; index = other.index; + retcode = other.retcode; name.copyFrom(other.name); } return this; @@ -201,12 +201,12 @@ public final class SetLineupNameScRspOuterClass { return this; } cachedSize = -1; - if (other.hasRetcode()) { - setRetcode(other.retcode); - } if (other.hasIndex()) { setIndex(other.index); } + if (other.hasRetcode()) { + setRetcode(other.retcode); + } if (other.hasName()) { getMutableNameBytes().copyFrom(other.name); } @@ -220,8 +220,8 @@ public final class SetLineupNameScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - retcode = 0; index = 0; + retcode = 0; name.clear(); return this; } @@ -247,23 +247,23 @@ public final class SetLineupNameScRspOuterClass { } SetLineupNameScRsp other = (SetLineupNameScRsp) o; return bitField0_ == other.bitField0_ - && (!hasRetcode() || retcode == other.retcode) && (!hasIndex() || index == other.index) + && (!hasRetcode() || retcode == other.retcode) && (!hasName() || name.equals(other.name)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 56); - output.writeUInt32NoTag(retcode); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(index); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(retcode); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 50); + output.writeRawByte((byte) 82); 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(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } 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 56: { - // retcode - retcode = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 64) { - break; - } - } - case 64: { + case 32: { // index index = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 50) { + if (tag != 40) { break; } } - case 50: { + case 40: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { // 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.retcode, retcode); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeString(FieldNames.name, name); @@ -353,10 +353,10 @@ public final class SetLineupNameScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case 100346066: { + if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + index = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -364,10 +364,10 @@ public final class SetLineupNameScRspOuterClass { } break; } - case 100346066: { - if (input.isAtField(FieldNames.index)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - index = input.readUInt32(); + retcode = 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 retcode = FieldName.forField("retcode"); - static final FieldName index = FieldName.forField("index"); + static final FieldName retcode = FieldName.forField("retcode"); + 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 bb1d3dc..3c1cb8d 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 = 10; + * optional string nickname = 12; */ private final Utf8String nickname = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @return whether the nickname field is set */ public boolean hasNickname() { @@ -43,7 +43,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @return this */ public SetNicknameCsReq clearNickname() { @@ -53,7 +53,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @return the nickname */ public String getNickname() { @@ -61,7 +61,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @return internal {@code Utf8String} representation of nickname for reading */ public Utf8String getNicknameBytes() { @@ -69,7 +69,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @return internal {@code Utf8String} representation of nickname for modifications */ public Utf8String getMutableNicknameBytes() { @@ -78,7 +78,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @param value the nickname to set * @return this */ @@ -89,7 +89,7 @@ public final class SetNicknameCsReqOuterClass { } /** - * optional string nickname = 10; + * optional string nickname = 12; * @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) 82); + output.writeRawByte((byte) 98); output.writeStringNoTag(nickname); } } @@ -180,7 +180,7 @@ public final class SetNicknameCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 82: { + case 98: { // 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 11d25a7..1f44d2e 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 = 8; + * optional string signature = 11; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -35,7 +35,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @return whether the signature field is set */ public boolean hasSignature() { @@ -43,7 +43,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @return this */ public SetSignatureCsReq clearSignature() { @@ -53,7 +53,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @return the signature */ public String getSignature() { @@ -61,7 +61,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -69,7 +69,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -78,7 +78,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @param value the signature to set * @return this */ @@ -89,7 +89,7 @@ public final class SetSignatureCsReqOuterClass { } /** - * optional string signature = 8; + * optional string signature = 11; * @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) 66); + output.writeRawByte((byte) 90); output.writeStringNoTag(signature); } } @@ -180,7 +180,7 @@ public final class SetSignatureCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 90: { // 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 25f20f7..8bf6ab2 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 = 15; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional string signature = 9; + * optional string signature = 4; */ private final Utf8String signature = Utf8String.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return this */ public SetSignatureScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional uint32 retcode = 15; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @return whether the signature field is set */ public boolean hasSignature() { @@ -85,7 +85,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @return this */ public SetSignatureScRsp clearSignature() { @@ -95,7 +95,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @return the signature */ public String getSignature() { @@ -103,7 +103,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -111,7 +111,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { @@ -120,7 +120,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @param value the signature to set * @return this */ @@ -131,7 +131,7 @@ public final class SetSignatureScRspOuterClass { } /** - * optional string signature = 9; + * optional string signature = 4; * @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) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 34); output.writeStringNoTag(signature); } } @@ -235,16 +235,16 @@ public final class SetSignatureScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 120: { + case 72: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // 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 6f8cdd5..0662ee1 100644 --- a/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/ShopOuterClass.java @@ -20,37 +20,37 @@ public final class ShopOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; */ private long beginTime; /** - * optional int64 end_time = 9; + * optional int64 end_time = 15; */ private long endTime; /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 4; */ private long cityTakenLevelReward; /** - * optional uint32 shop_id = 6; - */ - private int shopId; - - /** - * optional uint32 city_exp = 11; + * optional uint32 city_exp = 2; */ private int cityExp; /** - * optional uint32 city_level = 15; + * optional uint32 city_level = 8; */ private int cityLevel; /** - * repeated .Goods goods_list = 7; + * optional uint32 shop_id = 14; + */ + private int shopId; + + /** + * repeated .Goods goods_list = 9; */ private final RepeatedMessage goodsList = RepeatedMessage.newEmptyInstance(GoodsOuterClass.Goods.getFactory()); @@ -65,7 +65,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return whether the beginTime field is set */ public boolean hasBeginTime() { @@ -73,7 +73,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return this */ public Shop clearBeginTime() { @@ -83,7 +83,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @return the beginTime */ public long getBeginTime() { @@ -91,7 +91,7 @@ public final class ShopOuterClass { } /** - * optional int64 begin_time = 5; + * optional int64 begin_time = 10; * @param value the beginTime to set * @return this */ @@ -102,7 +102,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 9; + * optional int64 end_time = 15; * @return whether the endTime field is set */ public boolean hasEndTime() { @@ -110,7 +110,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 9; + * optional int64 end_time = 15; * @return this */ public Shop clearEndTime() { @@ -120,7 +120,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 9; + * optional int64 end_time = 15; * @return the endTime */ public long getEndTime() { @@ -128,7 +128,7 @@ public final class ShopOuterClass { } /** - * optional int64 end_time = 9; + * optional int64 end_time = 15; * @param value the endTime to set * @return this */ @@ -139,7 +139,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 4; * @return whether the cityTakenLevelReward field is set */ public boolean hasCityTakenLevelReward() { @@ -147,7 +147,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 4; * @return this */ public Shop clearCityTakenLevelReward() { @@ -157,7 +157,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 4; * @return the cityTakenLevelReward */ public long getCityTakenLevelReward() { @@ -165,7 +165,7 @@ public final class ShopOuterClass { } /** - * optional uint64 city_taken_level_reward = 14; + * optional uint64 city_taken_level_reward = 4; * @param value the cityTakenLevelReward to set * @return this */ @@ -176,62 +176,25 @@ public final class ShopOuterClass { } /** - * optional uint32 shop_id = 6; - * @return whether the shopId field is set + * optional uint32 city_exp = 2; + * @return whether the cityExp field is set */ - public boolean hasShopId() { + public boolean hasCityExp() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 shop_id = 6; - * @return this - */ - public Shop clearShopId() { - bitField0_ &= ~0x00000008; - shopId = 0; - return this; - } - - /** - * optional uint32 shop_id = 6; - * @return the shopId - */ - public int getShopId() { - return shopId; - } - - /** - * optional uint32 shop_id = 6; - * @param value the shopId to set - * @return this - */ - public Shop setShopId(final int value) { - bitField0_ |= 0x00000008; - shopId = value; - return this; - } - - /** - * optional uint32 city_exp = 11; - * @return whether the cityExp field is set - */ - public boolean hasCityExp() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 city_exp = 11; + * optional uint32 city_exp = 2; * @return this */ public Shop clearCityExp() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000008; cityExp = 0; return this; } /** - * optional uint32 city_exp = 11; + * optional uint32 city_exp = 2; * @return the cityExp */ public int getCityExp() { @@ -239,36 +202,36 @@ public final class ShopOuterClass { } /** - * optional uint32 city_exp = 11; + * optional uint32 city_exp = 2; * @param value the cityExp to set * @return this */ public Shop setCityExp(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; cityExp = value; return this; } /** - * optional uint32 city_level = 15; + * optional uint32 city_level = 8; * @return whether the cityLevel field is set */ public boolean hasCityLevel() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000010) != 0; } /** - * optional uint32 city_level = 15; + * optional uint32 city_level = 8; * @return this */ public Shop clearCityLevel() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000010; cityLevel = 0; return this; } /** - * optional uint32 city_level = 15; + * optional uint32 city_level = 8; * @return the cityLevel */ public int getCityLevel() { @@ -276,18 +239,55 @@ public final class ShopOuterClass { } /** - * optional uint32 city_level = 15; + * optional uint32 city_level = 8; * @param value the cityLevel to set * @return this */ public Shop setCityLevel(final int value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; cityLevel = value; return this; } /** - * repeated .Goods goods_list = 7; + * optional uint32 shop_id = 14; + * @return whether the shopId field is set + */ + public boolean hasShopId() { + return (bitField0_ & 0x00000020) != 0; + } + + /** + * optional uint32 shop_id = 14; + * @return this + */ + public Shop clearShopId() { + bitField0_ &= ~0x00000020; + shopId = 0; + return this; + } + + /** + * optional uint32 shop_id = 14; + * @return the shopId + */ + public int getShopId() { + return shopId; + } + + /** + * optional uint32 shop_id = 14; + * @param value the shopId to set + * @return this + */ + public Shop setShopId(final int value) { + bitField0_ |= 0x00000020; + shopId = value; + return this; + } + + /** + * repeated .Goods goods_list = 9; * @return whether the goodsList field is set */ public boolean hasGoodsList() { @@ -295,7 +295,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 7; + * repeated .Goods goods_list = 9; * @return this */ public Shop clearGoodsList() { @@ -305,7 +305,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 7; + * repeated .Goods goods_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. @@ -319,7 +319,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 7; + * repeated .Goods goods_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 @@ -333,7 +333,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 7; + * repeated .Goods goods_list = 9; * @param value the goodsList to add * @return this */ @@ -344,7 +344,7 @@ public final class ShopOuterClass { } /** - * repeated .Goods goods_list = 7; + * repeated .Goods goods_list = 9; * @param values the goodsList to add * @return this */ @@ -362,9 +362,9 @@ public final class ShopOuterClass { beginTime = other.beginTime; endTime = other.endTime; cityTakenLevelReward = other.cityTakenLevelReward; - shopId = other.shopId; cityExp = other.cityExp; cityLevel = other.cityLevel; + shopId = other.shopId; goodsList.copyFrom(other.goodsList); } return this; @@ -385,15 +385,15 @@ public final class ShopOuterClass { if (other.hasCityTakenLevelReward()) { setCityTakenLevelReward(other.cityTakenLevelReward); } - if (other.hasShopId()) { - setShopId(other.shopId); - } if (other.hasCityExp()) { setCityExp(other.cityExp); } if (other.hasCityLevel()) { setCityLevel(other.cityLevel); } + if (other.hasShopId()) { + setShopId(other.shopId); + } if (other.hasGoodsList()) { getMutableGoodsList().addAll(other.goodsList); } @@ -410,9 +410,9 @@ public final class ShopOuterClass { beginTime = 0L; endTime = 0L; cityTakenLevelReward = 0L; - shopId = 0; cityExp = 0; cityLevel = 0; + shopId = 0; goodsList.clear(); return this; } @@ -441,41 +441,41 @@ public final class ShopOuterClass { && (!hasBeginTime() || beginTime == other.beginTime) && (!hasEndTime() || endTime == other.endTime) && (!hasCityTakenLevelReward() || cityTakenLevelReward == other.cityTakenLevelReward) - && (!hasShopId() || shopId == other.shopId) && (!hasCityExp() || cityExp == other.cityExp) && (!hasCityLevel() || cityLevel == other.cityLevel) + && (!hasShopId() || shopId == other.shopId) && (!hasGoodsList() || goodsList.equals(other.goodsList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 40); + output.writeRawByte((byte) 80); output.writeInt64NoTag(beginTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 120); output.writeInt64NoTag(endTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 32); output.writeUInt64NoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 48); - output.writeUInt32NoTag(shopId); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(cityExp); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 120); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 64); output.writeUInt32NoTag(cityLevel); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(shopId); + } if ((bitField0_ & 0x00000040) != 0) { for (int i = 0; i < goodsList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 74); output.writeMessageNoTag(goodsList.get(i)); } } @@ -494,14 +494,14 @@ public final class ShopOuterClass { size += 1 + ProtoSink.computeUInt64SizeNoTag(cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); - } - if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cityExp); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cityLevel); } + if ((bitField0_ & 0x00000020) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(shopId); + } if ((bitField0_ & 0x00000040) != 0) { size += (1 * goodsList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(goodsList); } @@ -515,61 +515,61 @@ public final class ShopOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 80: { // beginTime beginTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // endTime - endTime = input.readInt64(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { - // cityTakenLevelReward - cityTakenLevelReward = input.readUInt64(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 48) { - break; - } - } - case 48: { - // shopId - shopId = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { - // cityExp - cityExp = input.readUInt32(); - bitField0_ |= 0x00000010; - tag = input.readTag(); if (tag != 120) { break; } } case 120: { - // cityLevel - cityLevel = input.readUInt32(); - bitField0_ |= 0x00000020; + // endTime + endTime = input.readInt64(); + bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 32) { break; } } - case 58: { + case 32: { + // cityTakenLevelReward + cityTakenLevelReward = input.readUInt64(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // cityExp + cityExp = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // cityLevel + cityLevel = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); + if (tag != 112) { + break; + } + } + case 112: { + // shopId + shopId = input.readUInt32(); + bitField0_ |= 0x00000020; + tag = input.readTag(); + if (tag != 74) { + break; + } + } + case 74: { // goodsList tag = input.readRepeatedMessage(goodsList, tag); bitField0_ |= 0x00000040; @@ -604,14 +604,14 @@ public final class ShopOuterClass { output.writeUInt64(FieldNames.cityTakenLevelReward, cityTakenLevelReward); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.shopId, shopId); - } - if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.cityExp, cityExp); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeUInt32(FieldNames.cityLevel, cityLevel); } + if ((bitField0_ & 0x00000020) != 0) { + output.writeUInt32(FieldNames.shopId, shopId); + } if ((bitField0_ & 0x00000040) != 0) { output.writeRepeatedMessage(FieldNames.goodsList, goodsList); } @@ -661,24 +661,12 @@ public final class ShopOuterClass { } break; } - case -903151951: - case 2067081988: { - if (input.isAtField(FieldNames.shopId)) { - if (!input.trySkipNullValue()) { - shopId = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } case 785415346: case -1421171383: { if (input.isAtField(FieldNames.cityExp)) { if (!input.trySkipNullValue()) { cityExp = input.readUInt32(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -690,6 +678,18 @@ public final class ShopOuterClass { if (input.isAtField(FieldNames.cityLevel)) { if (!input.trySkipNullValue()) { cityLevel = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } + case -903151951: + case 2067081988: { + if (input.isAtField(FieldNames.shopId)) { + if (!input.trySkipNullValue()) { + shopId = input.readUInt32(); bitField0_ |= 0x00000020; } } else { @@ -767,12 +767,12 @@ public final class ShopOuterClass { static final FieldName cityTakenLevelReward = FieldName.forField("cityTakenLevelReward", "city_taken_level_reward"); - static final FieldName shopId = FieldName.forField("shopId", "shop_id"); - static final FieldName cityExp = FieldName.forField("cityExp", "city_exp"); static final FieldName cityLevel = FieldName.forField("cityLevel", "city_level"); + 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 5cc46bb..41c8816 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 = 2; + * optional int64 last_active_time = 8; */ private long lastActiveTime; /** - * optional uint32 chat_bubble_id = 4; + * optional uint32 chat_bubble_id = 1; */ private int chatBubbleId; /** - * optional uint32 head_icon = 5; - */ - private int headIcon; - - /** - * optional uint32 level = 10; - */ - private int level; - - /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; */ private int uid; /** - * optional .FriendOnlineStatus online_status = 3; + * optional uint32 head_icon = 7; */ - private int onlineStatus; + private int headIcon; /** - * optional .PlatformType platform_type = 13; + * optional uint32 level = 11; + */ + private int level; + + /** + * optional .PlatformType platform_type = 9; */ private int platformType; /** - * optional bool is_banned = 9; + * optional .FriendOnlineStatus online_status = 10; + */ + private int onlineStatus; + + /** + * optional bool is_banned = 6; */ private boolean isBanned; /** - * optional string nickname = 6; - */ - private final Utf8String nickname = Utf8String.newEmptyInstance(); - - /** - * optional string signature = 14; + * optional string signature = 3; */ private final Utf8String signature = Utf8String.newEmptyInstance(); /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * optional string nickname = 4; + */ + private final Utf8String nickname = Utf8String.newEmptyInstance(); + + /** + * repeated .AssistSimpleInfo assist_simple_info = 15; */ private final RepeatedMessage assistSimpleInfo = RepeatedMessage.newEmptyInstance(AssistSimpleInfoOuterClass.AssistSimpleInfo.getFactory()); @@ -86,7 +86,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 2; + * optional int64 last_active_time = 8; * @return whether the lastActiveTime field is set */ public boolean hasLastActiveTime() { @@ -94,7 +94,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 2; + * optional int64 last_active_time = 8; * @return this */ public SimpleInfo clearLastActiveTime() { @@ -104,7 +104,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 2; + * optional int64 last_active_time = 8; * @return the lastActiveTime */ public long getLastActiveTime() { @@ -112,7 +112,7 @@ public final class SimpleInfoOuterClass { } /** - * optional int64 last_active_time = 2; + * optional int64 last_active_time = 8; * @param value the lastActiveTime to set * @return this */ @@ -123,7 +123,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 4; + * optional uint32 chat_bubble_id = 1; * @return whether the chatBubbleId field is set */ public boolean hasChatBubbleId() { @@ -131,7 +131,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 4; + * optional uint32 chat_bubble_id = 1; * @return this */ public SimpleInfo clearChatBubbleId() { @@ -141,7 +141,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 4; + * optional uint32 chat_bubble_id = 1; * @return the chatBubbleId */ public int getChatBubbleId() { @@ -149,7 +149,7 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 chat_bubble_id = 4; + * optional uint32 chat_bubble_id = 1; * @param value the chatBubbleId to set * @return this */ @@ -160,99 +160,25 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 head_icon = 5; - * @return whether the headIcon field is set + * optional uint32 uid = 5; + * @return whether the uid field is set */ - public boolean hasHeadIcon() { + public boolean hasUid() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 head_icon = 5; - * @return this - */ - public SimpleInfo clearHeadIcon() { - bitField0_ &= ~0x00000004; - headIcon = 0; - return this; - } - - /** - * optional uint32 head_icon = 5; - * @return the headIcon - */ - public int getHeadIcon() { - return headIcon; - } - - /** - * optional uint32 head_icon = 5; - * @param value the headIcon to set - * @return this - */ - public SimpleInfo setHeadIcon(final int value) { - bitField0_ |= 0x00000004; - headIcon = value; - return this; - } - - /** - * optional uint32 level = 10; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000008) != 0; - } - - /** - * optional uint32 level = 10; - * @return this - */ - public SimpleInfo clearLevel() { - bitField0_ &= ~0x00000008; - level = 0; - return this; - } - - /** - * optional uint32 level = 10; - * @return the level - */ - public int getLevel() { - return level; - } - - /** - * optional uint32 level = 10; - * @param value the level to set - * @return this - */ - public SimpleInfo setLevel(final int value) { - bitField0_ |= 0x00000008; - level = value; - return this; - } - - /** - * optional uint32 uid = 15; - * @return whether the uid field is set - */ - public boolean hasUid() { - return (bitField0_ & 0x00000010) != 0; - } - - /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; * @return this */ public SimpleInfo clearUid() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000004; uid = 0; return this; } /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; * @return the uid */ public int getUid() { @@ -260,98 +186,110 @@ public final class SimpleInfoOuterClass { } /** - * optional uint32 uid = 15; + * optional uint32 uid = 5; * @param value the uid to set * @return this */ public SimpleInfo setUid(final int value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; uid = value; return this; } /** - * optional .FriendOnlineStatus online_status = 3; - * @return whether the onlineStatus field is set + * optional uint32 head_icon = 7; + * @return whether the headIcon field is set */ - public boolean hasOnlineStatus() { + public boolean hasHeadIcon() { + 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; + * @return this + */ + public SimpleInfo clearLevel() { + bitField0_ &= ~0x00000010; + level = 0; + return this; + } + + /** + * optional uint32 level = 11; + * @return the level + */ + public int getLevel() { + return level; + } + + /** + * optional uint32 level = 11; + * @param value the level to set + * @return this + */ + public SimpleInfo setLevel(final int value) { + bitField0_ |= 0x00000010; + level = value; + return this; + } + + /** + * optional .PlatformType platform_type = 9; + * @return whether the platformType field is set + */ + public boolean hasPlatformType() { return (bitField0_ & 0x00000020) != 0; } /** - * optional .FriendOnlineStatus online_status = 3; - * @return this - */ - public SimpleInfo clearOnlineStatus() { - bitField0_ &= ~0x00000020; - onlineStatus = 0; - return this; - } - - /** - * optional .FriendOnlineStatus online_status = 3; - * @return the onlineStatus - */ - public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { - return FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(onlineStatus); - } - - /** - * Gets the value of the internal enum store. The result is - * equivalent to {@link SimpleInfo#getOnlineStatus()}.getNumber(). - * - * @return numeric wire representation - */ - public int getOnlineStatusValue() { - return onlineStatus; - } - - /** - * 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 FriendOnlineStatusOuterClass.FriendOnlineStatus}. Setting an invalid value - * can cause {@link SimpleInfo#getOnlineStatus()} to return null - * - * @param value the numeric wire value to set - * @return this - */ - public SimpleInfo setOnlineStatusValue(final int value) { - bitField0_ |= 0x00000020; - onlineStatus = value; - return this; - } - - /** - * optional .FriendOnlineStatus online_status = 3; - * @param value the onlineStatus to set - * @return this - */ - public SimpleInfo setOnlineStatus(final FriendOnlineStatusOuterClass.FriendOnlineStatus value) { - bitField0_ |= 0x00000020; - onlineStatus = value.getNumber(); - return this; - } - - /** - * optional .PlatformType platform_type = 13; - * @return whether the platformType field is set - */ - public boolean hasPlatformType() { - return (bitField0_ & 0x00000040) != 0; - } - - /** - * optional .PlatformType platform_type = 13; + * optional .PlatformType platform_type = 9; * @return this */ public SimpleInfo clearPlatformType() { - bitField0_ &= ~0x00000040; + bitField0_ &= ~0x00000020; platformType = 0; return this; } /** - * optional .PlatformType platform_type = 13; + * optional .PlatformType platform_type = 9; * @return the platformType */ public PlatformTypeOuterClass.PlatformType getPlatformType() { @@ -378,24 +316,86 @@ public final class SimpleInfoOuterClass { * @return this */ public SimpleInfo setPlatformTypeValue(final int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; platformType = value; return this; } /** - * optional .PlatformType platform_type = 13; + * optional .PlatformType platform_type = 9; * @param value the platformType to set * @return this */ public SimpleInfo setPlatformType(final PlatformTypeOuterClass.PlatformType value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; platformType = value.getNumber(); return this; } /** - * optional bool is_banned = 9; + * optional .FriendOnlineStatus online_status = 10; + * @return whether the onlineStatus field is set + */ + public boolean hasOnlineStatus() { + return (bitField0_ & 0x00000040) != 0; + } + + /** + * optional .FriendOnlineStatus online_status = 10; + * @return this + */ + public SimpleInfo clearOnlineStatus() { + bitField0_ &= ~0x00000040; + onlineStatus = 0; + return this; + } + + /** + * optional .FriendOnlineStatus online_status = 10; + * @return the onlineStatus + */ + public FriendOnlineStatusOuterClass.FriendOnlineStatus getOnlineStatus() { + return FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(onlineStatus); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link SimpleInfo#getOnlineStatus()}.getNumber(). + * + * @return numeric wire representation + */ + public int getOnlineStatusValue() { + return onlineStatus; + } + + /** + * 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 FriendOnlineStatusOuterClass.FriendOnlineStatus}. Setting an invalid value + * can cause {@link SimpleInfo#getOnlineStatus()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public SimpleInfo setOnlineStatusValue(final int value) { + bitField0_ |= 0x00000040; + onlineStatus = value; + return this; + } + + /** + * optional .FriendOnlineStatus online_status = 10; + * @param value the onlineStatus to set + * @return this + */ + public SimpleInfo setOnlineStatus(final FriendOnlineStatusOuterClass.FriendOnlineStatus value) { + bitField0_ |= 0x00000040; + onlineStatus = value.getNumber(); + return this; + } + + /** + * optional bool is_banned = 6; * @return whether the isBanned field is set */ public boolean hasIsBanned() { @@ -403,7 +403,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 9; + * optional bool is_banned = 6; * @return this */ public SimpleInfo clearIsBanned() { @@ -413,7 +413,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 9; + * optional bool is_banned = 6; * @return the isBanned */ public boolean getIsBanned() { @@ -421,7 +421,7 @@ public final class SimpleInfoOuterClass { } /** - * optional bool is_banned = 9; + * optional bool is_banned = 6; * @param value the isBanned to set * @return this */ @@ -432,90 +432,25 @@ public final class SimpleInfoOuterClass { } /** - * optional string nickname = 6; - * @return whether the nickname field is set + * optional string signature = 3; + * @return whether the signature field is set */ - public boolean hasNickname() { + public boolean hasSignature() { return (bitField0_ & 0x00000100) != 0; } /** - * optional string nickname = 6; - * @return this - */ - public SimpleInfo clearNickname() { - bitField0_ &= ~0x00000100; - nickname.clear(); - return this; - } - - /** - * optional string nickname = 6; - * @return the nickname - */ - public String getNickname() { - return nickname.getString(); - } - - /** - * optional string nickname = 6; - * @return internal {@code Utf8String} representation of nickname for reading - */ - public Utf8String getNicknameBytes() { - return this.nickname; - } - - /** - * optional string nickname = 6; - * @return internal {@code Utf8String} representation of nickname for modifications - */ - public Utf8String getMutableNicknameBytes() { - bitField0_ |= 0x00000100; - return this.nickname; - } - - /** - * optional string nickname = 6; - * @param value the nickname to set - * @return this - */ - public SimpleInfo setNickname(final CharSequence value) { - bitField0_ |= 0x00000100; - nickname.copyFrom(value); - return this; - } - - /** - * optional string nickname = 6; - * @param value the nickname to set - * @return this - */ - public SimpleInfo setNickname(final Utf8String value) { - bitField0_ |= 0x00000100; - nickname.copyFrom(value); - return this; - } - - /** - * optional string signature = 14; - * @return whether the signature field is set - */ - public boolean hasSignature() { - return (bitField0_ & 0x00000200) != 0; - } - - /** - * optional string signature = 14; + * optional string signature = 3; * @return this */ public SimpleInfo clearSignature() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000100; signature.clear(); return this; } /** - * optional string signature = 14; + * optional string signature = 3; * @return the signature */ public String getSignature() { @@ -523,7 +458,7 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 14; + * optional string signature = 3; * @return internal {@code Utf8String} representation of signature for reading */ public Utf8String getSignatureBytes() { @@ -531,38 +466,103 @@ public final class SimpleInfoOuterClass { } /** - * optional string signature = 14; + * optional string signature = 3; * @return internal {@code Utf8String} representation of signature for modifications */ public Utf8String getMutableSignatureBytes() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return this.signature; } /** - * optional string signature = 14; + * optional string signature = 3; * @param value the signature to set * @return this */ public SimpleInfo setSignature(final CharSequence value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; signature.copyFrom(value); return this; } /** - * optional string signature = 14; + * optional string signature = 3; * @param value the signature to set * @return this */ public SimpleInfo setSignature(final Utf8String value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; signature.copyFrom(value); return this; } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * optional string nickname = 4; + * @return whether the nickname field is set + */ + public boolean hasNickname() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional string nickname = 4; + * @return this + */ + public SimpleInfo clearNickname() { + bitField0_ &= ~0x00000200; + nickname.clear(); + return this; + } + + /** + * optional string nickname = 4; + * @return the nickname + */ + public String getNickname() { + return nickname.getString(); + } + + /** + * optional string nickname = 4; + * @return internal {@code Utf8String} representation of nickname for reading + */ + public Utf8String getNicknameBytes() { + return this.nickname; + } + + /** + * optional string nickname = 4; + * @return internal {@code Utf8String} representation of nickname for modifications + */ + public Utf8String getMutableNicknameBytes() { + bitField0_ |= 0x00000200; + return this.nickname; + } + + /** + * optional string nickname = 4; + * @param value the nickname to set + * @return this + */ + public SimpleInfo setNickname(final CharSequence value) { + bitField0_ |= 0x00000200; + nickname.copyFrom(value); + return this; + } + + /** + * optional string nickname = 4; + * @param value the nickname to set + * @return this + */ + public SimpleInfo setNickname(final Utf8String value) { + bitField0_ |= 0x00000200; + nickname.copyFrom(value); + return this; + } + + /** + * repeated .AssistSimpleInfo assist_simple_info = 15; * @return whether the assistSimpleInfo field is set */ public boolean hasAssistSimpleInfo() { @@ -570,7 +570,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * repeated .AssistSimpleInfo assist_simple_info = 15; * @return this */ public SimpleInfo clearAssistSimpleInfo() { @@ -580,7 +580,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * repeated .AssistSimpleInfo assist_simple_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. @@ -594,7 +594,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * repeated .AssistSimpleInfo assist_simple_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 @@ -609,7 +609,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * repeated .AssistSimpleInfo assist_simple_info = 15; * @param value the assistSimpleInfo to add * @return this */ @@ -620,7 +620,7 @@ public final class SimpleInfoOuterClass { } /** - * repeated .AssistSimpleInfo assist_simple_info = 7; + * repeated .AssistSimpleInfo assist_simple_info = 15; * @param values the assistSimpleInfo to add * @return this */ @@ -638,14 +638,14 @@ public final class SimpleInfoOuterClass { bitField0_ = other.bitField0_; lastActiveTime = other.lastActiveTime; chatBubbleId = other.chatBubbleId; + uid = other.uid; headIcon = other.headIcon; level = other.level; - uid = other.uid; - onlineStatus = other.onlineStatus; platformType = other.platformType; + onlineStatus = other.onlineStatus; isBanned = other.isBanned; - nickname.copyFrom(other.nickname); signature.copyFrom(other.signature); + nickname.copyFrom(other.nickname); assistSimpleInfo.copyFrom(other.assistSimpleInfo); } return this; @@ -663,30 +663,30 @@ public final class SimpleInfoOuterClass { if (other.hasChatBubbleId()) { setChatBubbleId(other.chatBubbleId); } + if (other.hasUid()) { + setUid(other.uid); + } if (other.hasHeadIcon()) { setHeadIcon(other.headIcon); } if (other.hasLevel()) { setLevel(other.level); } - if (other.hasUid()) { - setUid(other.uid); + if (other.hasPlatformType()) { + setPlatformTypeValue(other.platformType); } if (other.hasOnlineStatus()) { setOnlineStatusValue(other.onlineStatus); } - if (other.hasPlatformType()) { - setPlatformTypeValue(other.platformType); - } if (other.hasIsBanned()) { setIsBanned(other.isBanned); } - if (other.hasNickname()) { - getMutableNicknameBytes().copyFrom(other.nickname); - } if (other.hasSignature()) { getMutableSignatureBytes().copyFrom(other.signature); } + if (other.hasNickname()) { + getMutableNicknameBytes().copyFrom(other.nickname); + } if (other.hasAssistSimpleInfo()) { getMutableAssistSimpleInfo().addAll(other.assistSimpleInfo); } @@ -702,14 +702,14 @@ public final class SimpleInfoOuterClass { bitField0_ = 0; lastActiveTime = 0L; chatBubbleId = 0; + uid = 0; headIcon = 0; level = 0; - uid = 0; - onlineStatus = 0; platformType = 0; + onlineStatus = 0; isBanned = false; - nickname.clear(); signature.clear(); + nickname.clear(); assistSimpleInfo.clear(); return this; } @@ -721,8 +721,8 @@ public final class SimpleInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - nickname.clear(); signature.clear(); + nickname.clear(); assistSimpleInfo.clearQuick(); return this; } @@ -739,62 +739,62 @@ public final class SimpleInfoOuterClass { return bitField0_ == other.bitField0_ && (!hasLastActiveTime() || lastActiveTime == other.lastActiveTime) && (!hasChatBubbleId() || chatBubbleId == other.chatBubbleId) + && (!hasUid() || uid == other.uid) && (!hasHeadIcon() || headIcon == other.headIcon) && (!hasLevel() || level == other.level) - && (!hasUid() || uid == other.uid) - && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasPlatformType() || platformType == other.platformType) + && (!hasOnlineStatus() || onlineStatus == other.onlineStatus) && (!hasIsBanned() || isBanned == other.isBanned) - && (!hasNickname() || nickname.equals(other.nickname)) && (!hasSignature() || signature.equals(other.signature)) + && (!hasNickname() || nickname.equals(other.nickname)) && (!hasAssistSimpleInfo() || assistSimpleInfo.equals(other.assistSimpleInfo)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); + output.writeRawByte((byte) 64); output.writeInt64NoTag(lastActiveTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 40); - output.writeUInt32NoTag(headIcon); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 120); output.writeUInt32NoTag(uid); } - if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 24); - output.writeEnumNoTag(onlineStatus); + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(headIcon); } - if ((bitField0_ & 0x00000040) != 0) { - output.writeRawByte((byte) 104); + if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 88); + output.writeUInt32NoTag(level); + } + if ((bitField0_ & 0x00000020) != 0) { + output.writeRawByte((byte) 72); output.writeEnumNoTag(platformType); } + if ((bitField0_ & 0x00000040) != 0) { + output.writeRawByte((byte) 80); + output.writeEnumNoTag(onlineStatus); + } if ((bitField0_ & 0x00000080) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeBoolNoTag(isBanned); } if ((bitField0_ & 0x00000100) != 0) { - output.writeRawByte((byte) 50); - output.writeStringNoTag(nickname); + output.writeRawByte((byte) 26); + output.writeStringNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeRawByte((byte) 114); - output.writeStringNoTag(signature); + output.writeRawByte((byte) 34); + output.writeStringNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { for (int i = 0; i < assistSimpleInfo.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 122); output.writeMessageNoTag(assistSimpleInfo.get(i)); } } @@ -810,28 +810,28 @@ public final class SimpleInfoOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(headIcon); - } - if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000010) != 0) { 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_ & 0x00000020) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); + size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); } if ((bitField0_ & 0x00000040) != 0) { - size += 1 + ProtoSink.computeEnumSizeNoTag(platformType); + size += 1 + ProtoSink.computeEnumSizeNoTag(onlineStatus); } if ((bitField0_ & 0x00000080) != 0) { size += 2; } if ((bitField0_ & 0x00000100) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(nickname); + size += 1 + ProtoSink.computeStringSizeNoTag(signature); } if ((bitField0_ & 0x00000200) != 0) { - size += 1 + ProtoSink.computeStringSizeNoTag(signature); + size += 1 + ProtoSink.computeStringSizeNoTag(nickname); } if ((bitField0_ & 0x00000400) != 0) { size += (1 * assistSimpleInfo.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assistSimpleInfo); @@ -846,16 +846,16 @@ public final class SimpleInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 64: { // lastActiveTime lastActiveTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 32) { + if (tag != 8) { break; } } - case 32: { + case 8: { // chatBubbleId chatBubbleId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -865,84 +865,84 @@ public final class SimpleInfoOuterClass { } } case 40: { - // headIcon - headIcon = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 80) { - break; - } - } - case 80: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000008; - tag = input.readTag(); - if (tag != 120) { - break; - } - } - case 120: { // uid uid = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 56) { + break; + } + } + case 56: { + // headIcon + headIcon = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 88) { + break; + } + } + case 88: { + // level + level = input.readUInt32(); bitField0_ |= 0x00000010; tag = input.readTag(); - if (tag != 24) { - break; - } - } - case 24: { - // onlineStatus - final int value = input.readInt32(); - if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { - onlineStatus = value; - bitField0_ |= 0x00000020; - } - tag = input.readTag(); - if (tag != 104) { - break; - } - } - case 104: { - // platformType - final int value = input.readInt32(); - if (PlatformTypeOuterClass.PlatformType.forNumber(value) != null) { - platformType = value; - bitField0_ |= 0x00000040; - } - 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; + } + tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // onlineStatus + final int value = input.readInt32(); + if (FriendOnlineStatusOuterClass.FriendOnlineStatus.forNumber(value) != null) { + onlineStatus = value; + bitField0_ |= 0x00000040; + } + tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { // isBanned isBanned = input.readBool(); bitField0_ |= 0x00000080; tag = input.readTag(); - if (tag != 50) { + if (tag != 26) { break; } } - case 50: { - // nickname - input.readString(nickname); - bitField0_ |= 0x00000100; - tag = input.readTag(); - if (tag != 114) { - break; - } - } - case 114: { + case 26: { // signature input.readString(signature); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { + // nickname + input.readString(nickname); + bitField0_ |= 0x00000200; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { // assistSimpleInfo tag = input.readRepeatedMessage(assistSimpleInfo, tag); bitField0_ |= 0x00000400; @@ -974,28 +974,28 @@ public final class SimpleInfoOuterClass { output.writeUInt32(FieldNames.chatBubbleId, chatBubbleId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.headIcon, headIcon); - } - if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000010) != 0) { 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_ & 0x00000020) != 0) { - output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); + output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); } if ((bitField0_ & 0x00000040) != 0) { - output.writeEnum(FieldNames.platformType, platformType, PlatformTypeOuterClass.PlatformType.converter()); + output.writeEnum(FieldNames.onlineStatus, onlineStatus, FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); } if ((bitField0_ & 0x00000080) != 0) { output.writeBool(FieldNames.isBanned, isBanned); } if ((bitField0_ & 0x00000100) != 0) { - output.writeString(FieldNames.nickname, nickname); + output.writeString(FieldNames.signature, signature); } if ((bitField0_ & 0x00000200) != 0) { - output.writeString(FieldNames.signature, signature); + output.writeString(FieldNames.nickname, nickname); } if ((bitField0_ & 0x00000400) != 0) { output.writeRepeatedMessage(FieldNames.assistSimpleInfo, assistSimpleInfo); @@ -1034,12 +1034,23 @@ public final class SimpleInfoOuterClass { } break; } + case 115792: { + if (input.isAtField(FieldNames.uid)) { + if (!input.trySkipNullValue()) { + uid = 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; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -1050,17 +1061,6 @@ public final class SimpleInfoOuterClass { if (input.isAtField(FieldNames.level)) { if (!input.trySkipNullValue()) { level = input.readUInt32(); - bitField0_ |= 0x00000008; - } - } else { - input.skipUnknownField(); - } - break; - } - case 115792: { - if (input.isAtField(FieldNames.uid)) { - if (!input.trySkipNullValue()) { - uid = input.readUInt32(); bitField0_ |= 0x00000010; } } else { @@ -1068,23 +1068,6 @@ public final class SimpleInfoOuterClass { } break; } - case 1159866405: - case -650386594: { - if (input.isAtField(FieldNames.onlineStatus)) { - if (!input.trySkipNullValue()) { - 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)) { @@ -1092,6 +1075,23 @@ public final class SimpleInfoOuterClass { 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)) { + if (!input.trySkipNullValue()) { + final FriendOnlineStatusOuterClass.FriendOnlineStatus value = input.readEnum(FriendOnlineStatusOuterClass.FriendOnlineStatus.converter()); + if (value != null) { + onlineStatus = value.getNumber(); bitField0_ |= 0x00000040; } else { input.skipUnknownEnumValue(); @@ -1114,10 +1114,10 @@ public final class SimpleInfoOuterClass { } break; } - case 70690926: { - if (input.isAtField(FieldNames.nickname)) { + case 1073584312: { + if (input.isAtField(FieldNames.signature)) { if (!input.trySkipNullValue()) { - input.readString(nickname); + input.readString(signature); bitField0_ |= 0x00000100; } } else { @@ -1125,10 +1125,10 @@ public final class SimpleInfoOuterClass { } break; } - case 1073584312: { - if (input.isAtField(FieldNames.signature)) { + case 70690926: { + if (input.isAtField(FieldNames.nickname)) { if (!input.trySkipNullValue()) { - input.readString(signature); + input.readString(nickname); bitField0_ |= 0x00000200; } } else { @@ -1204,22 +1204,22 @@ public final class SimpleInfoOuterClass { static final FieldName chatBubbleId = FieldName.forField("chatBubbleId", "chat_bubble_id"); + 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 uid = FieldName.forField("uid"); + static final FieldName platformType = FieldName.forField("platformType", "platform_type"); 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 nickname = FieldName.forField("nickname"); - static final FieldName signature = FieldName.forField("signature"); + static final FieldName nickname = FieldName.forField("nickname"); + static final FieldName assistSimpleInfo = FieldName.forField("assistSimpleInfo", "assist_simple_info"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java index 0390ed3..4e33af7 100644 --- a/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StaminaInfoScNotifyOuterClass.java @@ -19,22 +19,22 @@ public final class StaminaInfoScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 11; */ private long nextRecoverTime; /** - * optional int64 DCGINCBODIG = 7; + * optional int64 next_reserve_time = 15; */ - private long dCGINCBODIG; + private long nextReserveTime; /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 1; */ private int stamina; /** - * optional uint32 reserve_stamina = 9; + * optional uint32 reserve_stamina = 2; */ private int reserveStamina; @@ -49,7 +49,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 11; * @return whether the nextRecoverTime field is set */ public boolean hasNextRecoverTime() { @@ -57,7 +57,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 11; * @return this */ public StaminaInfoScNotify clearNextRecoverTime() { @@ -67,7 +67,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 11; * @return the nextRecoverTime */ public long getNextRecoverTime() { @@ -75,7 +75,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 next_recover_time = 4; + * optional int64 next_recover_time = 11; * @param value the nextRecoverTime to set * @return this */ @@ -86,44 +86,44 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional int64 DCGINCBODIG = 7; - * @return whether the dCGINCBODIG field is set + * optional int64 next_reserve_time = 15; + * @return whether the nextReserveTime field is set */ - public boolean hasDCGINCBODIG() { + public boolean hasNextReserveTime() { return (bitField0_ & 0x00000002) != 0; } /** - * optional int64 DCGINCBODIG = 7; + * optional int64 next_reserve_time = 15; * @return this */ - public StaminaInfoScNotify clearDCGINCBODIG() { + public StaminaInfoScNotify clearNextReserveTime() { bitField0_ &= ~0x00000002; - dCGINCBODIG = 0L; + nextReserveTime = 0L; return this; } /** - * optional int64 DCGINCBODIG = 7; - * @return the dCGINCBODIG + * optional int64 next_reserve_time = 15; + * @return the nextReserveTime */ - public long getDCGINCBODIG() { - return dCGINCBODIG; + public long getNextReserveTime() { + return nextReserveTime; } /** - * optional int64 DCGINCBODIG = 7; - * @param value the dCGINCBODIG to set + * optional int64 next_reserve_time = 15; + * @param value the nextReserveTime to set * @return this */ - public StaminaInfoScNotify setDCGINCBODIG(final long value) { + public StaminaInfoScNotify setNextReserveTime(final long value) { bitField0_ |= 0x00000002; - dCGINCBODIG = value; + nextReserveTime = value; return this; } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 1; * @return whether the stamina field is set */ public boolean hasStamina() { @@ -131,7 +131,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 1; * @return this */ public StaminaInfoScNotify clearStamina() { @@ -141,7 +141,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 1; * @return the stamina */ public int getStamina() { @@ -149,7 +149,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 stamina = 6; + * optional uint32 stamina = 1; * @param value the stamina to set * @return this */ @@ -160,7 +160,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 9; + * optional uint32 reserve_stamina = 2; * @return whether the reserveStamina field is set */ public boolean hasReserveStamina() { @@ -168,7 +168,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 9; + * optional uint32 reserve_stamina = 2; * @return this */ public StaminaInfoScNotify clearReserveStamina() { @@ -178,7 +178,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 9; + * optional uint32 reserve_stamina = 2; * @return the reserveStamina */ public int getReserveStamina() { @@ -186,7 +186,7 @@ public final class StaminaInfoScNotifyOuterClass { } /** - * optional uint32 reserve_stamina = 9; + * optional uint32 reserve_stamina = 2; * @param value the reserveStamina to set * @return this */ @@ -202,7 +202,7 @@ public final class StaminaInfoScNotifyOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; nextRecoverTime = other.nextRecoverTime; - dCGINCBODIG = other.dCGINCBODIG; + nextReserveTime = other.nextReserveTime; stamina = other.stamina; reserveStamina = other.reserveStamina; } @@ -218,8 +218,8 @@ public final class StaminaInfoScNotifyOuterClass { if (other.hasNextRecoverTime()) { setNextRecoverTime(other.nextRecoverTime); } - if (other.hasDCGINCBODIG()) { - setDCGINCBODIG(other.dCGINCBODIG); + if (other.hasNextReserveTime()) { + setNextReserveTime(other.nextReserveTime); } if (other.hasStamina()) { setStamina(other.stamina); @@ -238,7 +238,7 @@ public final class StaminaInfoScNotifyOuterClass { cachedSize = -1; bitField0_ = 0; nextRecoverTime = 0L; - dCGINCBODIG = 0L; + nextReserveTime = 0L; stamina = 0; reserveStamina = 0; return this; @@ -265,7 +265,7 @@ public final class StaminaInfoScNotifyOuterClass { StaminaInfoScNotify other = (StaminaInfoScNotify) o; return bitField0_ == other.bitField0_ && (!hasNextRecoverTime() || nextRecoverTime == other.nextRecoverTime) - && (!hasDCGINCBODIG() || dCGINCBODIG == other.dCGINCBODIG) + && (!hasNextReserveTime() || nextReserveTime == other.nextReserveTime) && (!hasStamina() || stamina == other.stamina) && (!hasReserveStamina() || reserveStamina == other.reserveStamina); } @@ -273,19 +273,19 @@ public final class StaminaInfoScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 88); output.writeInt64NoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 56); - output.writeInt64NoTag(dCGINCBODIG); + output.writeRawByte((byte) 120); + output.writeInt64NoTag(nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(stamina); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(reserveStamina); } } @@ -297,7 +297,7 @@ public final class StaminaInfoScNotifyOuterClass { size += 1 + ProtoSink.computeInt64SizeNoTag(nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeInt64SizeNoTag(dCGINCBODIG); + size += 1 + ProtoSink.computeInt64SizeNoTag(nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(stamina); @@ -315,34 +315,34 @@ public final class StaminaInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 88: { // nextRecoverTime nextRecoverTime = input.readInt64(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 56) { + if (tag != 120) { break; } } - case 56: { - // dCGINCBODIG - dCGINCBODIG = input.readInt64(); + case 120: { + // nextReserveTime + nextReserveTime = input.readInt64(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 48) { + if (tag != 8) { break; } } - case 48: { + case 8: { // stamina stamina = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 72) { + if (tag != 16) { break; } } - case 72: { + case 16: { // reserveStamina reserveStamina = input.readUInt32(); bitField0_ |= 0x00000008; @@ -372,7 +372,7 @@ public final class StaminaInfoScNotifyOuterClass { output.writeInt64(FieldNames.nextRecoverTime, nextRecoverTime); } if ((bitField0_ & 0x00000002) != 0) { - output.writeInt64(FieldNames.dCGINCBODIG, dCGINCBODIG); + output.writeInt64(FieldNames.nextReserveTime, nextReserveTime); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.stamina, stamina); @@ -402,10 +402,11 @@ public final class StaminaInfoScNotifyOuterClass { } break; } - case -831886433: { - if (input.isAtField(FieldNames.dCGINCBODIG)) { + case 152759478: + case 1594234428: { + if (input.isAtField(FieldNames.nextReserveTime)) { if (!input.trySkipNullValue()) { - dCGINCBODIG = input.readInt64(); + nextReserveTime = input.readInt64(); bitField0_ |= 0x00000002; } } else { @@ -491,7 +492,7 @@ public final class StaminaInfoScNotifyOuterClass { static class FieldNames { static final FieldName nextRecoverTime = FieldName.forField("nextRecoverTime", "next_recover_time"); - static final FieldName dCGINCBODIG = FieldName.forField("DCGINCBODIG"); + static final FieldName nextReserveTime = FieldName.forField("nextReserveTime", "next_reserve_time"); static final FieldName stamina = FieldName.forField("stamina"); diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java index 9bf148d..acde4cd 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeCsReqOuterClass.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; public final class StartChallengeCsReqOuterClass { /** @@ -19,15 +20,25 @@ public final class StartChallengeCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 15; */ private int challengeId; /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 3; */ private final StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo storyInfo = StartChallengeStoryInfoOuterClass.StartChallengeStoryInfo.newInstance(); + /** + * repeated uint32 lineup1 = 7; + */ + private final RepeatedInt lineup1 = RepeatedInt.newEmptyInstance(); + + /** + * repeated uint32 lineup2 = 14; + */ + private final RepeatedInt lineup2 = RepeatedInt.newEmptyInstance(); + private StartChallengeCsReq() { } @@ -39,7 +50,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 15; * @return whether the challengeId field is set */ public boolean hasChallengeId() { @@ -47,7 +58,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 15; * @return this */ public StartChallengeCsReq clearChallengeId() { @@ -57,7 +68,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 15; * @return the challengeId */ public int getChallengeId() { @@ -65,7 +76,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional uint32 challenge_id = 6; + * optional uint32 challenge_id = 15; * @param value the challengeId to set * @return this */ @@ -76,7 +87,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 3; * @return whether the storyInfo field is set */ public boolean hasStoryInfo() { @@ -84,7 +95,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 3; * @return this */ public StartChallengeCsReq clearStoryInfo() { @@ -94,7 +105,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_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 +119,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_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 +133,7 @@ public final class StartChallengeCsReqOuterClass { } /** - * optional .StartChallengeStoryInfo story_info = 9; + * optional .StartChallengeStoryInfo story_info = 3; * @param value the storyInfo to set * @return this */ @@ -133,6 +144,142 @@ public final class StartChallengeCsReqOuterClass { return this; } + /** + * repeated uint32 lineup1 = 7; + * @return whether the lineup1 field is set + */ + public boolean hasLineup1() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * repeated uint32 lineup1 = 7; + * @return this + */ + public StartChallengeCsReq clearLineup1() { + bitField0_ &= ~0x00000004; + lineup1.clear(); + return this; + } + + /** + * repeated uint32 lineup1 = 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 #getMutableLineup1()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLineup1() { + return lineup1; + } + + /** + * repeated uint32 lineup1 = 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 getMutableLineup1() { + bitField0_ |= 0x00000004; + return lineup1; + } + + /** + * repeated uint32 lineup1 = 7; + * @param value the lineup1 to add + * @return this + */ + public StartChallengeCsReq addLineup1(final int value) { + bitField0_ |= 0x00000004; + lineup1.add(value); + return this; + } + + /** + * repeated uint32 lineup1 = 7; + * @param values the lineup1 to add + * @return this + */ + public StartChallengeCsReq addAllLineup1(final int... values) { + bitField0_ |= 0x00000004; + lineup1.addAll(values); + return this; + } + + /** + * repeated uint32 lineup2 = 14; + * @return whether the lineup2 field is set + */ + public boolean hasLineup2() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated uint32 lineup2 = 14; + * @return this + */ + public StartChallengeCsReq clearLineup2() { + bitField0_ &= ~0x00000008; + lineup2.clear(); + return this; + } + + /** + * repeated uint32 lineup2 = 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 #getMutableLineup2()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getLineup2() { + return lineup2; + } + + /** + * repeated uint32 lineup2 = 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 RepeatedInt getMutableLineup2() { + bitField0_ |= 0x00000008; + return lineup2; + } + + /** + * repeated uint32 lineup2 = 14; + * @param value the lineup2 to add + * @return this + */ + public StartChallengeCsReq addLineup2(final int value) { + bitField0_ |= 0x00000008; + lineup2.add(value); + return this; + } + + /** + * repeated uint32 lineup2 = 14; + * @param values the lineup2 to add + * @return this + */ + public StartChallengeCsReq addAllLineup2(final int... values) { + bitField0_ |= 0x00000008; + lineup2.addAll(values); + return this; + } + @Override public StartChallengeCsReq copyFrom(final StartChallengeCsReq other) { cachedSize = other.cachedSize; @@ -140,6 +287,8 @@ public final class StartChallengeCsReqOuterClass { bitField0_ = other.bitField0_; challengeId = other.challengeId; storyInfo.copyFrom(other.storyInfo); + lineup1.copyFrom(other.lineup1); + lineup2.copyFrom(other.lineup2); } return this; } @@ -156,6 +305,12 @@ public final class StartChallengeCsReqOuterClass { if (other.hasStoryInfo()) { getMutableStoryInfo().mergeFrom(other.storyInfo); } + if (other.hasLineup1()) { + getMutableLineup1().addAll(other.lineup1); + } + if (other.hasLineup2()) { + getMutableLineup2().addAll(other.lineup2); + } return this; } @@ -168,6 +323,8 @@ public final class StartChallengeCsReqOuterClass { bitField0_ = 0; challengeId = 0; storyInfo.clear(); + lineup1.clear(); + lineup2.clear(); return this; } @@ -179,6 +336,8 @@ public final class StartChallengeCsReqOuterClass { cachedSize = -1; bitField0_ = 0; storyInfo.clearQuick(); + lineup1.clear(); + lineup2.clear(); return this; } @@ -193,19 +352,33 @@ public final class StartChallengeCsReqOuterClass { StartChallengeCsReq other = (StartChallengeCsReq) o; return bitField0_ == other.bitField0_ && (!hasChallengeId() || challengeId == other.challengeId) - && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)); + && (!hasStoryInfo() || storyInfo.equals(other.storyInfo)) + && (!hasLineup1() || lineup1.equals(other.lineup1)) + && (!hasLineup2() || lineup2.equals(other.lineup2)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(challengeId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 26); output.writeMessageNoTag(storyInfo); } + if ((bitField0_ & 0x00000004) != 0) { + for (int i = 0; i < lineup1.length(); i++) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(lineup1.array()[i]); + } + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < lineup2.length(); i++) { + output.writeRawByte((byte) 112); + output.writeUInt32NoTag(lineup2.array()[i]); + } + } } @Override @@ -217,6 +390,12 @@ public final class StartChallengeCsReqOuterClass { if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(storyInfo); } + if ((bitField0_ & 0x00000004) != 0) { + size += (1 * lineup1.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup1); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * lineup2.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(lineup2); + } return size; } @@ -227,20 +406,38 @@ public final class StartChallengeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 120: { // challengeId challengeId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 26) { break; } } - case 74: { + case 26: { // storyInfo input.readMessage(storyInfo); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // lineup1 [packed=true] + input.readPackedUInt32(lineup1, tag); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 114) { + break; + } + } + case 114: { + // lineup2 [packed=true] + input.readPackedUInt32(lineup2, tag); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 0) { break; } @@ -255,6 +452,18 @@ public final class StartChallengeCsReqOuterClass { tag = input.readTag(); break; } + case 56: { + // lineup1 [packed=false] + tag = input.readRepeatedUInt32(lineup1, tag); + bitField0_ |= 0x00000004; + break; + } + case 112: { + // lineup2 [packed=false] + tag = input.readRepeatedUInt32(lineup2, tag); + bitField0_ |= 0x00000008; + break; + } } } } @@ -268,6 +477,12 @@ public final class StartChallengeCsReqOuterClass { if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.storyInfo, storyInfo); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRepeatedUInt32(FieldNames.lineup1, lineup1); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.lineup2, lineup2); + } output.endObject(); } @@ -302,6 +517,28 @@ public final class StartChallengeCsReqOuterClass { } break; } + case 176922754: { + if (input.isAtField(FieldNames.lineup1)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lineup1); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 176922755: { + if (input.isAtField(FieldNames.lineup2)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(lineup2); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -358,6 +595,10 @@ public final class StartChallengeCsReqOuterClass { static final FieldName challengeId = FieldName.forField("challengeId", "challenge_id"); static final FieldName storyInfo = FieldName.forField("storyInfo", "story_info"); + + static final FieldName lineup1 = FieldName.forField("lineup1"); + + static final FieldName lineup2 = FieldName.forField("lineup2"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java index d3f8b52..906044e 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeScRspOuterClass.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.RepeatedMessage; public final class StartChallengeScRspOuterClass { /** @@ -19,24 +20,29 @@ public final class StartChallengeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; */ private int retcode; /** - * optional .ChallengeInfo challenge_info = 1; + * optional .ChallengeExtInfo ext_info = 8; */ - private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); + private final ChallengeExtInfoOuterClass.ChallengeExtInfo extInfo = ChallengeExtInfoOuterClass.ChallengeExtInfo.newInstance(); /** - * optional .SceneInfo scene = 2; + * optional .SceneInfo scene = 10; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); /** - * optional .LineupInfo lineup = 12; + * optional .ChallengeInfo challenge_info = 11; */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); + + /** + * repeated .LineupInfo lineup_list = 5; + */ + private final RepeatedMessage lineupList = RepeatedMessage.newEmptyInstance(LineupInfoOuterClass.LineupInfo.getFactory()); private StartChallengeScRsp() { } @@ -49,7 +55,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -57,7 +63,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return this */ public StartChallengeScRsp clearRetcode() { @@ -67,7 +73,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @return the retcode */ public int getRetcode() { @@ -75,7 +81,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional uint32 retcode = 10; + * optional uint32 retcode = 2; * @param value the retcode to set * @return this */ @@ -86,39 +92,39 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .ChallengeInfo challenge_info = 1; - * @return whether the challengeInfo field is set + * optional .ChallengeExtInfo ext_info = 8; + * @return whether the extInfo field is set */ - public boolean hasChallengeInfo() { + public boolean hasExtInfo() { return (bitField0_ & 0x00000002) != 0; } /** - * optional .ChallengeInfo challenge_info = 1; + * optional .ChallengeExtInfo ext_info = 8; * @return this */ - public StartChallengeScRsp clearChallengeInfo() { + public StartChallengeScRsp clearExtInfo() { bitField0_ &= ~0x00000002; - challengeInfo.clear(); + extInfo.clear(); return this; } /** - * optional .ChallengeInfo challenge_info = 1; + * 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 #getMutableChallengeInfo()} if you want to modify it. + * Use {@link #getMutableExtInfo()} if you want to modify it. * * @return internal storage object for reading */ - public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { - return challengeInfo; + public ChallengeExtInfoOuterClass.ChallengeExtInfo getExtInfo() { + return extInfo; } /** - * optional .ChallengeInfo challenge_info = 1; + * 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 @@ -126,24 +132,24 @@ public final class StartChallengeScRspOuterClass { * * @return internal storage object for modifications */ - public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { + public ChallengeExtInfoOuterClass.ChallengeExtInfo getMutableExtInfo() { bitField0_ |= 0x00000002; - return challengeInfo; + return extInfo; } /** - * optional .ChallengeInfo challenge_info = 1; - * @param value the challengeInfo to set + * optional .ChallengeExtInfo ext_info = 8; + * @param value the extInfo to set * @return this */ - public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { + public StartChallengeScRsp setExtInfo(final ChallengeExtInfoOuterClass.ChallengeExtInfo value) { bitField0_ |= 0x00000002; - challengeInfo.copyFrom(value); + extInfo.copyFrom(value); return this; } /** - * optional .SceneInfo scene = 2; + * optional .SceneInfo scene = 10; * @return whether the scene field is set */ public boolean hasScene() { @@ -151,7 +157,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 2; + * optional .SceneInfo scene = 10; * @return this */ public StartChallengeScRsp clearScene() { @@ -161,7 +167,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 2; + * 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. @@ -175,7 +181,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 2; + * 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 @@ -189,7 +195,7 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .SceneInfo scene = 2; + * optional .SceneInfo scene = 10; * @param value the scene to set * @return this */ @@ -200,39 +206,39 @@ public final class StartChallengeScRspOuterClass { } /** - * optional .LineupInfo lineup = 12; - * @return whether the lineup field is set + * optional .ChallengeInfo challenge_info = 11; + * @return whether the challengeInfo field is set */ - public boolean hasLineup() { + public boolean hasChallengeInfo() { return (bitField0_ & 0x00000008) != 0; } /** - * optional .LineupInfo lineup = 12; + * optional .ChallengeInfo challenge_info = 11; * @return this */ - public StartChallengeScRsp clearLineup() { + public StartChallengeScRsp clearChallengeInfo() { bitField0_ &= ~0x00000008; - lineup.clear(); + challengeInfo.clear(); return this; } /** - * optional .LineupInfo lineup = 12; + * optional .ChallengeInfo challenge_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 #getMutableLineup()} if you want to modify it. + * Use {@link #getMutableChallengeInfo()} if you want to modify it. * * @return internal storage object for reading */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; + public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { + return challengeInfo; } /** - * optional .LineupInfo lineup = 12; + * optional .ChallengeInfo challenge_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 @@ -240,19 +246,87 @@ public final class StartChallengeScRspOuterClass { * * @return internal storage object for modifications */ - public LineupInfoOuterClass.LineupInfo getMutableLineup() { + public ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { bitField0_ |= 0x00000008; - return lineup; + return challengeInfo; } /** - * optional .LineupInfo lineup = 12; - * @param value the lineup to set + * optional .ChallengeInfo challenge_info = 11; + * @param value the challengeInfo to set * @return this */ - public StartChallengeScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + public StartChallengeScRsp setChallengeInfo(final ChallengeInfoOuterClass.ChallengeInfo value) { bitField0_ |= 0x00000008; - lineup.copyFrom(value); + challengeInfo.copyFrom(value); + return this; + } + + /** + * repeated .LineupInfo lineup_list = 5; + * @return whether the lineupList field is set + */ + public boolean hasLineupList() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * repeated .LineupInfo lineup_list = 5; + * @return this + */ + public StartChallengeScRsp clearLineupList() { + bitField0_ &= ~0x00000010; + lineupList.clear(); + return this; + } + + /** + * repeated .LineupInfo lineup_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 #getMutableLineupList()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedMessage getLineupList() { + return lineupList; + } + + /** + * repeated .LineupInfo lineup_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 getMutableLineupList() { + bitField0_ |= 0x00000010; + return lineupList; + } + + /** + * repeated .LineupInfo lineup_list = 5; + * @param value the lineupList to add + * @return this + */ + public StartChallengeScRsp addLineupList(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000010; + lineupList.add(value); + return this; + } + + /** + * repeated .LineupInfo lineup_list = 5; + * @param values the lineupList to add + * @return this + */ + public StartChallengeScRsp addAllLineupList(final LineupInfoOuterClass.LineupInfo... values) { + bitField0_ |= 0x00000010; + lineupList.addAll(values); return this; } @@ -262,9 +336,10 @@ public final class StartChallengeScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; retcode = other.retcode; - challengeInfo.copyFrom(other.challengeInfo); + extInfo.copyFrom(other.extInfo); scene.copyFrom(other.scene); - lineup.copyFrom(other.lineup); + challengeInfo.copyFrom(other.challengeInfo); + lineupList.copyFrom(other.lineupList); } return this; } @@ -278,14 +353,17 @@ public final class StartChallengeScRspOuterClass { if (other.hasRetcode()) { setRetcode(other.retcode); } - if (other.hasChallengeInfo()) { - getMutableChallengeInfo().mergeFrom(other.challengeInfo); + if (other.hasExtInfo()) { + getMutableExtInfo().mergeFrom(other.extInfo); } if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); + if (other.hasChallengeInfo()) { + getMutableChallengeInfo().mergeFrom(other.challengeInfo); + } + if (other.hasLineupList()) { + getMutableLineupList().addAll(other.lineupList); } return this; } @@ -298,9 +376,10 @@ public final class StartChallengeScRspOuterClass { cachedSize = -1; bitField0_ = 0; retcode = 0; - challengeInfo.clear(); + extInfo.clear(); scene.clear(); - lineup.clear(); + challengeInfo.clear(); + lineupList.clear(); return this; } @@ -311,9 +390,10 @@ public final class StartChallengeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - challengeInfo.clearQuick(); + extInfo.clearQuick(); scene.clearQuick(); - lineup.clearQuick(); + challengeInfo.clearQuick(); + lineupList.clearQuick(); return this; } @@ -328,28 +408,35 @@ public final class StartChallengeScRspOuterClass { StartChallengeScRsp other = (StartChallengeScRsp) o; return bitField0_ == other.bitField0_ && (!hasRetcode() || retcode == other.retcode) - && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)) + && (!hasExtInfo() || extInfo.equals(other.extInfo)) && (!hasScene() || scene.equals(other.scene)) - && (!hasLineup() || lineup.equals(other.lineup)); + && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)) + && (!hasLineupList() || lineupList.equals(other.lineupList)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 10); - output.writeMessageNoTag(challengeInfo); + output.writeRawByte((byte) 66); + output.writeMessageNoTag(extInfo); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 82); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 98); - output.writeMessageNoTag(lineup); + output.writeRawByte((byte) 90); + output.writeMessageNoTag(challengeInfo); + } + if ((bitField0_ & 0x00000010) != 0) { + for (int i = 0; i < lineupList.length(); i++) { + output.writeRawByte((byte) 42); + output.writeMessageNoTag(lineupList.get(i)); + } } } @@ -360,13 +447,16 @@ public final class StartChallengeScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(extInfo); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + } + if ((bitField0_ & 0x00000010) != 0) { + size += (1 * lineupList.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(lineupList); } return size; } @@ -378,38 +468,46 @@ public final class StartChallengeScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 10) { + if (tag != 66) { break; } } - case 10: { - // challengeInfo - input.readMessage(challengeInfo); + case 66: { + // extInfo + input.readMessage(extInfo); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 18) { + if (tag != 82) { break; } } - case 18: { + case 82: { // scene input.readMessage(scene); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 98) { + if (tag != 90) { break; } } - case 98: { - // lineup - input.readMessage(lineup); + case 90: { + // challengeInfo + input.readMessage(challengeInfo); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 42) { + break; + } + } + case 42: { + // lineupList + tag = input.readRepeatedMessage(lineupList, tag); + bitField0_ |= 0x00000010; if (tag != 0) { break; } @@ -435,13 +533,16 @@ public final class StartChallengeScRspOuterClass { output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeMessage(FieldNames.challengeInfo, challengeInfo); + output.writeMessage(FieldNames.extInfo, extInfo); } if ((bitField0_ & 0x00000004) != 0) { output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.challengeInfo, challengeInfo); + } + if ((bitField0_ & 0x00000010) != 0) { + output.writeRepeatedMessage(FieldNames.lineupList, lineupList); } output.endObject(); } @@ -464,11 +565,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_ |= 0x00000002; } } else { @@ -487,10 +588,11 @@ public final class StartChallengeScRspOuterClass { } break; } - case -1102671473: { - if (input.isAtField(FieldNames.lineup)) { + case -812487759: + case 602859274: { + if (input.isAtField(FieldNames.challengeInfo)) { if (!input.trySkipNullValue()) { - input.readMessage(lineup); + input.readMessage(challengeInfo); bitField0_ |= 0x00000008; } } else { @@ -498,6 +600,18 @@ public final class StartChallengeScRspOuterClass { } break; } + case 781801165: + case -1516340914: { + if (input.isAtField(FieldNames.lineupList)) { + if (!input.trySkipNullValue()) { + input.readRepeatedMessage(lineupList); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } default: { input.skipUnknownField(); break; @@ -553,11 +667,13 @@ public final class StartChallengeScRspOuterClass { static class FieldNames { static final FieldName retcode = FieldName.forField("retcode"); - static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); + static final FieldName extInfo = FieldName.forField("extInfo", "ext_info"); static final FieldName scene = FieldName.forField("scene"); - static final FieldName lineup = FieldName.forField("lineup"); + static final FieldName challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); + + static final FieldName lineupList = FieldName.forField("lineupList", "lineup_list"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java index 5b52c44..30ae8ac 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryBuffInfoOuterClass.java @@ -23,18 +23,18 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_two = 8; + * optional uint32 story_buff_one = 7; */ - private int storyBuffTwo; + private int storyBuffOne; /** * 
      *  ?
      *
* - * optional uint32 story_buff_one = 9; + * optional uint32 story_buff_two = 10; */ - private int storyBuffOne; + private int storyBuffTwo; private StartChallengeStoryBuffInfo() { } @@ -51,10 +51,10 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_two = 8; - * @return whether the storyBuffTwo field is set + * optional uint32 story_buff_one = 7; + * @return whether the storyBuffOne field is set */ - public boolean hasStoryBuffTwo() { + public boolean hasStoryBuffOne() { return (bitField0_ & 0x00000001) != 0; } @@ -63,64 +63,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_two = 8; - * @return this - */ - public StartChallengeStoryBuffInfo clearStoryBuffTwo() { - bitField0_ &= ~0x00000001; - storyBuffTwo = 0; - return this; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_two = 8; - * @return the storyBuffTwo - */ - public int getStoryBuffTwo() { - return storyBuffTwo; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_two = 8; - * @param value the storyBuffTwo to set - * @return this - */ - public StartChallengeStoryBuffInfo setStoryBuffTwo(final int value) { - bitField0_ |= 0x00000001; - storyBuffTwo = value; - return this; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_one = 9; - * @return whether the storyBuffOne field is set - */ - public boolean hasStoryBuffOne() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * 
-     *  ?
-     *
- * - * optional uint32 story_buff_one = 9; + * optional uint32 story_buff_one = 7; * @return this */ public StartChallengeStoryBuffInfo clearStoryBuffOne() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; storyBuffOne = 0; return this; } @@ -130,7 +77,7 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_one = 9; + * optional uint32 story_buff_one = 7; * @return the storyBuffOne */ public int getStoryBuffOne() { @@ -142,23 +89,76 @@ public final class StartChallengeStoryBuffInfoOuterClass { * ? * * - * optional uint32 story_buff_one = 9; + * optional uint32 story_buff_one = 7; * @param value the storyBuffOne to set * @return this */ public StartChallengeStoryBuffInfo setStoryBuffOne(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; storyBuffOne = value; return this; } + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_two = 10; + * @return whether the storyBuffTwo field is set + */ + public boolean hasStoryBuffTwo() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_two = 10; + * @return this + */ + public StartChallengeStoryBuffInfo clearStoryBuffTwo() { + bitField0_ &= ~0x00000002; + storyBuffTwo = 0; + return this; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_two = 10; + * @return the storyBuffTwo + */ + public int getStoryBuffTwo() { + return storyBuffTwo; + } + + /** + * 
+     *  ?
+     *
+ * + * optional uint32 story_buff_two = 10; + * @param value the storyBuffTwo to set + * @return this + */ + public StartChallengeStoryBuffInfo setStoryBuffTwo(final int value) { + bitField0_ |= 0x00000002; + storyBuffTwo = value; + return this; + } + @Override public StartChallengeStoryBuffInfo copyFrom(final StartChallengeStoryBuffInfo other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - storyBuffTwo = other.storyBuffTwo; storyBuffOne = other.storyBuffOne; + storyBuffTwo = other.storyBuffTwo; } return this; } @@ -169,12 +169,12 @@ public final class StartChallengeStoryBuffInfoOuterClass { return this; } cachedSize = -1; - if (other.hasStoryBuffTwo()) { - setStoryBuffTwo(other.storyBuffTwo); - } if (other.hasStoryBuffOne()) { setStoryBuffOne(other.storyBuffOne); } + if (other.hasStoryBuffTwo()) { + setStoryBuffTwo(other.storyBuffTwo); + } return this; } @@ -185,8 +185,8 @@ public final class StartChallengeStoryBuffInfoOuterClass { } cachedSize = -1; bitField0_ = 0; - storyBuffTwo = 0; storyBuffOne = 0; + storyBuffTwo = 0; return this; } @@ -210,19 +210,19 @@ public final class StartChallengeStoryBuffInfoOuterClass { } StartChallengeStoryBuffInfo other = (StartChallengeStoryBuffInfo) o; return bitField0_ == other.bitField0_ - && (!hasStoryBuffTwo() || storyBuffTwo == other.storyBuffTwo) - && (!hasStoryBuffOne() || storyBuffOne == other.storyBuffOne); + && (!hasStoryBuffOne() || storyBuffOne == other.storyBuffOne) + && (!hasStoryBuffTwo() || storyBuffTwo == other.storyBuffTwo); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(storyBuffTwo); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(storyBuffOne); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(storyBuffOne); + output.writeRawByte((byte) 80); + output.writeUInt32NoTag(storyBuffTwo); } } @@ -230,10 +230,10 @@ public final class StartChallengeStoryBuffInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffTwo); + size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffOne); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffOne); + size += 1 + ProtoSink.computeUInt32SizeNoTag(storyBuffTwo); } return size; } @@ -245,18 +245,18 @@ public final class StartChallengeStoryBuffInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // storyBuffTwo - storyBuffTwo = input.readUInt32(); + case 56: { + // storyBuffOne + storyBuffOne = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 80) { break; } } - case 72: { - // storyBuffOne - storyBuffOne = input.readUInt32(); + case 80: { + // storyBuffTwo + storyBuffTwo = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -281,10 +281,10 @@ public final class StartChallengeStoryBuffInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.storyBuffTwo, storyBuffTwo); + output.writeUInt32(FieldNames.storyBuffOne, storyBuffOne); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.storyBuffOne, storyBuffOne); + output.writeUInt32(FieldNames.storyBuffTwo, storyBuffTwo); } output.endObject(); } @@ -296,11 +296,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 1761429060: - case 1329552490: { - if (input.isAtField(FieldNames.storyBuffTwo)) { + case 1761423966: + case 1329547396: { + if (input.isAtField(FieldNames.storyBuffOne)) { if (!input.trySkipNullValue()) { - storyBuffTwo = input.readUInt32(); + storyBuffOne = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -308,11 +308,11 @@ public final class StartChallengeStoryBuffInfoOuterClass { } break; } - case 1761423966: - case 1329547396: { - if (input.isAtField(FieldNames.storyBuffOne)) { + case 1761429060: + case 1329552490: { + if (input.isAtField(FieldNames.storyBuffTwo)) { if (!input.trySkipNullValue()) { - storyBuffOne = input.readUInt32(); + storyBuffTwo = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -374,9 +374,9 @@ public final class StartChallengeStoryBuffInfoOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName storyBuffTwo = FieldName.forField("storyBuffTwo", "story_buff_two"); - static final FieldName storyBuffOne = FieldName.forField("storyBuffOne", "story_buff_one"); + + static final FieldName storyBuffTwo = FieldName.forField("storyBuffTwo", "story_buff_two"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java index 3557b3b..57cfbe4 100644 --- a/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartChallengeStoryInfoOuterClass.java @@ -19,7 +19,12 @@ public final class StartChallengeStoryInfoOuterClass { private static final long serialVersionUID = 0L; /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 14; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + */ + private final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo newStoryBuffInfo = StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo.newInstance(); + + /** + * optional .StartChallengeStoryBuffInfo story_buff_info = 15; */ private final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo storyBuffInfo = StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo.newInstance(); @@ -34,36 +39,111 @@ public final class StartChallengeStoryInfoOuterClass { } public boolean hasBuffInfo() { - return (((bitField0_ & 0x00000001)) != 0); + 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 .StartChallengeStoryBuffInfo story_buff_info = 14; - * @return whether the storyBuffInfo field is set + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * @return whether the newStoryBuffInfo field is set */ - public boolean hasStoryBuffInfo() { + public boolean hasNewStoryBuffInfo() { return (bitField0_ & 0x00000001) != 0; } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 14; + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * @return this + */ + public StartChallengeStoryInfo clearNewStoryBuffInfo() { + bitField0_ &= ~0x00000001; + newStoryBuffInfo.clear(); + return this; + } + + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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 #getMutableNewStoryBuffInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo getNewStoryBuffInfo( + ) { + return newStoryBuffInfo; + } + + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_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 StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo getMutableNewStoryBuffInfo( + ) { + clearBuffInfoOtherNewStoryBuffInfo(); + bitField0_ |= 0x00000001; + return newStoryBuffInfo; + } + + /** + * optional .StartNewChallengeStoryBuffInfo new_story_buff_info = 14; + * @param value the newStoryBuffInfo to set + * @return this + */ + public StartChallengeStoryInfo setNewStoryBuffInfo( + final StartNewChallengeStoryBuffInfoOuterClass.StartNewChallengeStoryBuffInfo value) { + clearBuffInfoOtherNewStoryBuffInfo(); + bitField0_ |= 0x00000001; + 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_ &= ~0x00000001; + bitField0_ &= ~0x00000002; storyBuffInfo.clear(); return this; } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 14; + * 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. @@ -77,7 +157,7 @@ public final class StartChallengeStoryInfoOuterClass { } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 14; + * 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 @@ -87,18 +167,20 @@ public final class StartChallengeStoryInfoOuterClass { */ public StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo getMutableStoryBuffInfo( ) { - bitField0_ |= 0x00000001; + clearBuffInfoOtherStoryBuffInfo(); + bitField0_ |= 0x00000002; return storyBuffInfo; } /** - * optional .StartChallengeStoryBuffInfo story_buff_info = 14; + * optional .StartChallengeStoryBuffInfo story_buff_info = 15; * @param value the storyBuffInfo to set * @return this */ public StartChallengeStoryInfo setStoryBuffInfo( final StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo value) { - bitField0_ |= 0x00000001; + clearBuffInfoOtherStoryBuffInfo(); + bitField0_ |= 0x00000002; storyBuffInfo.copyFrom(value); return this; } @@ -108,6 +190,7 @@ public final class StartChallengeStoryInfoOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + newStoryBuffInfo.copyFrom(other.newStoryBuffInfo); storyBuffInfo.copyFrom(other.storyBuffInfo); } return this; @@ -119,6 +202,9 @@ public final class StartChallengeStoryInfoOuterClass { return this; } cachedSize = -1; + if (other.hasNewStoryBuffInfo()) { + getMutableNewStoryBuffInfo().mergeFrom(other.newStoryBuffInfo); + } if (other.hasStoryBuffInfo()) { getMutableStoryBuffInfo().mergeFrom(other.storyBuffInfo); } @@ -132,6 +218,7 @@ public final class StartChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + newStoryBuffInfo.clear(); storyBuffInfo.clear(); return this; } @@ -143,6 +230,7 @@ public final class StartChallengeStoryInfoOuterClass { } cachedSize = -1; bitField0_ = 0; + newStoryBuffInfo.clearQuick(); storyBuffInfo.clearQuick(); return this; } @@ -157,6 +245,7 @@ public final class StartChallengeStoryInfoOuterClass { } StartChallengeStoryInfo other = (StartChallengeStoryInfo) o; return bitField0_ == other.bitField0_ + && (!hasNewStoryBuffInfo() || newStoryBuffInfo.equals(other.newStoryBuffInfo)) && (!hasStoryBuffInfo() || storyBuffInfo.equals(other.storyBuffInfo)); } @@ -164,6 +253,10 @@ public final class StartChallengeStoryInfoOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 114); + output.writeMessageNoTag(newStoryBuffInfo); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 122); output.writeMessageNoTag(storyBuffInfo); } } @@ -172,6 +265,9 @@ public final class StartChallengeStoryInfoOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(newStoryBuffInfo); + } + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(storyBuffInfo); } return size; @@ -185,10 +281,21 @@ public final class StartChallengeStoryInfoOuterClass { while (true) { switch (tag) { case 114: { - // storyBuffInfo - input.readMessage(storyBuffInfo); + // newStoryBuffInfo + clearBuffInfoOtherNewStoryBuffInfo(); + input.readMessage(newStoryBuffInfo); bitField0_ |= 0x00000001; tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // storyBuffInfo + clearBuffInfoOtherStoryBuffInfo(); + input.readMessage(storyBuffInfo); + bitField0_ |= 0x00000002; + tag = input.readTag(); if (tag != 0) { break; } @@ -211,6 +318,9 @@ public final class StartChallengeStoryInfoOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { + output.writeMessage(FieldNames.newStoryBuffInfo, newStoryBuffInfo); + } + if ((bitField0_ & 0x00000002) != 0) { output.writeMessage(FieldNames.storyBuffInfo, storyBuffInfo); } output.endObject(); @@ -223,12 +333,26 @@ public final class StartChallengeStoryInfoOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case 1151109622: + case -1182609999: { + if (input.isAtField(FieldNames.newStoryBuffInfo)) { + if (!input.trySkipNullValue()) { + clearBuffInfoOtherNewStoryBuffInfo(); + input.readMessage(newStoryBuffInfo); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case -1230610506: case -1733882288: { if (input.isAtField(FieldNames.storyBuffInfo)) { if (!input.trySkipNullValue()) { + clearBuffInfoOtherStoryBuffInfo(); input.readMessage(storyBuffInfo); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -288,6 +412,8 @@ 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"); } } diff --git a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java index 7aeded4..d3f06ad 100644 --- a/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartCocoonStageCsReqOuterClass.java @@ -18,25 +18,25 @@ public final class StartCocoonStageCsReqOuterClass { public static final class StartCocoonStageCsReq extends ProtoMessage implements Cloneable { private static final long serialVersionUID = 0L; - /** - * optional uint32 world_level = 1; - */ - private int worldLevel; - /** * optional uint32 wave = 2; */ private int wave; /** - * optional uint32 cocoon_id = 3; + * optional uint32 prop_entity_id = 7; + */ + private int propEntityId; + + /** + * optional uint32 cocoon_id = 9; */ private int cocoonId; /** - * optional uint32 prop_entity_id = 9; + * optional uint32 world_level = 15; */ - private int propEntityId; + private int worldLevel; private StartCocoonStageCsReq() { } @@ -48,49 +48,12 @@ public final class StartCocoonStageCsReqOuterClass { return new StartCocoonStageCsReq(); } - /** - * optional uint32 world_level = 1; - * @return whether the worldLevel field is set - */ - public boolean hasWorldLevel() { - return (bitField0_ & 0x00000001) != 0; - } - - /** - * optional uint32 world_level = 1; - * @return this - */ - public StartCocoonStageCsReq 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 StartCocoonStageCsReq setWorldLevel(final int value) { - bitField0_ |= 0x00000001; - worldLevel = value; - return this; - } - /** * optional uint32 wave = 2; * @return whether the wave field is set */ public boolean hasWave() { - return (bitField0_ & 0x00000002) != 0; + return (bitField0_ & 0x00000001) != 0; } /** @@ -98,7 +61,7 @@ public final class StartCocoonStageCsReqOuterClass { * @return this */ public StartCocoonStageCsReq clearWave() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; wave = 0; return this; } @@ -117,13 +80,50 @@ public final class StartCocoonStageCsReqOuterClass { * @return this */ public StartCocoonStageCsReq setWave(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; wave = value; return this; } /** - * optional uint32 cocoon_id = 3; + * 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() { @@ -131,7 +131,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 3; + * optional uint32 cocoon_id = 9; * @return this */ public StartCocoonStageCsReq clearCocoonId() { @@ -141,7 +141,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 3; + * optional uint32 cocoon_id = 9; * @return the cocoonId */ public int getCocoonId() { @@ -149,7 +149,7 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 cocoon_id = 3; + * optional uint32 cocoon_id = 9; * @param value the cocoonId to set * @return this */ @@ -160,39 +160,39 @@ public final class StartCocoonStageCsReqOuterClass { } /** - * optional uint32 prop_entity_id = 9; - * @return whether the propEntityId field is set + * optional uint32 world_level = 15; + * @return whether the worldLevel field is set */ - public boolean hasPropEntityId() { + public boolean hasWorldLevel() { return (bitField0_ & 0x00000008) != 0; } /** - * optional uint32 prop_entity_id = 9; + * optional uint32 world_level = 15; * @return this */ - public StartCocoonStageCsReq clearPropEntityId() { + public StartCocoonStageCsReq clearWorldLevel() { bitField0_ &= ~0x00000008; - propEntityId = 0; + worldLevel = 0; return this; } /** - * optional uint32 prop_entity_id = 9; - * @return the propEntityId + * optional uint32 world_level = 15; + * @return the worldLevel */ - public int getPropEntityId() { - return propEntityId; + public int getWorldLevel() { + return worldLevel; } /** - * optional uint32 prop_entity_id = 9; - * @param value the propEntityId to set + * optional uint32 world_level = 15; + * @param value the worldLevel to set * @return this */ - public StartCocoonStageCsReq setPropEntityId(final int value) { + public StartCocoonStageCsReq setWorldLevel(final int value) { bitField0_ |= 0x00000008; - propEntityId = value; + worldLevel = value; return this; } @@ -201,10 +201,10 @@ public final class StartCocoonStageCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - worldLevel = other.worldLevel; wave = other.wave; - cocoonId = other.cocoonId; propEntityId = other.propEntityId; + cocoonId = other.cocoonId; + worldLevel = other.worldLevel; } return this; } @@ -215,17 +215,17 @@ public final class StartCocoonStageCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasWorldLevel()) { - setWorldLevel(other.worldLevel); - } if (other.hasWave()) { setWave(other.wave); } + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); + } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); + if (other.hasWorldLevel()) { + setWorldLevel(other.worldLevel); } return this; } @@ -237,10 +237,10 @@ public final class StartCocoonStageCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - worldLevel = 0; wave = 0; - cocoonId = 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) - && (!hasPropEntityId() || propEntityId == other.propEntityId); + && (!hasWorldLevel() || worldLevel == other.worldLevel); } @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) 16); output.writeUInt32NoTag(wave); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(propEntityId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 120); + output.writeUInt32NoTag(worldLevel); } } @@ -294,16 +294,16 @@ public final class StartCocoonStageCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); + size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(worldLevel); } return size; } @@ -315,36 +315,36 @@ public final class StartCocoonStageCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { - // worldLevel - worldLevel = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 16) { - break; - } - } case 16: { // wave wave = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 56) { break; } } - case 24: { - // cocoonId - cocoonId = input.readUInt32(); - bitField0_ |= 0x00000004; + case 56: { + // propEntityId + propEntityId = input.readUInt32(); + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 72) { break; } } case 72: { - // propEntityId - propEntityId = input.readUInt32(); + // cocoonId + cocoonId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 120) { + break; + } + } + case 120: { + // worldLevel + worldLevel = 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.worldLevel, worldLevel); + output.writeUInt32(FieldNames.wave, wave); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.wave, wave); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.cocoonId, cocoonId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.worldLevel, worldLevel); } output.endObject(); } @@ -390,11 +390,10 @@ public final class StartCocoonStageCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 440007442: - case 1305257111: { - if (input.isAtField(FieldNames.worldLevel)) { + case 3642105: { + if (input.isAtField(FieldNames.wave)) { if (!input.trySkipNullValue()) { - worldLevel = input.readUInt32(); + wave = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -402,10 +401,11 @@ public final class StartCocoonStageCsReqOuterClass { } break; } - case 3642105: { - if (input.isAtField(FieldNames.wave)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - wave = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -425,11 +425,11 @@ public final class StartCocoonStageCsReqOuterClass { } break; } - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case 440007442: + case 1305257111: { + if (input.isAtField(FieldNames.worldLevel)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + 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 propEntityId = FieldName.forField("propEntityId", "prop_entity_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 7a19fc3..45dc6d1 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 prop_entity_id = 3; - */ - private int propEntityId; - - /** - * optional uint32 cocoon_id = 11; - */ - private int cocoonId; - - /** - * optional uint32 retcode = 12; + * optional uint32 retcode = 7; */ private int retcode; /** - * optional uint32 wave = 13; + * optional uint32 cocoon_id = 9; + */ + private int cocoonId; + + /** + * optional uint32 prop_entity_id = 12; + */ + private int propEntityId; + + /** + * optional uint32 wave = 15; */ private int wave; /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_info = 3; */ private final SceneBattleInfoOuterClass.SceneBattleInfo battleInfo = SceneBattleInfoOuterClass.SceneBattleInfo.newInstance(); @@ -54,44 +54,44 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 prop_entity_id = 3; - * @return whether the propEntityId field is set + * optional uint32 retcode = 7; + * @return whether the retcode field is set */ - public boolean hasPropEntityId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 prop_entity_id = 3; + * optional uint32 retcode = 7; * @return this */ - public StartCocoonStageScRsp clearPropEntityId() { + public StartCocoonStageScRsp clearRetcode() { bitField0_ &= ~0x00000001; - propEntityId = 0; + retcode = 0; return this; } /** - * optional uint32 prop_entity_id = 3; - * @return the propEntityId + * optional uint32 retcode = 7; + * @return the retcode */ - public int getPropEntityId() { - return propEntityId; + public int getRetcode() { + return retcode; } /** - * optional uint32 prop_entity_id = 3; - * @param value the propEntityId to set + * optional uint32 retcode = 7; + * @param value the retcode to set * @return this */ - public StartCocoonStageScRsp setPropEntityId(final int value) { + public StartCocoonStageScRsp setRetcode(final int value) { bitField0_ |= 0x00000001; - propEntityId = value; + retcode = value; return this; } /** - * optional uint32 cocoon_id = 11; + * optional uint32 cocoon_id = 9; * @return whether the cocoonId field is set */ public boolean hasCocoonId() { @@ -99,7 +99,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 11; + * optional uint32 cocoon_id = 9; * @return this */ public StartCocoonStageScRsp clearCocoonId() { @@ -109,7 +109,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 11; + * optional uint32 cocoon_id = 9; * @return the cocoonId */ public int getCocoonId() { @@ -117,7 +117,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 cocoon_id = 11; + * optional uint32 cocoon_id = 9; * @param value the cocoonId to set * @return this */ @@ -128,44 +128,44 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 retcode = 12; - * @return whether the retcode field is set + * optional uint32 prop_entity_id = 12; + * @return whether the propEntityId field is set */ - public boolean hasRetcode() { + public boolean hasPropEntityId() { return (bitField0_ & 0x00000004) != 0; } /** - * optional uint32 retcode = 12; + * optional uint32 prop_entity_id = 12; * @return this */ - public StartCocoonStageScRsp clearRetcode() { + public StartCocoonStageScRsp clearPropEntityId() { bitField0_ &= ~0x00000004; - retcode = 0; + propEntityId = 0; return this; } /** - * optional uint32 retcode = 12; - * @return the retcode + * optional uint32 prop_entity_id = 12; + * @return the propEntityId */ - public int getRetcode() { - return retcode; + public int getPropEntityId() { + return propEntityId; } /** - * optional uint32 retcode = 12; - * @param value the retcode to set + * optional uint32 prop_entity_id = 12; + * @param value the propEntityId to set * @return this */ - public StartCocoonStageScRsp setRetcode(final int value) { + public StartCocoonStageScRsp setPropEntityId(final int value) { bitField0_ |= 0x00000004; - retcode = value; + propEntityId = value; return this; } /** - * optional uint32 wave = 13; + * optional uint32 wave = 15; * @return whether the wave field is set */ public boolean hasWave() { @@ -173,7 +173,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 wave = 13; + * optional uint32 wave = 15; * @return this */ public StartCocoonStageScRsp clearWave() { @@ -183,7 +183,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 wave = 13; + * optional uint32 wave = 15; * @return the wave */ public int getWave() { @@ -191,7 +191,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional uint32 wave = 13; + * optional uint32 wave = 15; * @param value the wave to set * @return this */ @@ -202,7 +202,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_info = 3; * @return whether the battleInfo field is set */ public boolean hasBattleInfo() { @@ -210,7 +210,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_info = 3; * @return this */ public StartCocoonStageScRsp clearBattleInfo() { @@ -220,7 +220,7 @@ public final class StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_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 StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_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 StartCocoonStageScRspOuterClass { } /** - * optional .SceneBattleInfo battle_info = 14; + * optional .SceneBattleInfo battle_info = 3; * @param value the battleInfo to set * @return this */ @@ -264,9 +264,9 @@ public final class StartCocoonStageScRspOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - propEntityId = other.propEntityId; - cocoonId = other.cocoonId; retcode = other.retcode; + cocoonId = other.cocoonId; + propEntityId = other.propEntityId; wave = other.wave; battleInfo.copyFrom(other.battleInfo); } @@ -279,14 +279,14 @@ public final class StartCocoonStageScRspOuterClass { return this; } cachedSize = -1; - if (other.hasPropEntityId()) { - setPropEntityId(other.propEntityId); + if (other.hasRetcode()) { + setRetcode(other.retcode); } if (other.hasCocoonId()) { setCocoonId(other.cocoonId); } - if (other.hasRetcode()) { - setRetcode(other.retcode); + if (other.hasPropEntityId()) { + setPropEntityId(other.propEntityId); } if (other.hasWave()) { setWave(other.wave); @@ -304,9 +304,9 @@ public final class StartCocoonStageScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - propEntityId = 0; - cocoonId = 0; retcode = 0; + cocoonId = 0; + propEntityId = 0; wave = 0; battleInfo.clear(); return this; @@ -333,9 +333,9 @@ public final class StartCocoonStageScRspOuterClass { } StartCocoonStageScRsp other = (StartCocoonStageScRsp) o; return bitField0_ == other.bitField0_ - && (!hasPropEntityId() || propEntityId == other.propEntityId) - && (!hasCocoonId() || cocoonId == other.cocoonId) && (!hasRetcode() || retcode == other.retcode) + && (!hasCocoonId() || cocoonId == other.cocoonId) + && (!hasPropEntityId() || propEntityId == other.propEntityId) && (!hasWave() || wave == other.wave) && (!hasBattleInfo() || battleInfo.equals(other.battleInfo)); } @@ -343,23 +343,23 @@ public final class StartCocoonStageScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 24); - output.writeUInt32NoTag(propEntityId); + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(cocoonId); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 96); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(wave); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 114); + output.writeRawByte((byte) 26); output.writeMessageNoTag(battleInfo); } } @@ -368,13 +368,13 @@ public final class StartCocoonStageScRspOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(cocoonId); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(propEntityId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(wave); @@ -392,16 +392,16 @@ public final class StartCocoonStageScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { - // propEntityId - propEntityId = input.readUInt32(); + case 56: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // cocoonId cocoonId = input.readUInt32(); bitField0_ |= 0x00000002; @@ -411,24 +411,24 @@ public final class StartCocoonStageScRspOuterClass { } } case 96: { - // retcode - retcode = input.readUInt32(); + // propEntityId + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 104) { + if (tag != 120) { break; } } - case 104: { + case 120: { // wave wave = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 114) { + if (tag != 26) { break; } } - case 114: { + case 26: { // battleInfo input.readMessage(battleInfo); bitField0_ |= 0x00000010; @@ -455,13 +455,13 @@ public final class StartCocoonStageScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.propEntityId, propEntityId); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.cocoonId, cocoonId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.propEntityId, propEntityId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.wave, wave); @@ -479,11 +479,10 @@ public final class StartCocoonStageScRspOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -68717343: - case -57484005: { - if (input.isAtField(FieldNames.propEntityId)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - propEntityId = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -503,10 +502,11 @@ public final class StartCocoonStageScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -68717343: + case -57484005: { + if (input.isAtField(FieldNames.propEntityId)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + propEntityId = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -590,11 +590,11 @@ public final class StartCocoonStageScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); + static final FieldName retcode = FieldName.forField("retcode"); static final FieldName cocoonId = FieldName.forField("cocoonId", "cocoon_id"); - static final FieldName retcode = FieldName.forField("retcode"); + static final FieldName propEntityId = FieldName.forField("propEntityId", "prop_entity_id"); static final FieldName wave = FieldName.forField("wave"); diff --git a/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java new file mode 100644 index 0000000..850bf60 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/StartNewChallengeStoryBuffInfoOuterClass.java @@ -0,0 +1,343 @@ +// 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 StartNewChallengeStoryBuffInfoOuterClass { + /** + * Protobuf type {@code StartNewChallengeStoryBuffInfo} + */ + public static final class StartNewChallengeStoryBuffInfo extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 first_half = 1; + */ + private int firstHalf; + + /** + * optional uint32 second_half = 2; + */ + private int secondHalf; + + private StartNewChallengeStoryBuffInfo() { + } + + /** + * @return a new empty instance of {@code StartNewChallengeStoryBuffInfo} + */ + public static StartNewChallengeStoryBuffInfo newInstance() { + return new StartNewChallengeStoryBuffInfo(); + } + + /** + * optional uint32 first_half = 1; + * @return whether the firstHalf field is set + */ + public boolean hasFirstHalf() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 first_half = 1; + * @return this + */ + public StartNewChallengeStoryBuffInfo clearFirstHalf() { + bitField0_ &= ~0x00000001; + firstHalf = 0; + return this; + } + + /** + * optional uint32 first_half = 1; + * @return the firstHalf + */ + public int getFirstHalf() { + return firstHalf; + } + + /** + * optional uint32 first_half = 1; + * @param value the firstHalf to set + * @return this + */ + public StartNewChallengeStoryBuffInfo setFirstHalf(final int value) { + bitField0_ |= 0x00000001; + firstHalf = value; + return this; + } + + /** + * optional uint32 second_half = 2; + * @return whether the secondHalf field is set + */ + public boolean hasSecondHalf() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 second_half = 2; + * @return this + */ + public StartNewChallengeStoryBuffInfo clearSecondHalf() { + bitField0_ &= ~0x00000002; + secondHalf = 0; + return this; + } + + /** + * optional uint32 second_half = 2; + * @return the secondHalf + */ + public int getSecondHalf() { + return secondHalf; + } + + /** + * optional uint32 second_half = 2; + * @param value the secondHalf to set + * @return this + */ + public StartNewChallengeStoryBuffInfo setSecondHalf(final int value) { + bitField0_ |= 0x00000002; + secondHalf = value; + return this; + } + + @Override + public StartNewChallengeStoryBuffInfo copyFrom(final StartNewChallengeStoryBuffInfo other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + firstHalf = other.firstHalf; + secondHalf = other.secondHalf; + } + return this; + } + + @Override + public StartNewChallengeStoryBuffInfo mergeFrom(final StartNewChallengeStoryBuffInfo other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasFirstHalf()) { + setFirstHalf(other.firstHalf); + } + if (other.hasSecondHalf()) { + setSecondHalf(other.secondHalf); + } + return this; + } + + @Override + public StartNewChallengeStoryBuffInfo clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + firstHalf = 0; + secondHalf = 0; + return this; + } + + @Override + public StartNewChallengeStoryBuffInfo 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 StartNewChallengeStoryBuffInfo)) { + return false; + } + StartNewChallengeStoryBuffInfo other = (StartNewChallengeStoryBuffInfo) o; + return bitField0_ == other.bitField0_ + && (!hasFirstHalf() || firstHalf == other.firstHalf) + && (!hasSecondHalf() || secondHalf == other.secondHalf); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(firstHalf); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(secondHalf); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(firstHalf); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(secondHalf); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public StartNewChallengeStoryBuffInfo mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // firstHalf + firstHalf = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 16) { + break; + } + } + case 16: { + // secondHalf + secondHalf = 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.firstHalf, firstHalf); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.secondHalf, secondHalf); + } + output.endObject(); + } + + @Override + public StartNewChallengeStoryBuffInfo mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 132656899: + case -161164190: { + if (input.isAtField(FieldNames.firstHalf)) { + if (!input.trySkipNullValue()) { + firstHalf = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 423501511: + case 265084190: { + if (input.isAtField(FieldNames.secondHalf)) { + if (!input.trySkipNullValue()) { + secondHalf = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public StartNewChallengeStoryBuffInfo clone() { + return new StartNewChallengeStoryBuffInfo().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static StartNewChallengeStoryBuffInfo parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new StartNewChallengeStoryBuffInfo(), data).checkInitialized(); + } + + public static StartNewChallengeStoryBuffInfo parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new StartNewChallengeStoryBuffInfo(), input).checkInitialized(); + } + + public static StartNewChallengeStoryBuffInfo parseFrom(final JsonSource input) throws + IOException { + return ProtoMessage.mergeFrom(new StartNewChallengeStoryBuffInfo(), input).checkInitialized(); + } + + /** + * @return factory for creating StartNewChallengeStoryBuffInfo messages + */ + public static MessageFactory getFactory() { + return StartNewChallengeStoryBuffInfoFactory.INSTANCE; + } + + private enum StartNewChallengeStoryBuffInfoFactory implements MessageFactory { + INSTANCE; + + @Override + public StartNewChallengeStoryBuffInfo create() { + return StartNewChallengeStoryBuffInfo.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName firstHalf = FieldName.forField("firstHalf", "first_half"); + + static final FieldName secondHalf = FieldName.forField("secondHalf", "second_half"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java new file mode 100644 index 0000000..8a60403 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeCsReqOuterClass.java @@ -0,0 +1,422 @@ +// 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 StartPartialChallengeCsReqOuterClass { + /** + * Protobuf type {@code StartPartialChallengeCsReq} + */ + public static final class StartPartialChallengeCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 challenge_id = 6; + */ + private int challengeId; + + /** + * optional uint32 buff_id = 15; + */ + private int buffId; + + /** + * optional bool is_first_half = 12; + */ + private boolean isFirstHalf; + + private StartPartialChallengeCsReq() { + } + + /** + * @return a new empty instance of {@code StartPartialChallengeCsReq} + */ + public static StartPartialChallengeCsReq newInstance() { + return new StartPartialChallengeCsReq(); + } + + /** + * optional uint32 challenge_id = 6; + * @return whether the challengeId field is set + */ + public boolean hasChallengeId() { + 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; + * @return this + */ + public StartPartialChallengeCsReq clearBuffId() { + bitField0_ &= ~0x00000002; + buffId = 0; + return this; + } + + /** + * optional uint32 buff_id = 15; + * @return the buffId + */ + public int getBuffId() { + return buffId; + } + + /** + * optional uint32 buff_id = 15; + * @param value the buffId to set + * @return this + */ + public StartPartialChallengeCsReq setBuffId(final int value) { + bitField0_ |= 0x00000002; + buffId = value; + return this; + } + + /** + * optional bool is_first_half = 12; + * @return whether the isFirstHalf field is set + */ + public boolean hasIsFirstHalf() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bool is_first_half = 12; + * @return this + */ + public StartPartialChallengeCsReq clearIsFirstHalf() { + bitField0_ &= ~0x00000004; + isFirstHalf = false; + return this; + } + + /** + * optional bool is_first_half = 12; + * @return the isFirstHalf + */ + public boolean getIsFirstHalf() { + return isFirstHalf; + } + + /** + * optional bool is_first_half = 12; + * @param value the isFirstHalf to set + * @return this + */ + public StartPartialChallengeCsReq setIsFirstHalf(final boolean value) { + bitField0_ |= 0x00000004; + isFirstHalf = value; + return this; + } + + @Override + public StartPartialChallengeCsReq copyFrom(final StartPartialChallengeCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + challengeId = other.challengeId; + buffId = other.buffId; + isFirstHalf = other.isFirstHalf; + } + return this; + } + + @Override + public StartPartialChallengeCsReq mergeFrom(final StartPartialChallengeCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasChallengeId()) { + setChallengeId(other.challengeId); + } + if (other.hasBuffId()) { + setBuffId(other.buffId); + } + if (other.hasIsFirstHalf()) { + setIsFirstHalf(other.isFirstHalf); + } + return this; + } + + @Override + public StartPartialChallengeCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + challengeId = 0; + buffId = 0; + isFirstHalf = false; + return this; + } + + @Override + public StartPartialChallengeCsReq 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 StartPartialChallengeCsReq)) { + return false; + } + StartPartialChallengeCsReq other = (StartPartialChallengeCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasChallengeId() || challengeId == other.challengeId) + && (!hasBuffId() || buffId == other.buffId) + && (!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.writeUInt32NoTag(buffId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 96); + output.writeBoolNoTag(isFirstHalf); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(challengeId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(buffId); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 2; + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public StartPartialChallengeCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + 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: { + // buffId + buffId = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 96) { + break; + } + } + case 96: { + // isFirstHalf + isFirstHalf = input.readBool(); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.challengeId, challengeId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.buffId, buffId); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeBool(FieldNames.isFirstHalf, isFirstHalf); + } + output.endObject(); + } + + @Override + public StartPartialChallengeCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -689112866: + case 112359031: { + if (input.isAtField(FieldNames.challengeId)) { + if (!input.trySkipNullValue()) { + challengeId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1378119474: + case 227990663: { + if (input.isAtField(FieldNames.buffId)) { + if (!input.trySkipNullValue()) { + buffId = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 1311076601: + case 2144214679: { + if (input.isAtField(FieldNames.isFirstHalf)) { + if (!input.trySkipNullValue()) { + isFirstHalf = input.readBool(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public StartPartialChallengeCsReq clone() { + return new StartPartialChallengeCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static StartPartialChallengeCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new StartPartialChallengeCsReq(), data).checkInitialized(); + } + + public static StartPartialChallengeCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new StartPartialChallengeCsReq(), input).checkInitialized(); + } + + public static StartPartialChallengeCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new StartPartialChallengeCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating StartPartialChallengeCsReq messages + */ + public static MessageFactory getFactory() { + return StartPartialChallengeCsReqFactory.INSTANCE; + } + + private enum StartPartialChallengeCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public StartPartialChallengeCsReq create() { + return StartPartialChallengeCsReq.newInstance(); + } + } + + /** + * 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 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 new file mode 100644 index 0000000..a953ca7 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/StartPartialChallengeScRspOuterClass.java @@ -0,0 +1,564 @@ +// 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 StartPartialChallengeScRspOuterClass { + /** + * Protobuf type {@code StartPartialChallengeScRsp} + */ + public static final class StartPartialChallengeScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 4; + */ + private int retcode; + + /** + * optional .SceneInfo scene = 7; + */ + private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); + + /** + * optional .LineupInfo lineup = 9; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + + /** + * optional .ChallengeInfo challenge_info = 12; + */ + private final ChallengeInfoOuterClass.ChallengeInfo challengeInfo = ChallengeInfoOuterClass.ChallengeInfo.newInstance(); + + private StartPartialChallengeScRsp() { + } + + /** + * @return a new empty instance of {@code StartPartialChallengeScRsp} + */ + public static StartPartialChallengeScRsp newInstance() { + return new StartPartialChallengeScRsp(); + } + + /** + * optional uint32 retcode = 4; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 4; + * @return this + */ + public StartPartialChallengeScRsp 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 StartPartialChallengeScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .SceneInfo scene = 7; + * @return whether the scene field is set + */ + public boolean hasScene() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .SceneInfo scene = 7; + * @return this + */ + public StartPartialChallengeScRsp clearScene() { + bitField0_ &= ~0x00000002; + scene.clear(); + return this; + } + + /** + * optional .SceneInfo scene = 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 #getMutableScene()} if you want to modify it. + * + * @return internal storage object for reading + */ + public SceneInfoOuterClass.SceneInfo getScene() { + return scene; + } + + /** + * optional .SceneInfo scene = 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 SceneInfoOuterClass.SceneInfo getMutableScene() { + bitField0_ |= 0x00000002; + return scene; + } + + /** + * optional .SceneInfo scene = 7; + * @param value the scene to set + * @return this + */ + public StartPartialChallengeScRsp setScene(final SceneInfoOuterClass.SceneInfo value) { + bitField0_ |= 0x00000002; + scene.copyFrom(value); + return this; + } + + /** + * optional .LineupInfo lineup = 9; + * @return whether the lineup field is set + */ + public boolean hasLineup() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .LineupInfo lineup = 9; + * @return this + */ + public StartPartialChallengeScRsp clearLineup() { + bitField0_ &= ~0x00000004; + lineup.clear(); + return this; + } + + /** + * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. + * + * @return internal storage object for reading + */ + public LineupInfoOuterClass.LineupInfo getLineup() { + return lineup; + } + + /** + * optional .LineupInfo lineup = 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 LineupInfoOuterClass.LineupInfo getMutableLineup() { + bitField0_ |= 0x00000004; + return lineup; + } + + /** + * optional .LineupInfo lineup = 9; + * @param value the lineup to set + * @return this + */ + public StartPartialChallengeScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000004; + lineup.copyFrom(value); + return this; + } + + /** + * optional .ChallengeInfo challenge_info = 12; + * @return whether the challengeInfo field is set + */ + public boolean hasChallengeInfo() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional .ChallengeInfo challenge_info = 12; + * @return this + */ + public StartPartialChallengeScRsp clearChallengeInfo() { + bitField0_ &= ~0x00000008; + challengeInfo.clear(); + return this; + } + + /** + * optional .ChallengeInfo challenge_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 #getMutableChallengeInfo()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ChallengeInfoOuterClass.ChallengeInfo getChallengeInfo() { + return challengeInfo; + } + + /** + * optional .ChallengeInfo challenge_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 ChallengeInfoOuterClass.ChallengeInfo getMutableChallengeInfo() { + bitField0_ |= 0x00000008; + return challengeInfo; + } + + /** + * optional .ChallengeInfo challenge_info = 12; + * @param value the challengeInfo to set + * @return this + */ + public StartPartialChallengeScRsp setChallengeInfo( + final ChallengeInfoOuterClass.ChallengeInfo value) { + bitField0_ |= 0x00000008; + challengeInfo.copyFrom(value); + return this; + } + + @Override + public StartPartialChallengeScRsp copyFrom(final StartPartialChallengeScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + scene.copyFrom(other.scene); + lineup.copyFrom(other.lineup); + challengeInfo.copyFrom(other.challengeInfo); + } + return this; + } + + @Override + public StartPartialChallengeScRsp mergeFrom(final StartPartialChallengeScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasScene()) { + getMutableScene().mergeFrom(other.scene); + } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } + if (other.hasChallengeInfo()) { + getMutableChallengeInfo().mergeFrom(other.challengeInfo); + } + return this; + } + + @Override + public StartPartialChallengeScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + scene.clear(); + lineup.clear(); + challengeInfo.clear(); + return this; + } + + @Override + public StartPartialChallengeScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + scene.clearQuick(); + lineup.clearQuick(); + challengeInfo.clearQuick(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof StartPartialChallengeScRsp)) { + return false; + } + StartPartialChallengeScRsp other = (StartPartialChallengeScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasScene() || scene.equals(other.scene)) + && (!hasLineup() || lineup.equals(other.lineup)) + && (!hasChallengeInfo() || challengeInfo.equals(other.challengeInfo)); + } + + @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) 58); + output.writeMessageNoTag(scene); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 74); + output.writeMessageNoTag(lineup); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 98); + output.writeMessageNoTag(challengeInfo); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + 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) { + size += 1 + ProtoSink.computeMessageSizeNoTag(challengeInfo); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public StartPartialChallengeScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 32: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 58) { + break; + } + } + case 58: { + // scene + input.readMessage(scene); + bitField0_ |= 0x00000002; + 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; + 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.writeMessage(FieldNames.scene, scene); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.lineup, lineup); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.challengeInfo, challengeInfo); + } + output.endObject(); + } + + @Override + public StartPartialChallengeScRsp 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 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; + } + } else { + input.skipUnknownField(); + } + break; + } + case -812487759: + case 602859274: { + if (input.isAtField(FieldNames.challengeInfo)) { + if (!input.trySkipNullValue()) { + input.readMessage(challengeInfo); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public StartPartialChallengeScRsp clone() { + return new StartPartialChallengeScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static StartPartialChallengeScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new StartPartialChallengeScRsp(), data).checkInitialized(); + } + + public static StartPartialChallengeScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new StartPartialChallengeScRsp(), input).checkInitialized(); + } + + public static StartPartialChallengeScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new StartPartialChallengeScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating StartPartialChallengeScRsp messages + */ + public static MessageFactory getFactory() { + return StartPartialChallengeScRspFactory.INSTANCE; + } + + private enum StartPartialChallengeScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public StartPartialChallengeScRsp create() { + return StartPartialChallengeScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + 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 challengeInfo = FieldName.forField("challengeInfo", "challenge_info"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/StartRogueCsReqOuterClass.java index 63a969d..23e90bd 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 = 2; + * optional uint32 buff_aeon_id = 6; */ private int buffAeonId; /** - * optional uint32 area_id = 3; + * optional uint32 area_id = 7; */ private int areaId; /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 13; */ private final RepeatedInt baseAvatarIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 2; + * optional uint32 buff_aeon_id = 6; * @return whether the buffAeonId field is set */ public boolean hasBuffAeonId() { @@ -53,7 +53,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 2; + * optional uint32 buff_aeon_id = 6; * @return this */ public StartRogueCsReq clearBuffAeonId() { @@ -63,7 +63,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 2; + * optional uint32 buff_aeon_id = 6; * @return the buffAeonId */ public int getBuffAeonId() { @@ -71,7 +71,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 buff_aeon_id = 2; + * optional uint32 buff_aeon_id = 6; * @param value the buffAeonId to set * @return this */ @@ -82,7 +82,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 3; + * optional uint32 area_id = 7; * @return whether the areaId field is set */ public boolean hasAreaId() { @@ -90,7 +90,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 3; + * optional uint32 area_id = 7; * @return this */ public StartRogueCsReq clearAreaId() { @@ -100,7 +100,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 3; + * optional uint32 area_id = 7; * @return the areaId */ public int getAreaId() { @@ -108,7 +108,7 @@ public final class StartRogueCsReqOuterClass { } /** - * optional uint32 area_id = 3; + * optional uint32 area_id = 7; * @param value the areaId to set * @return this */ @@ -119,7 +119,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 13; * @return whether the baseAvatarIdList field is set */ public boolean hasBaseAvatarIdList() { @@ -127,7 +127,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 13; * @return this */ public StartRogueCsReq clearBaseAvatarIdList() { @@ -137,7 +137,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_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. @@ -151,7 +151,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_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 @@ -165,7 +165,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 13; * @param value the baseAvatarIdList to add * @return this */ @@ -176,7 +176,7 @@ public final class StartRogueCsReqOuterClass { } /** - * repeated uint32 base_avatar_id_list = 14; + * repeated uint32 base_avatar_id_list = 13; * @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) 16); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(buffAeonId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(areaId); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < baseAvatarIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(baseAvatarIdList.array()[i]); } } @@ -295,25 +295,25 @@ public final class StartRogueCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { + case 48: { // buffAeonId buffAeonId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 56) { break; } } - case 24: { + case 56: { // areaId areaId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 114) { + if (tag != 106) { break; } } - case 114: { + case 106: { // baseAvatarIdList [packed=true] input.readPackedUInt32(baseAvatarIdList, tag); bitField0_ |= 0x00000004; @@ -332,7 +332,7 @@ public final class StartRogueCsReqOuterClass { tag = input.readTag(); break; } - case 112: { + case 104: { // 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 2382252..cdfb303 100644 --- a/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/StartRogueScRspOuterClass.java @@ -19,29 +19,25 @@ public final class StartRogueScRspOuterClass { private static final long serialVersionUID = 0L; /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 2; */ private final SceneInfoOuterClass.SceneInfo scene = SceneInfoOuterClass.SceneInfo.newInstance(); - /** - * optional .LineupInfo lineup = 10; - */ - private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); - /** * optional .RogueInfo rogue_info = 14; */ private final RogueInfoOuterClass.RogueInfo rogueInfo = RogueInfoOuterClass.RogueInfo.newInstance(); + /** + * optional .LineupInfo lineup = 15; + */ + private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); + private StartRogueScRsp() { } @@ -53,11 +49,7 @@ public final class StartRogueScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -65,11 +57,7 @@ public final class StartRogueScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public StartRogueScRsp clearRetcode() { @@ -79,11 +67,7 @@ public final class StartRogueScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -91,11 +75,7 @@ public final class StartRogueScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -106,7 +86,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 2; * @return whether the scene field is set */ public boolean hasScene() { @@ -114,7 +94,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 2; * @return this */ public StartRogueScRsp clearScene() { @@ -124,7 +104,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 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. @@ -138,7 +118,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 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 @@ -152,7 +132,7 @@ public final class StartRogueScRspOuterClass { } /** - * optional .SceneInfo scene = 5; + * optional .SceneInfo scene = 2; * @param value the scene to set * @return this */ @@ -162,69 +142,12 @@ public final class StartRogueScRspOuterClass { return this; } - /** - * optional .LineupInfo lineup = 10; - * @return whether the lineup field is set - */ - public boolean hasLineup() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional .LineupInfo lineup = 10; - * @return this - */ - public StartRogueScRsp clearLineup() { - bitField0_ &= ~0x00000004; - lineup.clear(); - return this; - } - - /** - * optional .LineupInfo lineup = 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 #getMutableLineup()} if you want to modify it. - * - * @return internal storage object for reading - */ - public LineupInfoOuterClass.LineupInfo getLineup() { - return lineup; - } - - /** - * optional .LineupInfo lineup = 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 LineupInfoOuterClass.LineupInfo getMutableLineup() { - bitField0_ |= 0x00000004; - return lineup; - } - - /** - * optional .LineupInfo lineup = 10; - * @param value the lineup to set - * @return this - */ - public StartRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { - bitField0_ |= 0x00000004; - lineup.copyFrom(value); - return this; - } - /** * optional .RogueInfo rogue_info = 14; * @return whether the rogueInfo field is set */ public boolean hasRogueInfo() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000004) != 0; } /** @@ -232,7 +155,7 @@ public final class StartRogueScRspOuterClass { * @return this */ public StartRogueScRsp clearRogueInfo() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000004; rogueInfo.clear(); return this; } @@ -261,7 +184,7 @@ public final class StartRogueScRspOuterClass { * @return internal storage object for modifications */ public RogueInfoOuterClass.RogueInfo getMutableRogueInfo() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return rogueInfo; } @@ -271,11 +194,68 @@ public final class StartRogueScRspOuterClass { * @return this */ public StartRogueScRsp setRogueInfo(final RogueInfoOuterClass.RogueInfo value) { - bitField0_ |= 0x00000008; + 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; + * @return this + */ + public StartRogueScRsp 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 StartRogueScRsp setLineup(final LineupInfoOuterClass.LineupInfo value) { + bitField0_ |= 0x00000008; + lineup.copyFrom(value); + return this; + } + @Override public StartRogueScRsp copyFrom(final StartRogueScRsp other) { cachedSize = other.cachedSize; @@ -283,8 +263,8 @@ public final class StartRogueScRspOuterClass { bitField0_ = other.bitField0_; retcode = other.retcode; scene.copyFrom(other.scene); - lineup.copyFrom(other.lineup); rogueInfo.copyFrom(other.rogueInfo); + lineup.copyFrom(other.lineup); } return this; } @@ -301,12 +281,12 @@ public final class StartRogueScRspOuterClass { if (other.hasScene()) { getMutableScene().mergeFrom(other.scene); } - if (other.hasLineup()) { - getMutableLineup().mergeFrom(other.lineup); - } if (other.hasRogueInfo()) { getMutableRogueInfo().mergeFrom(other.rogueInfo); } + if (other.hasLineup()) { + getMutableLineup().mergeFrom(other.lineup); + } return this; } @@ -319,8 +299,8 @@ public final class StartRogueScRspOuterClass { bitField0_ = 0; retcode = 0; scene.clear(); - lineup.clear(); rogueInfo.clear(); + lineup.clear(); return this; } @@ -332,8 +312,8 @@ public final class StartRogueScRspOuterClass { cachedSize = -1; bitField0_ = 0; scene.clearQuick(); - lineup.clearQuick(); rogueInfo.clearQuick(); + lineup.clearQuick(); return this; } @@ -349,28 +329,28 @@ public final class StartRogueScRspOuterClass { 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)) + && (!hasLineup() || lineup.equals(other.lineup)); } @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) 42); + output.writeRawByte((byte) 18); output.writeMessageNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 82); - output.writeMessageNoTag(lineup); - } - if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 114); output.writeMessageNoTag(rogueInfo); } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 122); + output.writeMessageNoTag(lineup); + } } @Override @@ -383,10 +363,10 @@ public final class StartRogueScRspOuterClass { size += 1 + ProtoSink.computeMessageSizeNoTag(scene); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); + size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); } if ((bitField0_ & 0x00000008) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(rogueInfo); + size += 1 + ProtoSink.computeMessageSizeNoTag(lineup); } return size; } @@ -398,29 +378,20 @@ public final class StartRogueScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // scene input.readMessage(scene); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { - break; - } - } - case 82: { - // lineup - input.readMessage(lineup); - bitField0_ |= 0x00000004; - tag = input.readTag(); if (tag != 114) { break; } @@ -428,6 +399,15 @@ public final class StartRogueScRspOuterClass { case 114: { // rogueInfo input.readMessage(rogueInfo); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 122) { + break; + } + } + case 122: { + // lineup + input.readMessage(lineup); bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { @@ -458,10 +438,10 @@ public final class StartRogueScRspOuterClass { output.writeMessage(FieldNames.scene, scene); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.lineup, lineup); + output.writeMessage(FieldNames.rogueInfo, rogueInfo); } if ((bitField0_ & 0x00000008) != 0) { - output.writeMessage(FieldNames.rogueInfo, rogueInfo); + output.writeMessage(FieldNames.lineup, lineup); } output.endObject(); } @@ -495,10 +475,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_ |= 0x00000004; } } else { @@ -506,11 +487,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_ |= 0x00000008; } } else { @@ -575,9 +555,9 @@ public final class StartRogueScRspOuterClass { 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 lineup = FieldName.forField("lineup"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java index 20825eb..2e6826e 100644 --- a/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwapLineupCsReqOuterClass.java @@ -19,32 +19,32 @@ public final class SwapLineupCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 2; - */ - private int index; - - /** - * optional uint32 plane_id = 4; - */ - private int planeId; - - /** - * optional uint32 src_slot = 5; + * optional uint32 src_slot = 3; */ private int srcSlot; /** - * optional uint32 dst_slot = 15; + * optional uint32 index = 4; + */ + private int index; + + /** + * optional uint32 plane_id = 8; + */ + private int planeId; + + /** + * optional uint32 dst_slot = 9; */ private int dstSlot; /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 12; */ private int extraLineupType; /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 10; */ private boolean isVirtual; @@ -59,99 +59,25 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 index = 2; - * @return whether the index field is set + * optional uint32 src_slot = 3; + * @return whether the srcSlot field is set */ - public boolean hasIndex() { + public boolean hasSrcSlot() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 2; - * @return this - */ - public SwapLineupCsReq clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 2; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 2; - * @param value the index to set - * @return this - */ - public SwapLineupCsReq setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 plane_id = 4; - * @return whether the planeId field is set - */ - public boolean hasPlaneId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 plane_id = 4; - * @return this - */ - public SwapLineupCsReq clearPlaneId() { - bitField0_ &= ~0x00000002; - planeId = 0; - return this; - } - - /** - * optional uint32 plane_id = 4; - * @return the planeId - */ - public int getPlaneId() { - return planeId; - } - - /** - * optional uint32 plane_id = 4; - * @param value the planeId to set - * @return this - */ - public SwapLineupCsReq setPlaneId(final int value) { - bitField0_ |= 0x00000002; - planeId = value; - return this; - } - - /** - * optional uint32 src_slot = 5; - * @return whether the srcSlot field is set - */ - public boolean hasSrcSlot() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 src_slot = 5; + * optional uint32 src_slot = 3; * @return this */ public SwapLineupCsReq clearSrcSlot() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; srcSlot = 0; return this; } /** - * optional uint32 src_slot = 5; + * optional uint32 src_slot = 3; * @return the srcSlot */ public int getSrcSlot() { @@ -159,18 +85,92 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 src_slot = 5; + * optional uint32 src_slot = 3; * @param value the srcSlot to set * @return this */ public SwapLineupCsReq setSrcSlot(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; srcSlot = value; return this; } /** - * optional uint32 dst_slot = 15; + * optional uint32 index = 4; + * @return whether the index field is set + */ + public boolean hasIndex() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 index = 4; + * @return this + */ + public SwapLineupCsReq clearIndex() { + bitField0_ &= ~0x00000002; + 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 SwapLineupCsReq setIndex(final int value) { + bitField0_ |= 0x00000002; + index = value; + return this; + } + + /** + * optional uint32 plane_id = 8; + * @return whether the planeId field is set + */ + public boolean hasPlaneId() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 plane_id = 8; + * @return this + */ + public SwapLineupCsReq clearPlaneId() { + bitField0_ &= ~0x00000004; + planeId = 0; + return this; + } + + /** + * optional uint32 plane_id = 8; + * @return the planeId + */ + public int getPlaneId() { + return planeId; + } + + /** + * optional uint32 plane_id = 8; + * @param value the planeId to set + * @return this + */ + public SwapLineupCsReq setPlaneId(final int value) { + bitField0_ |= 0x00000004; + planeId = value; + return this; + } + + /** + * optional uint32 dst_slot = 9; * @return whether the dstSlot field is set */ public boolean hasDstSlot() { @@ -178,7 +178,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 15; + * optional uint32 dst_slot = 9; * @return this */ public SwapLineupCsReq clearDstSlot() { @@ -188,7 +188,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 15; + * optional uint32 dst_slot = 9; * @return the dstSlot */ public int getDstSlot() { @@ -196,7 +196,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional uint32 dst_slot = 15; + * optional uint32 dst_slot = 9; * @param value the dstSlot to set * @return this */ @@ -207,7 +207,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 12; * @return whether the extraLineupType field is set */ public boolean hasExtraLineupType() { @@ -215,7 +215,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 12; * @return this */ public SwapLineupCsReq clearExtraLineupType() { @@ -225,7 +225,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 12; * @return the extraLineupType */ public ExtraLineupTypeOuterClass.ExtraLineupType getExtraLineupType() { @@ -258,7 +258,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional .ExtraLineupType extra_lineup_type = 7; + * optional .ExtraLineupType extra_lineup_type = 12; * @param value the extraLineupType to set * @return this */ @@ -270,7 +270,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 10; * @return whether the isVirtual field is set */ public boolean hasIsVirtual() { @@ -278,7 +278,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 10; * @return this */ public SwapLineupCsReq clearIsVirtual() { @@ -288,7 +288,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 10; * @return the isVirtual */ public boolean getIsVirtual() { @@ -296,7 +296,7 @@ public final class SwapLineupCsReqOuterClass { } /** - * optional bool is_virtual = 1; + * optional bool is_virtual = 10; * @param value the isVirtual to set * @return this */ @@ -311,9 +311,9 @@ public final class SwapLineupCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; + srcSlot = other.srcSlot; index = other.index; planeId = other.planeId; - srcSlot = other.srcSlot; dstSlot = other.dstSlot; extraLineupType = other.extraLineupType; isVirtual = other.isVirtual; @@ -327,15 +327,15 @@ public final class SwapLineupCsReqOuterClass { return this; } cachedSize = -1; + if (other.hasSrcSlot()) { + setSrcSlot(other.srcSlot); + } if (other.hasIndex()) { setIndex(other.index); } if (other.hasPlaneId()) { setPlaneId(other.planeId); } - if (other.hasSrcSlot()) { - setSrcSlot(other.srcSlot); - } if (other.hasDstSlot()) { setDstSlot(other.dstSlot); } @@ -355,9 +355,9 @@ public final class SwapLineupCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; + srcSlot = 0; index = 0; planeId = 0; - srcSlot = 0; dstSlot = 0; extraLineupType = 0; isVirtual = false; @@ -384,9 +384,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) - && (!hasSrcSlot() || srcSlot == other.srcSlot) && (!hasDstSlot() || dstSlot == other.dstSlot) && (!hasExtraLineupType() || extraLineupType == other.extraLineupType) && (!hasIsVirtual() || isVirtual == other.isVirtual); @@ -395,27 +395,27 @@ public final class SwapLineupCsReqOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(planeId); + output.writeUInt32NoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 40); - output.writeUInt32NoTag(srcSlot); + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 120); + output.writeRawByte((byte) 72); output.writeUInt32NoTag(dstSlot); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 56); + output.writeRawByte((byte) 96); output.writeEnumNoTag(extraLineupType); } if ((bitField0_ & 0x00000020) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 80); output.writeBoolNoTag(isVirtual); } } @@ -424,13 +424,13 @@ public final class SwapLineupCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(index); + size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(index); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(srcSlot); + size += 1 + ProtoSink.computeUInt32SizeNoTag(planeId); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(dstSlot); @@ -451,9 +451,9 @@ public final class SwapLineupCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // index - index = input.readUInt32(); + case 24: { + // srcSlot + srcSlot = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 32) { @@ -461,33 +461,33 @@ public final class SwapLineupCsReqOuterClass { } } case 32: { - // planeId - planeId = input.readUInt32(); + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 40) { + if (tag != 64) { break; } } - case 40: { - // srcSlot - srcSlot = input.readUInt32(); + case 64: { + // planeId + planeId = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 120) { + if (tag != 72) { break; } } - case 120: { + case 72: { // dstSlot dstSlot = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 56) { + if (tag != 96) { break; } } - case 56: { + case 96: { // 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 != 8) { + if (tag != 80) { break; } } - case 8: { + case 80: { // isVirtual isVirtual = input.readBool(); bitField0_ |= 0x00000020; @@ -526,13 +526,13 @@ public final class SwapLineupCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.index, index); + output.writeUInt32(FieldNames.srcSlot, srcSlot); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.planeId, planeId); + output.writeUInt32(FieldNames.index, index); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.srcSlot, srcSlot); + output.writeUInt32(FieldNames.planeId, planeId); } if ((bitField0_ & 0x00000008) != 0) { output.writeUInt32(FieldNames.dstSlot, dstSlot); @@ -553,11 +553,23 @@ public final class SwapLineupCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { + case -1953527294: + case -418516103: { + if (input.isAtField(FieldNames.srcSlot)) { + if (!input.trySkipNullValue()) { + srcSlot = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } case 100346066: { if (input.isAtField(FieldNames.index)) { if (!input.trySkipNullValue()) { index = input.readUInt32(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -569,18 +581,6 @@ public final class SwapLineupCsReqOuterClass { if (input.isAtField(FieldNames.planeId)) { if (!input.trySkipNullValue()) { planeId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1953527294: - case -418516103: { - if (input.isAtField(FieldNames.srcSlot)) { - if (!input.trySkipNullValue()) { - srcSlot = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -682,12 +682,12 @@ public final class SwapLineupCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { + static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); + static final FieldName index = FieldName.forField("index"); static final FieldName planeId = FieldName.forField("planeId", "plane_id"); - static final FieldName srcSlot = FieldName.forField("srcSlot", "src_slot"); - static final FieldName dstSlot = FieldName.forField("dstSlot", "dst_slot"); 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 0c16ced..9e51f88 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 = 10; + * optional uint32 index = 2; */ private int index; @@ -34,7 +34,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 2; * @return whether the index field is set */ public boolean hasIndex() { @@ -42,7 +42,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 2; * @return this */ public SwitchLineupIndexCsReq clearIndex() { @@ -52,7 +52,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 2; * @return the index */ public int getIndex() { @@ -60,7 +60,7 @@ public final class SwitchLineupIndexCsReqOuterClass { } /** - * optional uint32 index = 10; + * optional uint32 index = 2; * @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) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(index); } } @@ -150,7 +150,7 @@ public final class SwitchLineupIndexCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 16: { // 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 80a6d24..0c5560b 100644 --- a/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SwitchLineupIndexScRspOuterClass.java @@ -19,15 +19,15 @@ public final class SwitchLineupIndexScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 index = 10; - */ - private int index; - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; */ private int retcode; + /** + * optional uint32 index = 9; + */ + private int index; + private SwitchLineupIndexScRsp() { } @@ -39,62 +39,25 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 index = 10; - * @return whether the index field is set + * optional uint32 retcode = 4; + * @return whether the retcode field is set */ - public boolean hasIndex() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 index = 10; - * @return this - */ - public SwitchLineupIndexScRsp clearIndex() { - bitField0_ &= ~0x00000001; - index = 0; - return this; - } - - /** - * optional uint32 index = 10; - * @return the index - */ - public int getIndex() { - return index; - } - - /** - * optional uint32 index = 10; - * @param value the index to set - * @return this - */ - public SwitchLineupIndexScRsp setIndex(final int value) { - bitField0_ |= 0x00000001; - index = value; - return this; - } - - /** - * optional uint32 retcode = 14; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @return this */ public SwitchLineupIndexScRsp clearRetcode() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @return the retcode */ public int getRetcode() { @@ -102,23 +65,60 @@ public final class SwitchLineupIndexScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 4; * @param value the retcode to set * @return this */ public SwitchLineupIndexScRsp setRetcode(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; retcode = value; return this; } + /** + * 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 SwitchLineupIndexScRsp 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 SwitchLineupIndexScRsp setIndex(final int value) { + bitField0_ |= 0x00000002; + index = value; + return this; + } + @Override public SwitchLineupIndexScRsp copyFrom(final SwitchLineupIndexScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - index = other.index; retcode = other.retcode; + index = other.index; } return this; } @@ -129,12 +129,12 @@ public final class SwitchLineupIndexScRspOuterClass { return this; } cachedSize = -1; - if (other.hasIndex()) { - setIndex(other.index); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasIndex()) { + setIndex(other.index); + } return this; } @@ -145,8 +145,8 @@ public final class SwitchLineupIndexScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - index = 0; retcode = 0; + index = 0; return this; } @@ -170,19 +170,19 @@ public final class SwitchLineupIndexScRspOuterClass { } SwitchLineupIndexScRsp other = (SwitchLineupIndexScRsp) o; return bitField0_ == other.bitField0_ - && (!hasIndex() || index == other.index) - && (!hasRetcode() || retcode == other.retcode); + && (!hasRetcode() || retcode == other.retcode) + && (!hasIndex() || index == other.index); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); - output.writeUInt32NoTag(index); + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); - output.writeUInt32NoTag(retcode); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(index); } } @@ -190,10 +190,10 @@ public final class SwitchLineupIndexScRspOuterClass { 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); } return size; } @@ -205,18 +205,18 @@ public final class SwitchLineupIndexScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { - // index - index = input.readUInt32(); + case 32: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 72) { break; } } - case 112: { - // retcode - retcode = input.readUInt32(); + case 72: { + // index + index = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class SwitchLineupIndexScRspOuterClass { 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); } output.endObject(); } @@ -256,10 +256,10 @@ public final class SwitchLineupIndexScRspOuterClass { } 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 { @@ -267,10 +267,10 @@ public final class SwitchLineupIndexScRspOuterClass { } 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 { @@ -331,9 +331,9 @@ public final class SwitchLineupIndexScRspOuterClass { * 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"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncApplyFriendScNotifyOuterClass.java index 37f774f..54a8898 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 = 12; + * optional .FriendApplyInfo friend_apply_info = 4; */ private final FriendApplyInfoOuterClass.FriendApplyInfo friendApplyInfo = FriendApplyInfoOuterClass.FriendApplyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * optional .FriendApplyInfo friend_apply_info = 4; * @return whether the friendApplyInfo field is set */ public boolean hasFriendApplyInfo() { @@ -42,7 +42,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * optional .FriendApplyInfo friend_apply_info = 4; * @return this */ public SyncApplyFriendScNotify clearFriendApplyInfo() { @@ -52,7 +52,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * optional .FriendApplyInfo friend_apply_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. @@ -66,7 +66,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * optional .FriendApplyInfo friend_apply_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 @@ -80,7 +80,7 @@ public final class SyncApplyFriendScNotifyOuterClass { } /** - * optional .FriendApplyInfo friend_apply_info = 12; + * optional .FriendApplyInfo friend_apply_info = 4; * @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) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(friendApplyInfo); } } @@ -172,7 +172,7 @@ public final class SyncApplyFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 98: { + case 34: { // 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 dfee481..e915ec7 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 = 11; + * optional uint32 client_res_version = 15; */ private int clientResVersion; @@ -34,7 +34,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 15; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -42,7 +42,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 15; * @return this */ public SyncClientResVersionCsReq clearClientResVersion() { @@ -52,7 +52,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 15; * @return the clientResVersion */ public int getClientResVersion() { @@ -60,7 +60,7 @@ public final class SyncClientResVersionCsReqOuterClass { } /** - * optional uint32 client_res_version = 11; + * optional uint32 client_res_version = 15; * @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) 88); + output.writeRawByte((byte) 120); output.writeUInt32NoTag(clientResVersion); } } @@ -150,7 +150,7 @@ public final class SyncClientResVersionCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 120: { // 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 9555409..cf25d29 100644 --- a/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/SyncClientResVersionScRspOuterClass.java @@ -19,12 +19,12 @@ public final class SyncClientResVersionScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 client_res_version = 6; + * optional uint32 client_res_version = 2; */ private int clientResVersion; /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; */ private int retcode; @@ -39,7 +39,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 6; + * optional uint32 client_res_version = 2; * @return whether the clientResVersion field is set */ public boolean hasClientResVersion() { @@ -47,7 +47,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 6; + * optional uint32 client_res_version = 2; * @return this */ public SyncClientResVersionScRsp clearClientResVersion() { @@ -57,7 +57,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 6; + * optional uint32 client_res_version = 2; * @return the clientResVersion */ public int getClientResVersion() { @@ -65,7 +65,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 client_res_version = 6; + * optional uint32 client_res_version = 2; * @param value the clientResVersion to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -84,7 +84,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return this */ public SyncClientResVersionScRsp clearRetcode() { @@ -94,7 +94,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -102,7 +102,7 @@ public final class SyncClientResVersionScRspOuterClass { } /** - * optional uint32 retcode = 14; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -177,11 +177,11 @@ public final class SyncClientResVersionScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(clientResVersion); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } } @@ -205,16 +205,16 @@ public final class SyncClientResVersionScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 16: { // clientResVersion clientResVersion = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 112) { + if (tag != 40) { break; } } - case 112: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncDeleteFriendScNotifyOuterClass.java index a3b5667..d4ef10a 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 = 10; + * optional uint32 uid = 4; */ private int uid; @@ -34,7 +34,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 4; * @return whether the uid field is set */ public boolean hasUid() { @@ -42,7 +42,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 4; * @return this */ public SyncDeleteFriendScNotify clearUid() { @@ -52,7 +52,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 4; * @return the uid */ public int getUid() { @@ -60,7 +60,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { } /** - * optional uint32 uid = 10; + * optional uint32 uid = 4; * @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) 80); + output.writeRawByte((byte) 32); output.writeUInt32NoTag(uid); } } @@ -150,7 +150,7 @@ public final class SyncDeleteFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 32: { // 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 dc74968..3379681 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 = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; */ private final RepeatedMessage entityBuffInfoList = RepeatedMessage.newEmptyInstance(EntityBuffChangeInfoOuterClass.EntityBuffChangeInfo.getFactory()); @@ -35,7 +35,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; * @return whether the entityBuffInfoList field is set */ public boolean hasEntityBuffInfoList() { @@ -43,7 +43,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; * @return this */ public SyncEntityBuffChangeListScNotify clearEntityBuffInfoList() { @@ -53,7 +53,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_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. @@ -68,7 +68,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_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 @@ -83,7 +83,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; * @param value the entityBuffInfoList to add * @return this */ @@ -95,7 +95,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { } /** - * repeated .EntityBuffChangeInfo entity_buff_info_list = 3; + * repeated .EntityBuffChangeInfo entity_buff_info_list = 8; * @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) 26); + output.writeRawByte((byte) 66); output.writeMessageNoTag(entityBuffInfoList.get(i)); } } @@ -190,7 +190,7 @@ public final class SyncEntityBuffChangeListScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 26: { + case 66: { // 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 076aa29..9d799b7 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 = 4; + * optional uint32 uid = 10; */ private int uid; /** - * optional bool handle_result = 9; + * optional bool handle_result = 6; */ private boolean handleResult; /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 1; */ private final FriendListInfoOuterClass.FriendListInfo handleFriendInfo = FriendListInfoOuterClass.FriendListInfo.newInstance(); @@ -44,7 +44,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 10; * @return whether the uid field is set */ public boolean hasUid() { @@ -52,7 +52,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 10; * @return this */ public SyncHandleFriendScNotify clearUid() { @@ -62,7 +62,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 10; * @return the uid */ public int getUid() { @@ -70,7 +70,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional uint32 uid = 4; + * optional uint32 uid = 10; * @param value the uid to set * @return this */ @@ -81,7 +81,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 6; * @return whether the handleResult field is set */ public boolean hasHandleResult() { @@ -89,7 +89,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 6; * @return this */ public SyncHandleFriendScNotify clearHandleResult() { @@ -99,7 +99,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 6; * @return the handleResult */ public boolean getHandleResult() { @@ -107,7 +107,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional bool handle_result = 9; + * optional bool handle_result = 6; * @param value the handleResult to set * @return this */ @@ -118,7 +118,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 1; * @return whether the handleFriendInfo field is set */ public boolean hasHandleFriendInfo() { @@ -126,7 +126,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 1; * @return this */ public SyncHandleFriendScNotify clearHandleFriendInfo() { @@ -136,7 +136,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_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. @@ -150,7 +150,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_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 @@ -164,7 +164,7 @@ public final class SyncHandleFriendScNotifyOuterClass { } /** - * optional .FriendListInfo handle_friend_info = 3; + * optional .FriendListInfo handle_friend_info = 1; * @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) 32); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(uid); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 48); output.writeBoolNoTag(handleResult); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 26); + output.writeRawByte((byte) 10); output.writeMessageNoTag(handleFriendInfo); } } @@ -282,25 +282,25 @@ public final class SyncHandleFriendScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 80: { // uid uid = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 72) { + if (tag != 48) { break; } } - case 72: { + case 48: { // handleResult handleResult = input.readBool(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 26) { + if (tag != 10) { break; } } - case 26: { + case 10: { // 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 21062b3..da30ba2 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 = 4; + * optional .LineupInfo lineup = 9; */ private final LineupInfoOuterClass.LineupInfo lineup = LineupInfoOuterClass.LineupInfo.newInstance(); /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_list = 4; */ private final RepeatedEnum reasonList = RepeatedEnum.newEmptyInstance(SyncReasonOuterClass.SyncReason.converter()); @@ -40,7 +40,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 9; * @return whether the lineup field is set */ public boolean hasLineup() { @@ -48,7 +48,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 9; * @return this */ public SyncLineupNotify clearLineup() { @@ -58,7 +58,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 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. @@ -72,7 +72,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 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 @@ -86,7 +86,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * optional .LineupInfo lineup = 4; + * optional .LineupInfo lineup = 9; * @param value the lineup to set * @return this */ @@ -97,7 +97,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_list = 4; * @return whether the reasonList field is set */ public boolean hasReasonList() { @@ -105,7 +105,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_list = 4; * @return this */ public SyncLineupNotify clearReasonList() { @@ -115,7 +115,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_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. @@ -129,7 +129,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_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,7 +143,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_list = 4; * @param value the reasonList to add * @return this */ @@ -154,7 +154,7 @@ public final class SyncLineupNotifyOuterClass { } /** - * repeated .SyncReason reason_list = 9; + * repeated .SyncReason reason_list = 4; * @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) 34); + output.writeRawByte((byte) 74); output.writeMessageNoTag(lineup); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < reasonList.length(); i++) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 32); output.writeEnumNoTag(reasonList.array()[i]); } } @@ -261,16 +261,16 @@ public final class SyncLineupNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 74: { // lineup input.readMessage(lineup); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 34) { break; } } - case 74: { + case 34: { // reasonList [packed=true] input.readPackedEnum(reasonList, tag); bitField0_ |= 0x00000002; @@ -289,7 +289,7 @@ public final class SyncLineupNotifyOuterClass { tag = input.readTag(); break; } - case 72: { + case 32: { // 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 7591f3f..073cbcb 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 = 8; + * optional uint32 rogue_version_id = 10; */ private int rogueVersionId; /** - * optional .RogueCommonActionResultDisplayType display_type = 11; + * optional .RogueCommonActionResultDisplayType display_type = 9; */ private int displayType; /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 2; */ private final RepeatedMessage actionResultList = RepeatedMessage.newEmptyInstance(RogueActionResultOuterClass.RogueActionResult.getFactory()); @@ -45,7 +45,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 8; + * optional uint32 rogue_version_id = 10; * @return whether the rogueVersionId field is set */ public boolean hasRogueVersionId() { @@ -53,7 +53,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 8; + * optional uint32 rogue_version_id = 10; * @return this */ public SyncRogueCommonActionResultScNotify clearRogueVersionId() { @@ -63,7 +63,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 8; + * optional uint32 rogue_version_id = 10; * @return the rogueVersionId */ public int getRogueVersionId() { @@ -71,7 +71,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 8; + * optional uint32 rogue_version_id = 10; * @param value the rogueVersionId to set * @return this */ @@ -82,7 +82,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 11; + * optional .RogueCommonActionResultDisplayType display_type = 9; * @return whether the displayType field is set */ public boolean hasDisplayType() { @@ -90,7 +90,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 11; + * optional .RogueCommonActionResultDisplayType display_type = 9; * @return this */ public SyncRogueCommonActionResultScNotify clearDisplayType() { @@ -100,7 +100,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 11; + * optional .RogueCommonActionResultDisplayType display_type = 9; * @return the displayType */ public RogueCommonActionResultDisplayTypeOuterClass.RogueCommonActionResultDisplayType getDisplayType( @@ -134,7 +134,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * optional .RogueCommonActionResultDisplayType display_type = 11; + * optional .RogueCommonActionResultDisplayType display_type = 9; * @param value the displayType to set * @return this */ @@ -146,7 +146,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 2; * @return whether the actionResultList field is set */ public boolean hasActionResultList() { @@ -154,7 +154,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 2; * @return this */ public SyncRogueCommonActionResultScNotify clearActionResultList() { @@ -164,7 +164,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_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. @@ -178,7 +178,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_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 @@ -193,7 +193,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 2; * @param value the actionResultList to add * @return this */ @@ -205,7 +205,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { } /** - * repeated .RogueActionResult action_result_list = 5; + * repeated .RogueActionResult action_result_list = 2; * @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) 64); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 72); output.writeEnumNoTag(displayType); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < actionResultList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 18); output.writeMessageNoTag(actionResultList.get(i)); } } @@ -328,16 +328,16 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { + case 80: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 72) { break; } } - case 88: { + case 72: { // 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 != 42) { + if (tag != 18) { break; } } - case 42: { + case 18: { // 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 b3a24c8..1ba9774 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 = 11; + * optional uint32 rogue_version_id = 2; */ private int rogueVersionId; /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 13; */ private final RogueCommonPendingActionOuterClass.RogueCommonPendingAction rogueCommonPendingAction = RogueCommonPendingActionOuterClass.RogueCommonPendingAction.newInstance(); @@ -39,7 +39,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 11; + * optional uint32 rogue_version_id = 2; * @return whether the rogueVersionId field is set */ public boolean hasRogueVersionId() { @@ -47,7 +47,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 11; + * optional uint32 rogue_version_id = 2; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueVersionId() { @@ -57,7 +57,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 11; + * optional uint32 rogue_version_id = 2; * @return the rogueVersionId */ public int getRogueVersionId() { @@ -65,7 +65,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional uint32 rogue_version_id = 11; + * optional uint32 rogue_version_id = 2; * @param value the rogueVersionId to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 13; * @return whether the rogueCommonPendingAction field is set */ public boolean hasRogueCommonPendingAction() { @@ -84,7 +84,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 13; * @return this */ public SyncRogueCommonPendingActionScNotify clearRogueCommonPendingAction() { @@ -94,7 +94,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_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. @@ -109,7 +109,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_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 @@ -124,7 +124,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { } /** - * optional .RogueCommonPendingAction rogue_common_pending_action = 7; + * optional .RogueCommonPendingAction rogue_common_pending_action = 13; * @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) 88); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(rogueVersionId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 106); output.writeMessageNoTag(rogueCommonPendingAction); } } @@ -232,16 +232,16 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 88: { + case 16: { // rogueVersionId rogueVersionId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 58) { + if (tag != 106) { break; } } - case 58: { + case 106: { // 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 a1ce05c..5779f1b 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 = 7; + * optional .RogueFinishInfo finish_info = 10; */ private final RogueFinishInfoOuterClass.RogueFinishInfo finishInfo = RogueFinishInfoOuterClass.RogueFinishInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_info = 10; * @return whether the finishInfo field is set */ public boolean hasFinishInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_info = 10; * @return this */ public SyncRogueFinishScNotify clearFinishInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_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 SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_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 SyncRogueFinishScNotifyOuterClass { } /** - * optional .RogueFinishInfo finish_info = 7; + * optional .RogueFinishInfo finish_info = 10; * @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) 58); + output.writeRawByte((byte) 82); output.writeMessageNoTag(finishInfo); } } @@ -172,7 +172,7 @@ public final class SyncRogueFinishScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 58: { + case 82: { // 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 c9ff2a0..f0e3d3c 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 = 1; + * optional uint32 map_id = 5; */ private int mapId; /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 13; */ private final RogueRoomOuterClass.RogueRoom curRoom = RogueRoomOuterClass.RogueRoom.newInstance(); @@ -39,7 +39,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 1; + * optional uint32 map_id = 5; * @return whether the mapId field is set */ public boolean hasMapId() { @@ -47,7 +47,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 1; + * optional uint32 map_id = 5; * @return this */ public SyncRogueMapRoomScNotify clearMapId() { @@ -57,7 +57,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 1; + * optional uint32 map_id = 5; * @return the mapId */ public int getMapId() { @@ -65,7 +65,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional uint32 map_id = 1; + * optional uint32 map_id = 5; * @param value the mapId to set * @return this */ @@ -76,7 +76,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 13; * @return whether the curRoom field is set */ public boolean hasCurRoom() { @@ -84,7 +84,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 13; * @return this */ public SyncRogueMapRoomScNotify clearCurRoom() { @@ -94,7 +94,7 @@ public final class SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 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 SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 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 SyncRogueMapRoomScNotifyOuterClass { } /** - * optional .RogueRoom cur_room = 9; + * optional .RogueRoom cur_room = 13; * @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) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(mapId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 74); + output.writeRawByte((byte) 106); output.writeMessageNoTag(curRoom); } } @@ -226,16 +226,16 @@ public final class SyncRogueMapRoomScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // mapId mapId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 74) { + if (tag != 106) { break; } } - case 74: { + case 106: { // curRoom input.readMessage(curRoom); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueVirtualItemInfoScNotifyOuterClass.java index e040def..cdc8cf8 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 = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; */ private final RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo rogueVirtualItemInfo = RogueVirtualItemInfoOuterClass.RogueVirtualItemInfo.newInstance(); @@ -34,7 +34,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; * @return whether the rogueVirtualItemInfo field is set */ public boolean hasRogueVirtualItemInfo() { @@ -42,7 +42,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; * @return this */ public SyncRogueVirtualItemInfoScNotify clearRogueVirtualItemInfo() { @@ -52,7 +52,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_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. @@ -66,7 +66,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_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 @@ -80,7 +80,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { } /** - * optional .RogueVirtualItemInfo rogue_virtual_item_info = 4; + * optional .RogueVirtualItemInfo rogue_virtual_item_info = 13; * @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) 34); + output.writeRawByte((byte) 106); output.writeMessageNoTag(rogueVirtualItemInfo); } } @@ -173,7 +173,7 @@ public final class SyncRogueVirtualItemInfoScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 34: { + case 106: { // 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 a509c0e..9db80a8 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 = 6; + * optional uint32 group_id = 1; */ private int groupId; @@ -34,7 +34,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -42,7 +42,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return this */ public TakeChallengeRewardCsReq clearGroupId() { @@ -52,7 +52,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @return the groupId */ public int getGroupId() { @@ -60,7 +60,7 @@ public final class TakeChallengeRewardCsReqOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 1; * @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) 48); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(groupId); } } @@ -150,7 +150,7 @@ public final class TakeChallengeRewardCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 8: { // 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 3d7839a..55b57c8 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 = 6; + * optional uint32 group_id = 10; */ private int groupId; /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 13; */ private int retcode; /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; */ private final RepeatedMessage takenRewardList = RepeatedMessage.newEmptyInstance(TakenChallengeRewardInfoOuterClass.TakenChallengeRewardInfo.getFactory()); @@ -45,7 +45,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 10; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -53,7 +53,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 10; * @return this */ public TakeChallengeRewardScRsp clearGroupId() { @@ -63,7 +63,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 10; * @return the groupId */ public int getGroupId() { @@ -71,7 +71,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 group_id = 6; + * optional uint32 group_id = 10; * @param value the groupId to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 13; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -90,7 +90,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 13; * @return this */ public TakeChallengeRewardScRsp clearRetcode() { @@ -100,7 +100,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 13; * @return the retcode */ public int getRetcode() { @@ -108,7 +108,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 13; * @param value the retcode to set * @return this */ @@ -119,7 +119,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; * @return whether the takenRewardList field is set */ public boolean hasTakenRewardList() { @@ -127,7 +127,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; * @return this */ public TakeChallengeRewardScRsp clearTakenRewardList() { @@ -137,7 +137,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_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. @@ -152,7 +152,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_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 @@ -167,7 +167,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; * @param value the takenRewardList to add * @return this */ @@ -179,7 +179,7 @@ public final class TakeChallengeRewardScRspOuterClass { } /** - * repeated .TakenChallengeRewardInfo taken_reward_list = 7; + * repeated .TakenChallengeRewardInfo taken_reward_list = 5; * @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) 48); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 88); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < takenRewardList.length(); i++) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 42); output.writeMessageNoTag(takenRewardList.get(i)); } } @@ -299,25 +299,25 @@ public final class TakeChallengeRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 80: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 88) { + if (tag != 104) { break; } } - case 88: { + case 104: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 58) { + if (tag != 42) { break; } } - case 58: { + case 42: { // 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 e071d61..ea3be76 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 = 6; + * optional uint32 optional_reward_id = 7; */ private int optionalRewardId; /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_id_list = 1; */ private final RepeatedInt mailIdList = RepeatedInt.newEmptyInstance(); @@ -40,7 +40,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 6; + * optional uint32 optional_reward_id = 7; * @return whether the optionalRewardId field is set */ public boolean hasOptionalRewardId() { @@ -48,7 +48,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 6; + * optional uint32 optional_reward_id = 7; * @return this */ public TakeMailAttachmentCsReq clearOptionalRewardId() { @@ -58,7 +58,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 6; + * optional uint32 optional_reward_id = 7; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -66,7 +66,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 6; + * optional uint32 optional_reward_id = 7; * @param value the optionalRewardId to set * @return this */ @@ -77,7 +77,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_id_list = 1; * @return whether the mailIdList field is set */ public boolean hasMailIdList() { @@ -85,7 +85,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_id_list = 1; * @return this */ public TakeMailAttachmentCsReq clearMailIdList() { @@ -95,7 +95,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_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. @@ -109,7 +109,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_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 @@ -123,7 +123,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_id_list = 1; * @param value the mailIdList to add * @return this */ @@ -134,7 +134,7 @@ public final class TakeMailAttachmentCsReqOuterClass { } /** - * repeated uint32 mail_id_list = 14; + * repeated uint32 mail_id_list = 1; * @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) 48); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < mailIdList.length(); i++) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(mailIdList.array()[i]); } } @@ -240,16 +240,16 @@ public final class TakeMailAttachmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 56: { // optionalRewardId optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 114) { + if (tag != 10) { break; } } - case 114: { + case 10: { // mailIdList [packed=true] input.readPackedUInt32(mailIdList, tag); bitField0_ |= 0x00000002; @@ -268,7 +268,7 @@ public final class TakeMailAttachmentCsReqOuterClass { tag = input.readTag(); break; } - case 112: { + case 8: { // 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 826e378..28f2da4 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 = 1; + * optional uint32 retcode = 5; */ private int retcode; /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 4; */ private final ItemListOuterClass.ItemList attachment = ItemListOuterClass.ItemList.newInstance(); /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_id_list = 11; */ private final RepeatedInt succMailIdList = RepeatedInt.newEmptyInstance(); @@ -45,7 +45,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 5; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -53,7 +53,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 5; * @return this */ public TakeMailAttachmentScRsp clearRetcode() { @@ -63,7 +63,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 5; * @return the retcode */ public int getRetcode() { @@ -71,7 +71,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional uint32 retcode = 1; + * optional uint32 retcode = 5; * @param value the retcode to set * @return this */ @@ -82,7 +82,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 4; * @return whether the attachment field is set */ public boolean hasAttachment() { @@ -90,7 +90,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 4; * @return this */ public TakeMailAttachmentScRsp clearAttachment() { @@ -100,7 +100,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 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. @@ -114,7 +114,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 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 @@ -128,7 +128,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * optional .ItemList attachment = 12; + * optional .ItemList attachment = 4; * @param value the attachment to set * @return this */ @@ -139,7 +139,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_id_list = 11; * @return whether the succMailIdList field is set */ public boolean hasSuccMailIdList() { @@ -147,7 +147,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_id_list = 11; * @return this */ public TakeMailAttachmentScRsp clearSuccMailIdList() { @@ -157,7 +157,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_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. @@ -171,7 +171,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_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 @@ -185,7 +185,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_id_list = 11; * @param value the succMailIdList to add * @return this */ @@ -196,7 +196,7 @@ public final class TakeMailAttachmentScRspOuterClass { } /** - * repeated uint32 succ_mail_id_list = 10; + * repeated uint32 succ_mail_id_list = 11; * @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) 8); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 98); + output.writeRawByte((byte) 34); output.writeMessageNoTag(attachment); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < succMailIdList.length(); i++) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(succMailIdList.array()[i]); } } @@ -316,25 +316,25 @@ public final class TakeMailAttachmentScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 40: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 98) { + if (tag != 34) { break; } } - case 98: { + case 34: { // attachment input.readMessage(attachment); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 82) { + if (tag != 90) { break; } } - case 82: { + case 90: { // succMailIdList [packed=true] input.readPackedUInt32(succMailIdList, tag); bitField0_ |= 0x00000004; @@ -353,7 +353,7 @@ public final class TakeMailAttachmentScRspOuterClass { tag = input.readTag(); break; } - case 80: { + case 88: { // 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 a8801f8..cb1f1d0 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffEquipmentCsReqOuterClass.java @@ -19,12 +19,11 @@ public final class TakeOffEquipmentCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 8; - */ - private int baseAvatarId; - - /** - * optional uint32 equip_avatar_id = 14; + * 
+     *  uint32 base_avatar_id = 14;
+     *
+ * + * optional uint32 equip_avatar_id = 7; */ private int equipAvatarId; @@ -39,62 +38,37 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; - * @return whether the baseAvatarId field is set + * 
+     *  uint32 base_avatar_id = 14;
+     *
+ * + * optional uint32 equip_avatar_id = 7; + * @return whether the equipAvatarId field is set */ - public boolean hasBaseAvatarId() { + public boolean hasEquipAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 8; - * @return this - */ - public TakeOffEquipmentCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000001; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 8; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 8; - * @param value the baseAvatarId to set - * @return this - */ - public TakeOffEquipmentCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000001; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 equip_avatar_id = 14; - * @return whether the equipAvatarId field is set - */ - public boolean hasEquipAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 equip_avatar_id = 14; + * 
+     *  uint32 base_avatar_id = 14;
+     *
+ * + * optional uint32 equip_avatar_id = 7; * @return this */ public TakeOffEquipmentCsReq clearEquipAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; equipAvatarId = 0; return this; } /** - * optional uint32 equip_avatar_id = 14; + * 
+     *  uint32 base_avatar_id = 14;
+     *
+ * + * optional uint32 equip_avatar_id = 7; * @return the equipAvatarId */ public int getEquipAvatarId() { @@ -102,12 +76,16 @@ public final class TakeOffEquipmentCsReqOuterClass { } /** - * optional uint32 equip_avatar_id = 14; + * 
+     *  uint32 base_avatar_id = 14;
+     *
+ * + * optional uint32 equip_avatar_id = 7; * @param value the equipAvatarId to set * @return this */ public TakeOffEquipmentCsReq setEquipAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; equipAvatarId = value; return this; } @@ -117,7 +95,6 @@ public final class TakeOffEquipmentCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; equipAvatarId = other.equipAvatarId; } return this; @@ -129,9 +106,6 @@ public final class TakeOffEquipmentCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasEquipAvatarId()) { setEquipAvatarId(other.equipAvatarId); } @@ -145,7 +119,6 @@ public final class TakeOffEquipmentCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; equipAvatarId = 0; return this; } @@ -170,18 +143,13 @@ public final class TakeOffEquipmentCsReqOuterClass { } TakeOffEquipmentCsReq other = (TakeOffEquipmentCsReq) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 56); output.writeUInt32NoTag(equipAvatarId); } } @@ -190,9 +158,6 @@ public final class TakeOffEquipmentCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } return size; @@ -205,19 +170,10 @@ public final class TakeOffEquipmentCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 64: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { + case 56: { // equipAvatarId equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; tag = input.readTag(); if (tag != 0) { break; @@ -241,9 +197,6 @@ public final class TakeOffEquipmentCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } output.endObject(); @@ -256,24 +209,12 @@ public final class TakeOffEquipmentCsReqOuterClass { } 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 169047204: case 33057906: { if (input.isAtField(FieldNames.equipAvatarId)) { if (!input.trySkipNullValue()) { equipAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -333,8 +274,6 @@ public final class TakeOffEquipmentCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); } } diff --git a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java index 5345919..7d6aa60 100644 --- a/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakeOffRelicCsReqOuterClass.java @@ -20,17 +20,16 @@ public final class TakeOffRelicCsReqOuterClass { private static final long serialVersionUID = 0L; /** + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * * optional uint32 equip_avatar_id = 1; */ private int equipAvatarId; /** - * optional uint32 base_avatar_id = 8; - */ - private int baseAvatarId; - - /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_list = 8; */ private final RepeatedInt slotList = RepeatedInt.newEmptyInstance(); @@ -45,6 +44,10 @@ public final class TakeOffRelicCsReqOuterClass { } /** + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * * optional uint32 equip_avatar_id = 1; * @return whether the equipAvatarId field is set */ @@ -53,6 +56,10 @@ public final class TakeOffRelicCsReqOuterClass { } /** + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * * optional uint32 equip_avatar_id = 1; * @return this */ @@ -63,6 +70,10 @@ public final class TakeOffRelicCsReqOuterClass { } /** + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * * optional uint32 equip_avatar_id = 1; * @return the equipAvatarId */ @@ -71,6 +82,10 @@ public final class TakeOffRelicCsReqOuterClass { } /** + * 
+     *  uint32 base_avatar_id = 2;
+     *
+ * * optional uint32 equip_avatar_id = 1; * @param value the equipAvatarId to set * @return this @@ -82,62 +97,25 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; - * @return whether the baseAvatarId field is set + * repeated uint32 slot_list = 8; + * @return whether the slotList field is set */ - public boolean hasBaseAvatarId() { + public boolean hasSlotList() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 base_avatar_id = 8; - * @return this - */ - public TakeOffRelicCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; - baseAvatarId = 0; - return this; - } - - /** - * optional uint32 base_avatar_id = 8; - * @return the baseAvatarId - */ - public int getBaseAvatarId() { - return baseAvatarId; - } - - /** - * optional uint32 base_avatar_id = 8; - * @param value the baseAvatarId to set - * @return this - */ - public TakeOffRelicCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; - baseAvatarId = value; - return this; - } - - /** - * repeated uint32 slot_list = 6; - * @return whether the slotList field is set - */ - public boolean hasSlotList() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_list = 8; * @return this */ public TakeOffRelicCsReq clearSlotList() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; slotList.clear(); return this; } /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_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. @@ -151,7 +129,7 @@ public final class TakeOffRelicCsReqOuterClass { } /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_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 @@ -160,28 +138,28 @@ public final class TakeOffRelicCsReqOuterClass { * @return internal storage object for modifications */ public RepeatedInt getMutableSlotList() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; return slotList; } /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_list = 8; * @param value the slotList to add * @return this */ public TakeOffRelicCsReq addSlotList(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; slotList.add(value); return this; } /** - * repeated uint32 slot_list = 6; + * repeated uint32 slot_list = 8; * @param values the slotList to add * @return this */ public TakeOffRelicCsReq addAllSlotList(final int... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; slotList.addAll(values); return this; } @@ -192,7 +170,6 @@ public final class TakeOffRelicCsReqOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; equipAvatarId = other.equipAvatarId; - baseAvatarId = other.baseAvatarId; slotList.copyFrom(other.slotList); } return this; @@ -207,9 +184,6 @@ public final class TakeOffRelicCsReqOuterClass { if (other.hasEquipAvatarId()) { setEquipAvatarId(other.equipAvatarId); } - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } if (other.hasSlotList()) { getMutableSlotList().addAll(other.slotList); } @@ -224,7 +198,6 @@ public final class TakeOffRelicCsReqOuterClass { cachedSize = -1; bitField0_ = 0; equipAvatarId = 0; - baseAvatarId = 0; slotList.clear(); return this; } @@ -251,7 +224,6 @@ public final class TakeOffRelicCsReqOuterClass { TakeOffRelicCsReq other = (TakeOffRelicCsReq) o; return bitField0_ == other.bitField0_ && (!hasEquipAvatarId() || equipAvatarId == other.equipAvatarId) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasSlotList() || slotList.equals(other.slotList)); } @@ -262,12 +234,8 @@ public final class TakeOffRelicCsReqOuterClass { output.writeUInt32NoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < slotList.length(); i++) { - output.writeRawByte((byte) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(slotList.array()[i]); } } @@ -280,9 +248,6 @@ public final class TakeOffRelicCsReqOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { size += (1 * slotList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(slotList); } return size; @@ -300,23 +265,14 @@ public final class TakeOffRelicCsReqOuterClass { equipAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 66) { break; } } - case 64: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 50) { - break; - } - } - case 50: { + case 66: { // slotList [packed=true] input.readPackedUInt32(slotList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { break; @@ -332,10 +288,10 @@ public final class TakeOffRelicCsReqOuterClass { tag = input.readTag(); break; } - case 48: { + case 64: { // slotList [packed=false] tag = input.readRepeatedUInt32(slotList, tag); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; break; } } @@ -349,9 +305,6 @@ public final class TakeOffRelicCsReqOuterClass { output.writeUInt32(FieldNames.equipAvatarId, equipAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeRepeatedUInt32(FieldNames.slotList, slotList); } output.endObject(); @@ -376,24 +329,12 @@ public final class TakeOffRelicCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { - if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case -1086791748: case 686820927: { if (input.isAtField(FieldNames.slotList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(slotList); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -455,8 +396,6 @@ public final class TakeOffRelicCsReqOuterClass { static class FieldNames { static final FieldName equipAvatarId = FieldName.forField("equipAvatarId", "equip_avatar_id"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_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 25465b8..50af32a 100644 --- a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardCsReqOuterClass.java @@ -19,15 +19,15 @@ public final class TakePromotionRewardCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 promotion = 1; - */ - private int promotion; - - /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 1; */ private int baseAvatarId; + /** + * optional uint32 promotion = 2; + */ + private int promotion; + private TakePromotionRewardCsReq() { } @@ -39,62 +39,25 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 promotion = 1; - * @return whether the promotion field is set + * optional uint32 base_avatar_id = 1; + * @return whether the baseAvatarId field is set */ - public boolean hasPromotion() { + public boolean hasBaseAvatarId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 promotion = 1; - * @return this - */ - public TakePromotionRewardCsReq clearPromotion() { - bitField0_ &= ~0x00000001; - promotion = 0; - return this; - } - - /** - * optional uint32 promotion = 1; - * @return the promotion - */ - public int getPromotion() { - return promotion; - } - - /** - * optional uint32 promotion = 1; - * @param value the promotion to set - * @return this - */ - public TakePromotionRewardCsReq setPromotion(final int value) { - bitField0_ |= 0x00000001; - promotion = value; - return this; - } - - /** - * optional uint32 base_avatar_id = 8; - * @return whether the baseAvatarId field is set - */ - public boolean hasBaseAvatarId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 1; * @return this */ public TakePromotionRewardCsReq clearBaseAvatarId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; baseAvatarId = 0; return this; } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 1; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -102,23 +65,60 @@ public final class TakePromotionRewardCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 8; + * optional uint32 base_avatar_id = 1; * @param value the baseAvatarId to set * @return this */ public TakePromotionRewardCsReq setBaseAvatarId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; baseAvatarId = value; return this; } + /** + * optional uint32 promotion = 2; + * @return whether the promotion field is set + */ + public boolean hasPromotion() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 promotion = 2; + * @return this + */ + public TakePromotionRewardCsReq clearPromotion() { + bitField0_ &= ~0x00000002; + promotion = 0; + return this; + } + + /** + * optional uint32 promotion = 2; + * @return the promotion + */ + public int getPromotion() { + return promotion; + } + + /** + * optional uint32 promotion = 2; + * @param value the promotion to set + * @return this + */ + public TakePromotionRewardCsReq setPromotion(final int value) { + bitField0_ |= 0x00000002; + promotion = value; + return this; + } + @Override public TakePromotionRewardCsReq copyFrom(final TakePromotionRewardCsReq other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - promotion = other.promotion; baseAvatarId = other.baseAvatarId; + promotion = other.promotion; } return this; } @@ -129,12 +129,12 @@ public final class TakePromotionRewardCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasPromotion()) { - setPromotion(other.promotion); - } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } + if (other.hasPromotion()) { + setPromotion(other.promotion); + } return this; } @@ -145,8 +145,8 @@ public final class TakePromotionRewardCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - promotion = 0; baseAvatarId = 0; + promotion = 0; return this; } @@ -170,19 +170,19 @@ public final class TakePromotionRewardCsReqOuterClass { } TakePromotionRewardCsReq other = (TakePromotionRewardCsReq) o; return bitField0_ == other.bitField0_ - && (!hasPromotion() || promotion == other.promotion) - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId); + && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) + && (!hasPromotion() || promotion == other.promotion); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(promotion); + output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); - output.writeUInt32NoTag(baseAvatarId); + output.writeRawByte((byte) 16); + output.writeUInt32NoTag(promotion); } } @@ -190,10 +190,10 @@ public final class TakePromotionRewardCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); + size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(promotion); } return size; } @@ -206,17 +206,17 @@ public final class TakePromotionRewardCsReqOuterClass { while (true) { switch (tag) { case 8: { - // promotion - promotion = input.readUInt32(); + // baseAvatarId + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 16) { break; } } - case 64: { - // baseAvatarId - baseAvatarId = input.readUInt32(); + case 16: { + // promotion + promotion = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 0) { @@ -241,10 +241,10 @@ public final class TakePromotionRewardCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.promotion, promotion); + output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); + output.writeUInt32(FieldNames.promotion, promotion); } output.endObject(); } @@ -256,10 +256,11 @@ public final class TakePromotionRewardCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -799212381: { - if (input.isAtField(FieldNames.promotion)) { + case 118022725: + case -1756826157: { + if (input.isAtField(FieldNames.baseAvatarId)) { if (!input.trySkipNullValue()) { - promotion = input.readUInt32(); + baseAvatarId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -267,11 +268,10 @@ public final class TakePromotionRewardCsReqOuterClass { } break; } - case 118022725: - case -1756826157: { - if (input.isAtField(FieldNames.baseAvatarId)) { + case -799212381: { + if (input.isAtField(FieldNames.promotion)) { if (!input.trySkipNullValue()) { - baseAvatarId = input.readUInt32(); + promotion = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -332,9 +332,9 @@ public final class TakePromotionRewardCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName promotion = FieldName.forField("promotion"); - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); + + static final FieldName promotion = FieldName.forField("promotion"); } } } diff --git a/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TakePromotionRewardScRspOuterClass.java index 6ded3bf..1e73a23 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 = 13; + * optional uint32 retcode = 6; */ private int retcode; /** - * optional .ItemList reward_list = 5; + * optional .ItemList reward_list = 13; */ private final ItemListOuterClass.ItemList rewardList = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 6; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -47,7 +47,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 6; * @return this */ public TakePromotionRewardScRsp clearRetcode() { @@ -57,7 +57,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 6; * @return the retcode */ public int getRetcode() { @@ -65,7 +65,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 6; * @param value the retcode to set * @return this */ @@ -76,7 +76,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 5; + * optional .ItemList reward_list = 13; * @return whether the rewardList field is set */ public boolean hasRewardList() { @@ -84,7 +84,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 5; + * optional .ItemList reward_list = 13; * @return this */ public TakePromotionRewardScRsp clearRewardList() { @@ -94,7 +94,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 5; + * optional .ItemList 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. @@ -108,7 +108,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 5; + * optional .ItemList 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 @@ -122,7 +122,7 @@ public final class TakePromotionRewardScRspOuterClass { } /** - * optional .ItemList reward_list = 5; + * optional .ItemList reward_list = 13; * @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) 104); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 106); output.writeMessageNoTag(rewardList); } } @@ -226,16 +226,16 @@ public final class TakePromotionRewardScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 104: { + case 48: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 42) { + if (tag != 106) { break; } } - case 42: { + case 106: { // 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 8d6b8bc..90db19e 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 = 9; + * optional uint32 star_count = 5; */ private int starCount; /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 3; */ private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); @@ -39,7 +39,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 5; * @return whether the starCount field is set */ public boolean hasStarCount() { @@ -47,7 +47,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 5; * @return this */ public TakenChallengeRewardInfo clearStarCount() { @@ -57,7 +57,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 5; * @return the starCount */ public int getStarCount() { @@ -65,7 +65,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional uint32 star_count = 9; + * optional uint32 star_count = 5; * @param value the starCount to set * @return this */ @@ -76,7 +76,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 3; * @return whether the reward field is set */ public boolean hasReward() { @@ -84,7 +84,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 3; * @return this */ public TakenChallengeRewardInfo clearReward() { @@ -94,7 +94,7 @@ public final class TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 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 TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 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 TakenChallengeRewardInfoOuterClass { } /** - * optional .ItemList reward = 15; + * optional .ItemList reward = 3; * @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) 72); + output.writeRawByte((byte) 40); output.writeUInt32NoTag(starCount); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 122); + output.writeRawByte((byte) 26); output.writeMessageNoTag(reward); } } @@ -226,16 +226,16 @@ public final class TakenChallengeRewardInfoOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 72: { + case 40: { // starCount starCount = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 122) { + if (tag != 26) { break; } } - case 122: { + case 26: { // reward input.readMessage(reward); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/TextJoinQueryScRspOuterClass.java index ecd70cc..1c7adf5 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 = 5; + * optional uint32 retcode = 10; */ private int retcode; /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_list = 5; */ private final RepeatedMessage textJoinList = RepeatedMessage.newEmptyInstance(TextJoinInfoOuterClass.TextJoinInfo.getFactory()); @@ -40,7 +40,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -48,7 +48,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return this */ public TextJoinQueryScRsp clearRetcode() { @@ -58,7 +58,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @return the retcode */ public int getRetcode() { @@ -66,7 +66,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * optional uint32 retcode = 5; + * optional uint32 retcode = 10; * @param value the retcode to set * @return this */ @@ -77,7 +77,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_list = 5; * @return whether the textJoinList field is set */ public boolean hasTextJoinList() { @@ -85,7 +85,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_list = 5; * @return this */ public TextJoinQueryScRsp clearTextJoinList() { @@ -95,7 +95,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_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. @@ -109,7 +109,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_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 @@ -123,7 +123,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_list = 5; * @param value the textJoinList to add * @return this */ @@ -134,7 +134,7 @@ public final class TextJoinQueryScRspOuterClass { } /** - * repeated .TextJoinInfo text_join_list = 2; + * repeated .TextJoinInfo text_join_list = 5; * @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) 40); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000002) != 0) { for (int i = 0; i < textJoinList.length(); i++) { - output.writeRawByte((byte) 18); + output.writeRawByte((byte) 42); output.writeMessageNoTag(textJoinList.get(i)); } } @@ -241,16 +241,16 @@ public final class TextJoinQueryScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 80: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 18) { + if (tag != 42) { break; } } - case 18: { + case 42: { // 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 30628e2..d818f8e 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 = 5; + * optional uint32 bubble_id = 12; */ private int bubbleId; @@ -34,7 +34,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 5; + * optional uint32 bubble_id = 12; * @return whether the bubbleId field is set */ public boolean hasBubbleId() { @@ -42,7 +42,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 5; + * optional uint32 bubble_id = 12; * @return this */ public UnlockChatBubbleScNotify clearBubbleId() { @@ -52,7 +52,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 5; + * optional uint32 bubble_id = 12; * @return the bubbleId */ public int getBubbleId() { @@ -60,7 +60,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { } /** - * optional uint32 bubble_id = 5; + * optional uint32 bubble_id = 12; * @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) 40); + output.writeRawByte((byte) 96); output.writeUInt32NoTag(bubbleId); } } @@ -150,7 +150,7 @@ public final class UnlockChatBubbleScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 40: { + case 96: { // bubbleId bubbleId = input.readUInt32(); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeCsReqOuterClass.java new file mode 100644 index 0000000..b51f462 --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeCsReqOuterClass.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 UnlockHeroBasicTypeCsReqOuterClass { + /** + * Protobuf type {@code UnlockHeroBasicTypeCsReq} + */ + public static final class UnlockHeroBasicTypeCsReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional .HeroBasicType basic_type = 10; + */ + private int basicType; + + private UnlockHeroBasicTypeCsReq() { + } + + /** + * @return a new empty instance of {@code UnlockHeroBasicTypeCsReq} + */ + public static UnlockHeroBasicTypeCsReq newInstance() { + return new UnlockHeroBasicTypeCsReq(); + } + + /** + * optional .HeroBasicType basic_type = 10; + * @return whether the basicType field is set + */ + public boolean hasBasicType() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional .HeroBasicType basic_type = 10; + * @return this + */ + public UnlockHeroBasicTypeCsReq clearBasicType() { + bitField0_ &= ~0x00000001; + basicType = 0; + return this; + } + + /** + * optional .HeroBasicType basic_type = 10; + * @return the basicType + */ + public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { + return HeroBasicTypeOuterClass.HeroBasicType.forNumber(basicType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link UnlockHeroBasicTypeCsReq#getBasicType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getBasicTypeValue() { + return basicType; + } + + /** + * 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 HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value + * can cause {@link UnlockHeroBasicTypeCsReq#getBasicType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public UnlockHeroBasicTypeCsReq setBasicTypeValue(final int value) { + bitField0_ |= 0x00000001; + basicType = value; + return this; + } + + /** + * optional .HeroBasicType basic_type = 10; + * @param value the basicType to set + * @return this + */ + public UnlockHeroBasicTypeCsReq setBasicType( + final HeroBasicTypeOuterClass.HeroBasicType value) { + bitField0_ |= 0x00000001; + basicType = value.getNumber(); + return this; + } + + @Override + public UnlockHeroBasicTypeCsReq copyFrom(final UnlockHeroBasicTypeCsReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + basicType = other.basicType; + } + return this; + } + + @Override + public UnlockHeroBasicTypeCsReq mergeFrom(final UnlockHeroBasicTypeCsReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasBasicType()) { + setBasicTypeValue(other.basicType); + } + return this; + } + + @Override + public UnlockHeroBasicTypeCsReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + basicType = 0; + return this; + } + + @Override + public UnlockHeroBasicTypeCsReq 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 UnlockHeroBasicTypeCsReq)) { + return false; + } + UnlockHeroBasicTypeCsReq other = (UnlockHeroBasicTypeCsReq) o; + return bitField0_ == other.bitField0_ + && (!hasBasicType() || basicType == other.basicType); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 80); + output.writeEnumNoTag(basicType); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(basicType); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public UnlockHeroBasicTypeCsReq mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 80: { + // basicType + final int value = input.readInt32(); + if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { + basicType = 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.basicType, basicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); + } + output.endObject(); + } + + @Override + public UnlockHeroBasicTypeCsReq mergeFrom(final JsonSource input) throws IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case -1699147640: + case -1123950421: { + if (input.isAtField(FieldNames.basicType)) { + if (!input.trySkipNullValue()) { + final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); + if (value != null) { + basicType = value.getNumber(); + bitField0_ |= 0x00000001; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public UnlockHeroBasicTypeCsReq clone() { + return new UnlockHeroBasicTypeCsReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static UnlockHeroBasicTypeCsReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeCsReq(), data).checkInitialized(); + } + + public static UnlockHeroBasicTypeCsReq parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeCsReq(), input).checkInitialized(); + } + + public static UnlockHeroBasicTypeCsReq parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeCsReq(), input).checkInitialized(); + } + + /** + * @return factory for creating UnlockHeroBasicTypeCsReq messages + */ + public static MessageFactory getFactory() { + return UnlockHeroBasicTypeCsReqFactory.INSTANCE; + } + + private enum UnlockHeroBasicTypeCsReqFactory implements MessageFactory { + INSTANCE; + + @Override + public UnlockHeroBasicTypeCsReq create() { + return UnlockHeroBasicTypeCsReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName basicType = FieldName.forField("basicType", "basic_type"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeScRspOuterClass.java new file mode 100644 index 0000000..e3eac5f --- /dev/null +++ b/src/generated/main/emu/lunarcore/proto/UnlockHeroBasicTypeScRspOuterClass.java @@ -0,0 +1,597 @@ +// 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 UnlockHeroBasicTypeScRspOuterClass { + /** + * Protobuf type {@code UnlockHeroBasicTypeScRsp} + */ + public static final class UnlockHeroBasicTypeScRsp extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 retcode = 3; + */ + private int retcode; + + /** + * optional .HeroBasicType basic_type = 8; + */ + private int basicType; + + /** + * optional .ItemList reward = 1; + */ + private final ItemListOuterClass.ItemList reward = ItemListOuterClass.ItemList.newInstance(); + + /** + * repeated uint32 unlocked_basic_types = 12; + */ + private final RepeatedInt unlockedBasicTypes = RepeatedInt.newEmptyInstance(); + + private UnlockHeroBasicTypeScRsp() { + } + + /** + * @return a new empty instance of {@code UnlockHeroBasicTypeScRsp} + */ + public static UnlockHeroBasicTypeScRsp newInstance() { + return new UnlockHeroBasicTypeScRsp(); + } + + /** + * optional uint32 retcode = 3; + * @return whether the retcode field is set + */ + public boolean hasRetcode() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 retcode = 3; + * @return this + */ + public UnlockHeroBasicTypeScRsp 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 UnlockHeroBasicTypeScRsp setRetcode(final int value) { + bitField0_ |= 0x00000001; + retcode = value; + return this; + } + + /** + * optional .HeroBasicType basic_type = 8; + * @return whether the basicType field is set + */ + public boolean hasBasicType() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional .HeroBasicType basic_type = 8; + * @return this + */ + public UnlockHeroBasicTypeScRsp clearBasicType() { + bitField0_ &= ~0x00000002; + basicType = 0; + return this; + } + + /** + * optional .HeroBasicType basic_type = 8; + * @return the basicType + */ + public HeroBasicTypeOuterClass.HeroBasicType getBasicType() { + return HeroBasicTypeOuterClass.HeroBasicType.forNumber(basicType); + } + + /** + * Gets the value of the internal enum store. The result is + * equivalent to {@link UnlockHeroBasicTypeScRsp#getBasicType()}.getNumber(). + * + * @return numeric wire representation + */ + public int getBasicTypeValue() { + return basicType; + } + + /** + * 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 HeroBasicTypeOuterClass.HeroBasicType}. Setting an invalid value + * can cause {@link UnlockHeroBasicTypeScRsp#getBasicType()} to return null + * + * @param value the numeric wire value to set + * @return this + */ + public UnlockHeroBasicTypeScRsp setBasicTypeValue(final int value) { + bitField0_ |= 0x00000002; + basicType = value; + return this; + } + + /** + * optional .HeroBasicType basic_type = 8; + * @param value the basicType to set + * @return this + */ + public UnlockHeroBasicTypeScRsp setBasicType( + final HeroBasicTypeOuterClass.HeroBasicType value) { + bitField0_ |= 0x00000002; + basicType = value.getNumber(); + return this; + } + + /** + * optional .ItemList reward = 1; + * @return whether the reward field is set + */ + public boolean hasReward() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional .ItemList reward = 1; + * @return this + */ + public UnlockHeroBasicTypeScRsp clearReward() { + bitField0_ &= ~0x00000004; + reward.clear(); + return this; + } + + /** + * 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. + * + * Use {@link #getMutableReward()} if you want to modify it. + * + * @return internal storage object for reading + */ + public ItemListOuterClass.ItemList getReward() { + return reward; + } + + /** + * 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 + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public ItemListOuterClass.ItemList getMutableReward() { + bitField0_ |= 0x00000004; + return reward; + } + + /** + * optional .ItemList reward = 1; + * @param value the reward to set + * @return this + */ + public UnlockHeroBasicTypeScRsp setReward(final ItemListOuterClass.ItemList value) { + bitField0_ |= 0x00000004; + reward.copyFrom(value); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 12; + * @return whether the unlockedBasicTypes field is set + */ + public boolean hasUnlockedBasicTypes() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * repeated uint32 unlocked_basic_types = 12; + * @return this + */ + public UnlockHeroBasicTypeScRsp clearUnlockedBasicTypes() { + bitField0_ &= ~0x00000008; + unlockedBasicTypes.clear(); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 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 #getMutableUnlockedBasicTypes()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedInt getUnlockedBasicTypes() { + return unlockedBasicTypes; + } + + /** + * repeated uint32 unlocked_basic_types = 12; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedInt getMutableUnlockedBasicTypes() { + bitField0_ |= 0x00000008; + return unlockedBasicTypes; + } + + /** + * repeated uint32 unlocked_basic_types = 12; + * @param value the unlockedBasicTypes to add + * @return this + */ + public UnlockHeroBasicTypeScRsp addUnlockedBasicTypes(final int value) { + bitField0_ |= 0x00000008; + unlockedBasicTypes.add(value); + return this; + } + + /** + * repeated uint32 unlocked_basic_types = 12; + * @param values the unlockedBasicTypes to add + * @return this + */ + public UnlockHeroBasicTypeScRsp addAllUnlockedBasicTypes(final int... values) { + bitField0_ |= 0x00000008; + unlockedBasicTypes.addAll(values); + return this; + } + + @Override + public UnlockHeroBasicTypeScRsp copyFrom(final UnlockHeroBasicTypeScRsp other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + retcode = other.retcode; + basicType = other.basicType; + reward.copyFrom(other.reward); + unlockedBasicTypes.copyFrom(other.unlockedBasicTypes); + } + return this; + } + + @Override + public UnlockHeroBasicTypeScRsp mergeFrom(final UnlockHeroBasicTypeScRsp other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasRetcode()) { + setRetcode(other.retcode); + } + if (other.hasBasicType()) { + setBasicTypeValue(other.basicType); + } + if (other.hasReward()) { + getMutableReward().mergeFrom(other.reward); + } + if (other.hasUnlockedBasicTypes()) { + getMutableUnlockedBasicTypes().addAll(other.unlockedBasicTypes); + } + return this; + } + + @Override + public UnlockHeroBasicTypeScRsp clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + retcode = 0; + basicType = 0; + reward.clear(); + unlockedBasicTypes.clear(); + return this; + } + + @Override + public UnlockHeroBasicTypeScRsp clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + reward.clearQuick(); + unlockedBasicTypes.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof UnlockHeroBasicTypeScRsp)) { + return false; + } + UnlockHeroBasicTypeScRsp other = (UnlockHeroBasicTypeScRsp) o; + return bitField0_ == other.bitField0_ + && (!hasRetcode() || retcode == other.retcode) + && (!hasBasicType() || basicType == other.basicType) + && (!hasReward() || reward.equals(other.reward)) + && (!hasUnlockedBasicTypes() || unlockedBasicTypes.equals(other.unlockedBasicTypes)); + } + + @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) 64); + output.writeEnumNoTag(basicType); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 10); + output.writeMessageNoTag(reward); + } + if ((bitField0_ & 0x00000008) != 0) { + for (int i = 0; i < unlockedBasicTypes.length(); i++) { + output.writeRawByte((byte) 96); + output.writeUInt32NoTag(unlockedBasicTypes.array()[i]); + } + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeEnumSizeNoTag(basicType); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(reward); + } + if ((bitField0_ & 0x00000008) != 0) { + size += (1 * unlockedBasicTypes.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(unlockedBasicTypes); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public UnlockHeroBasicTypeScRsp mergeFrom(final ProtoSource input) throws IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 24: { + // retcode + retcode = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // basicType + final int value = input.readInt32(); + if (HeroBasicTypeOuterClass.HeroBasicType.forNumber(value) != null) { + basicType = value; + bitField0_ |= 0x00000002; + } + tag = input.readTag(); + if (tag != 10) { + break; + } + } + case 10: { + // reward + input.readMessage(reward); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 98) { + break; + } + } + case 98: { + // unlockedBasicTypes [packed=true] + input.readPackedUInt32(unlockedBasicTypes, 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 96: { + // unlockedBasicTypes [packed=false] + tag = input.readRepeatedUInt32(unlockedBasicTypes, tag); + bitField0_ |= 0x00000008; + 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.basicType, basicType, HeroBasicTypeOuterClass.HeroBasicType.converter()); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeMessage(FieldNames.reward, reward); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRepeatedUInt32(FieldNames.unlockedBasicTypes, unlockedBasicTypes); + } + output.endObject(); + } + + @Override + public UnlockHeroBasicTypeScRsp 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 -1699147640: + case -1123950421: { + if (input.isAtField(FieldNames.basicType)) { + if (!input.trySkipNullValue()) { + final HeroBasicTypeOuterClass.HeroBasicType value = input.readEnum(HeroBasicTypeOuterClass.HeroBasicType.converter()); + if (value != null) { + basicType = value.getNumber(); + bitField0_ |= 0x00000002; + } else { + input.skipUnknownEnumValue(); + } + } + } else { + input.skipUnknownField(); + } + break; + } + case -934326481: { + if (input.isAtField(FieldNames.reward)) { + if (!input.trySkipNullValue()) { + input.readMessage(reward); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 243664942: + case -212631092: { + if (input.isAtField(FieldNames.unlockedBasicTypes)) { + if (!input.trySkipNullValue()) { + input.readRepeatedUInt32(unlockedBasicTypes); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public UnlockHeroBasicTypeScRsp clone() { + return new UnlockHeroBasicTypeScRsp().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static UnlockHeroBasicTypeScRsp parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeScRsp(), data).checkInitialized(); + } + + public static UnlockHeroBasicTypeScRsp parseFrom(final ProtoSource input) throws IOException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeScRsp(), input).checkInitialized(); + } + + public static UnlockHeroBasicTypeScRsp parseFrom(final JsonSource input) throws IOException { + return ProtoMessage.mergeFrom(new UnlockHeroBasicTypeScRsp(), input).checkInitialized(); + } + + /** + * @return factory for creating UnlockHeroBasicTypeScRsp messages + */ + public static MessageFactory getFactory() { + return UnlockHeroBasicTypeScRspFactory.INSTANCE; + } + + private enum UnlockHeroBasicTypeScRspFactory implements MessageFactory { + INSTANCE; + + @Override + public UnlockHeroBasicTypeScRsp create() { + return UnlockHeroBasicTypeScRsp.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName retcode = FieldName.forField("retcode"); + + static final FieldName basicType = FieldName.forField("basicType", "basic_type"); + + static final FieldName reward = FieldName.forField("reward"); + + static final FieldName unlockedBasicTypes = FieldName.forField("unlockedBasicTypes", "unlocked_basic_types"); + } + } +} diff --git a/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UnlockPhoneThemeScNotifyOuterClass.java index 991c05d..380061f 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 = 6; + * optional uint32 theme_id = 8; */ private int themeId; @@ -34,7 +34,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 6; + * optional uint32 theme_id = 8; * @return whether the themeId field is set */ public boolean hasThemeId() { @@ -42,7 +42,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 6; + * optional uint32 theme_id = 8; * @return this */ public UnlockPhoneThemeScNotify clearThemeId() { @@ -52,7 +52,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 6; + * optional uint32 theme_id = 8; * @return the themeId */ public int getThemeId() { @@ -60,7 +60,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { } /** - * optional uint32 theme_id = 6; + * optional uint32 theme_id = 8; * @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) 48); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(themeId); } } @@ -150,7 +150,7 @@ public final class UnlockPhoneThemeScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 48: { + case 64: { // 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 b41d5c8..2dd7eec 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 = 7; + * optional uint32 point_id = 6; */ private int pointId; /** - * optional uint32 level = 8; + * optional uint32 level = 11; */ private int level; /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 15; */ private final RepeatedMessage itemList = RepeatedMessage.newEmptyInstance(ItemCostOuterClass.ItemCost.getFactory()); @@ -45,7 +45,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 7; + * optional uint32 point_id = 6; * @return whether the pointId field is set */ public boolean hasPointId() { @@ -53,7 +53,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 7; + * optional uint32 point_id = 6; * @return this */ public UnlockSkilltreeCsReq clearPointId() { @@ -63,7 +63,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 7; + * optional uint32 point_id = 6; * @return the pointId */ public int getPointId() { @@ -71,7 +71,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 point_id = 7; + * optional uint32 point_id = 6; * @param value the pointId to set * @return this */ @@ -82,7 +82,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 11; * @return whether the level field is set */ public boolean hasLevel() { @@ -90,7 +90,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 11; * @return this */ public UnlockSkilltreeCsReq clearLevel() { @@ -100,7 +100,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 11; * @return the level */ public int getLevel() { @@ -108,7 +108,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * optional uint32 level = 8; + * optional uint32 level = 11; * @param value the level to set * @return this */ @@ -119,7 +119,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 15; * @return whether the itemList field is set */ public boolean hasItemList() { @@ -127,7 +127,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 15; * @return this */ public UnlockSkilltreeCsReq clearItemList() { @@ -137,7 +137,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost 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. @@ -151,7 +151,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost 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 @@ -165,7 +165,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 15; * @param value the itemList to add * @return this */ @@ -176,7 +176,7 @@ public final class UnlockSkilltreeCsReqOuterClass { } /** - * repeated .ItemCost item_list = 5; + * repeated .ItemCost item_list = 15; * @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) 56); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(pointId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 64); + output.writeRawByte((byte) 88); output.writeUInt32NoTag(level); } if ((bitField0_ & 0x00000004) != 0) { for (int i = 0; i < itemList.length(); i++) { - output.writeRawByte((byte) 42); + output.writeRawByte((byte) 122); output.writeMessageNoTag(itemList.get(i)); } } @@ -295,25 +295,25 @@ public final class UnlockSkilltreeCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 56: { + case 48: { // pointId pointId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 64) { + if (tag != 88) { break; } } - case 64: { + case 88: { // level level = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 42) { + if (tag != 122) { break; } } - case 42: { + case 122: { // 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 f7d1f80..89ae580 100644 --- a/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UnlockSkilltreeScRspOuterClass.java @@ -19,25 +19,24 @@ public final class UnlockSkilltreeScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 base_avatar_id = 1; - */ - private int baseAvatarId; - - /** - * optional uint32 level = 9; - */ - private int level; - - /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; */ private int retcode; /** - * optional uint32 point_id = 12; + * 
+     *  uint32 base_avatar_id = 6;
+     *
+ * + * optional uint32 point_id = 5; */ private int pointId; + /** + * optional uint32 level = 8; + */ + private int level; + private UnlockSkilltreeScRsp() { } @@ -49,99 +48,25 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 base_avatar_id = 1; - * @return whether the baseAvatarId field is set + * optional uint32 retcode = 1; + * @return whether the retcode field is set */ - public boolean hasBaseAvatarId() { + public boolean hasRetcode() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 base_avatar_id = 1; - * @return this - */ - public UnlockSkilltreeScRsp clearBaseAvatarId() { - bitField0_ &= ~0x00000001; - 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 UnlockSkilltreeScRsp setBaseAvatarId(final int value) { - bitField0_ |= 0x00000001; - baseAvatarId = value; - return this; - } - - /** - * optional uint32 level = 9; - * @return whether the level field is set - */ - public boolean hasLevel() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 level = 9; - * @return this - */ - public UnlockSkilltreeScRsp clearLevel() { - bitField0_ &= ~0x00000002; - 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 UnlockSkilltreeScRsp setLevel(final int value) { - bitField0_ |= 0x00000002; - level = 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; + * optional uint32 retcode = 1; * @return this */ public UnlockSkilltreeScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000001; retcode = 0; return this; } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @return the retcode */ public int getRetcode() { @@ -149,36 +74,48 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 retcode = 11; + * optional uint32 retcode = 1; * @param value the retcode to set * @return this */ public UnlockSkilltreeScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; retcode = value; return this; } /** - * optional uint32 point_id = 12; + * 
+     *  uint32 base_avatar_id = 6;
+     *
+ * + * optional uint32 point_id = 5; * @return whether the pointId field is set */ public boolean hasPointId() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 point_id = 12; + * 
+     *  uint32 base_avatar_id = 6;
+     *
+ * + * optional uint32 point_id = 5; * @return this */ public UnlockSkilltreeScRsp clearPointId() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000002; pointId = 0; return this; } /** - * optional uint32 point_id = 12; + * 
+     *  uint32 base_avatar_id = 6;
+     *
+ * + * optional uint32 point_id = 5; * @return the pointId */ public int getPointId() { @@ -186,25 +123,65 @@ public final class UnlockSkilltreeScRspOuterClass { } /** - * optional uint32 point_id = 12; + * 
+     *  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_ |= 0x00000008; + 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; + * @return this + */ + public UnlockSkilltreeScRsp clearLevel() { + bitField0_ &= ~0x00000004; + 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 UnlockSkilltreeScRsp setLevel(final int value) { + bitField0_ |= 0x00000004; + level = value; + return this; + } + @Override public UnlockSkilltreeScRsp copyFrom(final UnlockSkilltreeScRsp other) { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - baseAvatarId = other.baseAvatarId; - level = other.level; retcode = other.retcode; pointId = other.pointId; + level = other.level; } return this; } @@ -215,18 +192,15 @@ public final class UnlockSkilltreeScRspOuterClass { return this; } cachedSize = -1; - if (other.hasBaseAvatarId()) { - setBaseAvatarId(other.baseAvatarId); - } - 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; } @@ -237,10 +211,9 @@ public final class UnlockSkilltreeScRspOuterClass { } cachedSize = -1; bitField0_ = 0; - baseAvatarId = 0; - level = 0; retcode = 0; pointId = 0; + level = 0; return this; } @@ -264,47 +237,39 @@ public final class UnlockSkilltreeScRspOuterClass { } UnlockSkilltreeScRsp other = (UnlockSkilltreeScRsp) o; return bitField0_ == other.bitField0_ - && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) - && (!hasLevel() || level == other.level) && (!hasRetcode() || retcode == other.retcode) - && (!hasPointId() || pointId == other.pointId); + && (!hasPointId() || pointId == other.pointId) + && (!hasLevel() || level == other.level); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 8); - output.writeUInt32NoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 72); - output.writeUInt32NoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 88); output.writeUInt32NoTag(retcode); } - if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 96); + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 40); output.writeUInt32NoTag(pointId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 64); + output.writeUInt32NoTag(level); + } } @Override protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(level); - } - if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(pointId); } + if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(level); + } return size; } @@ -316,36 +281,27 @@ public final class UnlockSkilltreeScRspOuterClass { while (true) { switch (tag) { case 8: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000001; - tag = input.readTag(); - if (tag != 72) { - break; - } - } - case 72: { - // level - level = input.readUInt32(); - bitField0_ |= 0x00000002; - tag = input.readTag(); - if (tag != 88) { - break; - } - } - case 88: { // retcode retcode = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 40) { break; } } - case 96: { + case 40: { // pointId pointId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 64) { + break; + } + } + case 64: { + // level + level = input.readUInt32(); + bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { break; @@ -369,17 +325,14 @@ public final class UnlockSkilltreeScRspOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.level, level); - } - if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.retcode, retcode); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000002) != 0) { output.writeUInt32(FieldNames.pointId, pointId); } + if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.level, level); + } output.endObject(); } @@ -390,34 +343,11 @@ public final class UnlockSkilltreeScRspOuterClass { } 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 102865796: { - if (input.isAtField(FieldNames.level)) { - if (!input.trySkipNullValue()) { - level = input.readUInt32(); - bitField0_ |= 0x00000002; - } - } else { - input.skipUnknownField(); - } - break; - } case 1097936398: { if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { retcode = input.readUInt32(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -429,7 +359,18 @@ public final class UnlockSkilltreeScRspOuterClass { if (input.isAtField(FieldNames.pointId)) { if (!input.trySkipNullValue()) { pointId = input.readUInt32(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case 102865796: { + if (input.isAtField(FieldNames.level)) { + if (!input.trySkipNullValue()) { + level = input.readUInt32(); + bitField0_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -489,13 +430,11 @@ public final class UnlockSkilltreeScRspOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); - - 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 a0d9925..9fd7286 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 = 4; + * optional uint32 id = 1; */ private int id; /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 2; */ private int groupId; /** - * optional bool unkbool = 3; + * optional bool unkbool = 13; */ private boolean unkbool; @@ -44,7 +44,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 1; * @return whether the id field is set */ public boolean hasId() { @@ -52,7 +52,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 1; * @return this */ public UnlockedMusic clearId() { @@ -62,7 +62,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 1; * @return the id */ public int getId() { @@ -70,7 +70,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 id = 4; + * optional uint32 id = 1; * @param value the id to set * @return this */ @@ -81,7 +81,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 2; * @return whether the groupId field is set */ public boolean hasGroupId() { @@ -89,7 +89,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 2; * @return this */ public UnlockedMusic clearGroupId() { @@ -99,7 +99,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 2; * @return the groupId */ public int getGroupId() { @@ -107,7 +107,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional uint32 group_id = 10; + * optional uint32 group_id = 2; * @param value the groupId to set * @return this */ @@ -118,7 +118,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 3; + * optional bool unkbool = 13; * @return whether the unkbool field is set */ public boolean hasUnkbool() { @@ -126,7 +126,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 3; + * optional bool unkbool = 13; * @return this */ public UnlockedMusic clearUnkbool() { @@ -136,7 +136,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 3; + * optional bool unkbool = 13; * @return the unkbool */ public boolean getUnkbool() { @@ -144,7 +144,7 @@ public final class UnlockedMusicOuterClass { } /** - * optional bool unkbool = 3; + * optional bool unkbool = 13; * @param value the unkbool to set * @return this */ @@ -225,15 +225,15 @@ public final class UnlockedMusicOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 32); + output.writeRawByte((byte) 8); output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 16); output.writeUInt32NoTag(groupId); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 104); output.writeBoolNoTag(unkbool); } } @@ -260,25 +260,25 @@ public final class UnlockedMusicOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 32: { + case 8: { // id id = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 80) { + if (tag != 16) { break; } } - case 80: { + case 16: { // groupId groupId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 24) { + if (tag != 104) { break; } } - case 24: { + case 104: { // unkbool unkbool = input.readBool(); bitField0_ |= 0x00000004; diff --git a/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java index 2ec77d3..048aed0 100644 --- a/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UpdateEnergyScNotifyOuterClass.java @@ -19,7 +19,7 @@ public final class UpdateEnergyScNotifyOuterClass { private static final long serialVersionUID = 0L; /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_info = 12; */ private final RotatorEnergyInfoOuterClass.RotatorEnergyInfo energyInfo = RotatorEnergyInfoOuterClass.RotatorEnergyInfo.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_info = 12; * @return whether the energyInfo field is set */ public boolean hasEnergyInfo() { @@ -42,7 +42,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_info = 12; * @return this */ public UpdateEnergyScNotify clearEnergyInfo() { @@ -52,7 +52,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_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. @@ -66,7 +66,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_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 @@ -80,7 +80,7 @@ public final class UpdateEnergyScNotifyOuterClass { } /** - * optional .RotatorEnergyInfo energy_info = 11; + * optional .RotatorEnergyInfo energy_info = 12; * @param value the energyInfo to set * @return this */ @@ -151,7 +151,7 @@ public final class UpdateEnergyScNotifyOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 90); + output.writeRawByte((byte) 98); output.writeMessageNoTag(energyInfo); } } @@ -172,7 +172,7 @@ public final class UpdateEnergyScNotifyOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 90: { + case 98: { // energyInfo input.readMessage(energyInfo); bitField0_ |= 0x00000001; diff --git a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataCsReqOuterClass.java index c9e2bdd..cef7f28 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 = 8; + * optional .ServerPrefs server_prefs = 14; */ private final ServerPrefsOuterClass.ServerPrefs serverPrefs = ServerPrefsOuterClass.ServerPrefs.newInstance(); @@ -34,7 +34,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 8; + * optional .ServerPrefs server_prefs = 14; * @return whether the serverPrefs field is set */ public boolean hasServerPrefs() { @@ -42,7 +42,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 8; + * optional .ServerPrefs server_prefs = 14; * @return this */ public UpdateServerPrefsDataCsReq clearServerPrefs() { @@ -52,7 +52,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 8; + * optional .ServerPrefs server_prefs = 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 UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 8; + * optional .ServerPrefs server_prefs = 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 UpdateServerPrefsDataCsReqOuterClass { } /** - * optional .ServerPrefs server_prefs = 8; + * optional .ServerPrefs server_prefs = 14; * @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) 66); + output.writeRawByte((byte) 114); output.writeMessageNoTag(serverPrefs); } } @@ -172,7 +172,7 @@ public final class UpdateServerPrefsDataCsReqOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 66: { + case 114: { // 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 5d26a2f..b6650d8 100644 --- a/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UpdateServerPrefsDataScRspOuterClass.java @@ -19,16 +19,12 @@ public final class UpdateServerPrefsDataScRspOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 server_prefs_id = 1; + * optional uint32 server_prefs_id = 6; */ private int serverPrefsId; /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; */ private int retcode; @@ -43,7 +39,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 1; + * optional uint32 server_prefs_id = 6; * @return whether the serverPrefsId field is set */ public boolean hasServerPrefsId() { @@ -51,7 +47,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 1; + * optional uint32 server_prefs_id = 6; * @return this */ public UpdateServerPrefsDataScRsp clearServerPrefsId() { @@ -61,7 +57,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 1; + * optional uint32 server_prefs_id = 6; * @return the serverPrefsId */ public int getServerPrefsId() { @@ -69,7 +65,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * optional uint32 server_prefs_id = 1; + * optional uint32 server_prefs_id = 6; * @param value the serverPrefsId to set * @return this */ @@ -80,11 +76,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return whether the retcode field is set */ public boolean hasRetcode() { @@ -92,11 +84,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return this */ public UpdateServerPrefsDataScRsp clearRetcode() { @@ -106,11 +94,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @return the retcode */ public int getRetcode() { @@ -118,11 +102,7 @@ public final class UpdateServerPrefsDataScRspOuterClass { } /** - * 
-     *  PDBKKNJFBAJ FDAJEIDNMAK = 9;
-     *
- * - * optional uint32 retcode = 3; + * optional uint32 retcode = 8; * @param value the retcode to set * @return this */ @@ -197,11 +177,11 @@ public final class UpdateServerPrefsDataScRspOuterClass { @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 8); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(serverPrefsId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 64); output.writeUInt32NoTag(retcode); } } @@ -225,16 +205,16 @@ public final class UpdateServerPrefsDataScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 8: { + case 48: { // serverPrefsId serverPrefsId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 64) { break; } } - case 24: { + case 64: { // retcode retcode = input.readUInt32(); bitField0_ |= 0x00000002; diff --git a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java index 19dcac8..d98e336 100644 --- a/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/UseItemCsReqOuterClass.java @@ -19,27 +19,27 @@ public final class UseItemCsReqOuterClass { private static final long serialVersionUID = 0L; /** - * optional uint32 use_item_id = 4; - */ - private int useItemId; - - /** - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 4; */ private int optionalRewardId; /** - * optional uint32 base_avatar_id = 13; + * optional uint32 use_item_id = 7; + */ + private int useItemId; + + /** + * optional uint32 base_avatar_id = 10; */ private int baseAvatarId; /** - * optional uint32 use_item_count = 14; + * optional uint32 use_item_count = 13; */ private int useItemCount; /** - * optional .AvatarType use_avatar_type = 9; + * optional .AvatarType use_avatar_type = 8; */ private int useAvatarType; @@ -54,62 +54,25 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_id = 4; - * @return whether the useItemId field is set + * optional uint32 optional_reward_id = 4; + * @return whether the optionalRewardId field is set */ - public boolean hasUseItemId() { + public boolean hasOptionalRewardId() { return (bitField0_ & 0x00000001) != 0; } /** - * optional uint32 use_item_id = 4; - * @return this - */ - public UseItemCsReq clearUseItemId() { - bitField0_ &= ~0x00000001; - useItemId = 0; - return this; - } - - /** - * optional uint32 use_item_id = 4; - * @return the useItemId - */ - public int getUseItemId() { - return useItemId; - } - - /** - * optional uint32 use_item_id = 4; - * @param value the useItemId to set - * @return this - */ - public UseItemCsReq setUseItemId(final int value) { - bitField0_ |= 0x00000001; - useItemId = value; - return this; - } - - /** - * optional uint32 optional_reward_id = 5; - * @return whether the optionalRewardId field is set - */ - public boolean hasOptionalRewardId() { - return (bitField0_ & 0x00000002) != 0; - } - - /** - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 4; * @return this */ public UseItemCsReq clearOptionalRewardId() { - bitField0_ &= ~0x00000002; + bitField0_ &= ~0x00000001; optionalRewardId = 0; return this; } /** - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 4; * @return the optionalRewardId */ public int getOptionalRewardId() { @@ -117,18 +80,55 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 optional_reward_id = 5; + * optional uint32 optional_reward_id = 4; * @param value the optionalRewardId to set * @return this */ public UseItemCsReq setOptionalRewardId(final int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; optionalRewardId = value; return this; } /** - * optional uint32 base_avatar_id = 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 UseItemCsReq 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 UseItemCsReq setUseItemId(final int value) { + bitField0_ |= 0x00000002; + useItemId = value; + return this; + } + + /** + * optional uint32 base_avatar_id = 10; * @return whether the baseAvatarId field is set */ public boolean hasBaseAvatarId() { @@ -136,7 +136,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 10; * @return this */ public UseItemCsReq clearBaseAvatarId() { @@ -146,7 +146,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 10; * @return the baseAvatarId */ public int getBaseAvatarId() { @@ -154,7 +154,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 base_avatar_id = 13; + * optional uint32 base_avatar_id = 10; * @param value the baseAvatarId to set * @return this */ @@ -165,7 +165,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 14; + * optional uint32 use_item_count = 13; * @return whether the useItemCount field is set */ public boolean hasUseItemCount() { @@ -173,7 +173,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 14; + * optional uint32 use_item_count = 13; * @return this */ public UseItemCsReq clearUseItemCount() { @@ -183,7 +183,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 14; + * optional uint32 use_item_count = 13; * @return the useItemCount */ public int getUseItemCount() { @@ -191,7 +191,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional uint32 use_item_count = 14; + * optional uint32 use_item_count = 13; * @param value the useItemCount to set * @return this */ @@ -202,7 +202,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 9; + * optional .AvatarType use_avatar_type = 8; * @return whether the useAvatarType field is set */ public boolean hasUseAvatarType() { @@ -210,7 +210,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 9; + * optional .AvatarType use_avatar_type = 8; * @return this */ public UseItemCsReq clearUseAvatarType() { @@ -220,7 +220,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 9; + * optional .AvatarType use_avatar_type = 8; * @return the useAvatarType */ public AvatarTypeOuterClass.AvatarType getUseAvatarType() { @@ -253,7 +253,7 @@ public final class UseItemCsReqOuterClass { } /** - * optional .AvatarType use_avatar_type = 9; + * optional .AvatarType use_avatar_type = 8; * @param value the useAvatarType to set * @return this */ @@ -268,8 +268,8 @@ public final class UseItemCsReqOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - useItemId = other.useItemId; optionalRewardId = other.optionalRewardId; + useItemId = other.useItemId; baseAvatarId = other.baseAvatarId; useItemCount = other.useItemCount; useAvatarType = other.useAvatarType; @@ -283,12 +283,12 @@ public final class UseItemCsReqOuterClass { return this; } cachedSize = -1; - if (other.hasUseItemId()) { - setUseItemId(other.useItemId); - } if (other.hasOptionalRewardId()) { setOptionalRewardId(other.optionalRewardId); } + if (other.hasUseItemId()) { + setUseItemId(other.useItemId); + } if (other.hasBaseAvatarId()) { setBaseAvatarId(other.baseAvatarId); } @@ -308,8 +308,8 @@ public final class UseItemCsReqOuterClass { } cachedSize = -1; bitField0_ = 0; - useItemId = 0; optionalRewardId = 0; + useItemId = 0; baseAvatarId = 0; useItemCount = 0; useAvatarType = 0; @@ -336,8 +336,8 @@ public final class UseItemCsReqOuterClass { } UseItemCsReq other = (UseItemCsReq) o; return bitField0_ == other.bitField0_ - && (!hasUseItemId() || useItemId == other.useItemId) && (!hasOptionalRewardId() || optionalRewardId == other.optionalRewardId) + && (!hasUseItemId() || useItemId == other.useItemId) && (!hasBaseAvatarId() || baseAvatarId == other.baseAvatarId) && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasUseAvatarType() || useAvatarType == other.useAvatarType); @@ -347,22 +347,22 @@ public final class UseItemCsReqOuterClass { public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { output.writeRawByte((byte) 32); - output.writeUInt32NoTag(useItemId); - } - if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 40); output.writeUInt32NoTag(optionalRewardId); } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 56); + output.writeUInt32NoTag(useItemId); + } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 104); + output.writeRawByte((byte) 80); output.writeUInt32NoTag(baseAvatarId); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 112); + output.writeRawByte((byte) 104); output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000010) != 0) { - output.writeRawByte((byte) 72); + output.writeRawByte((byte) 64); output.writeEnumNoTag(useAvatarType); } } @@ -371,10 +371,10 @@ public final class UseItemCsReqOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(optionalRewardId); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000004) != 0) { size += 1 + ProtoSink.computeUInt32SizeNoTag(baseAvatarId); @@ -396,42 +396,42 @@ public final class UseItemCsReqOuterClass { while (true) { switch (tag) { case 32: { - // useItemId - useItemId = input.readUInt32(); + // optionalRewardId + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 40) { + if (tag != 56) { break; } } - case 40: { - // optionalRewardId - optionalRewardId = input.readUInt32(); + case 56: { + // useItemId + useItemId = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 80) { + break; + } + } + case 80: { + // baseAvatarId + baseAvatarId = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 104) { break; } } case 104: { - // baseAvatarId - baseAvatarId = input.readUInt32(); - bitField0_ |= 0x00000004; - tag = input.readTag(); - if (tag != 112) { - break; - } - } - case 112: { // useItemCount useItemCount = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); - if (tag != 72) { + if (tag != 64) { break; } } - case 72: { + case 64: { // useAvatarType final int value = input.readInt32(); if (AvatarTypeOuterClass.AvatarType.forNumber(value) != null) { @@ -461,10 +461,10 @@ public final class UseItemCsReqOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeUInt32(FieldNames.useItemId, useItemId); + output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.optionalRewardId, optionalRewardId); + output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000004) != 0) { output.writeUInt32(FieldNames.baseAvatarId, baseAvatarId); @@ -485,11 +485,11 @@ public final class UseItemCsReqOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case -815318027: - case 1396027151: { - if (input.isAtField(FieldNames.useItemId)) { + case -1391749078: + case -1451381236: { + if (input.isAtField(FieldNames.optionalRewardId)) { if (!input.trySkipNullValue()) { - useItemId = input.readUInt32(); + optionalRewardId = input.readUInt32(); bitField0_ |= 0x00000001; } } else { @@ -497,11 +497,11 @@ public final class UseItemCsReqOuterClass { } break; } - case -1391749078: - case -1451381236: { - if (input.isAtField(FieldNames.optionalRewardId)) { + case -815318027: + case 1396027151: { + if (input.isAtField(FieldNames.useItemId)) { if (!input.trySkipNullValue()) { - optionalRewardId = input.readUInt32(); + useItemId = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -602,10 +602,10 @@ public final class UseItemCsReqOuterClass { * Contains name constants used for serializing JSON */ static class FieldNames { - static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); - static final FieldName optionalRewardId = FieldName.forField("optionalRewardId", "optional_reward_id"); + static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); + static final FieldName baseAvatarId = FieldName.forField("baseAvatarId", "base_avatar_id"); static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); diff --git a/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java b/src/generated/main/emu/lunarcore/proto/UseItemScRspOuterClass.java index 6810aee..628d8e7 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 = 10; + * optional uint32 use_item_id = 6; */ private int useItemId; /** - * optional uint32 use_item_count = 12; - */ - private int useItemCount; - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; */ private int retcode; /** - * optional .ItemList return_data = 7; + * optional uint32 use_item_count = 13; + */ + private int useItemCount; + + /** + * optional .ItemList return_data = 4; */ private final ItemListOuterClass.ItemList returnData = ItemListOuterClass.ItemList.newInstance(); @@ -49,7 +49,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 10; + * optional uint32 use_item_id = 6; * @return whether the useItemId field is set */ public boolean hasUseItemId() { @@ -57,7 +57,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 10; + * optional uint32 use_item_id = 6; * @return this */ public UseItemScRsp clearUseItemId() { @@ -67,7 +67,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 10; + * optional uint32 use_item_id = 6; * @return the useItemId */ public int getUseItemId() { @@ -75,7 +75,7 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_id = 10; + * optional uint32 use_item_id = 6; * @param value the useItemId to set * @return this */ @@ -86,62 +86,25 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 use_item_count = 12; - * @return whether the useItemCount field is set + * optional uint32 retcode = 9; + * @return whether the retcode field is set */ - public boolean hasUseItemCount() { + public boolean hasRetcode() { return (bitField0_ & 0x00000002) != 0; } /** - * optional uint32 use_item_count = 12; - * @return this - */ - public UseItemScRsp clearUseItemCount() { - bitField0_ &= ~0x00000002; - useItemCount = 0; - return this; - } - - /** - * optional uint32 use_item_count = 12; - * @return the useItemCount - */ - public int getUseItemCount() { - return useItemCount; - } - - /** - * optional uint32 use_item_count = 12; - * @param value the useItemCount to set - * @return this - */ - public UseItemScRsp setUseItemCount(final int value) { - bitField0_ |= 0x00000002; - useItemCount = value; - return this; - } - - /** - * optional uint32 retcode = 13; - * @return whether the retcode field is set - */ - public boolean hasRetcode() { - return (bitField0_ & 0x00000004) != 0; - } - - /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return this */ public UseItemScRsp clearRetcode() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000002; retcode = 0; return this; } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @return the retcode */ public int getRetcode() { @@ -149,18 +112,55 @@ public final class UseItemScRspOuterClass { } /** - * optional uint32 retcode = 13; + * optional uint32 retcode = 9; * @param value the retcode to set * @return this */ public UseItemScRsp setRetcode(final int value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; retcode = value; return this; } /** - * optional .ItemList return_data = 7; + * optional uint32 use_item_count = 13; + * @return whether the useItemCount field is set + */ + public boolean hasUseItemCount() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 use_item_count = 13; + * @return this + */ + public UseItemScRsp clearUseItemCount() { + bitField0_ &= ~0x00000004; + useItemCount = 0; + return this; + } + + /** + * optional uint32 use_item_count = 13; + * @return the useItemCount + */ + public int getUseItemCount() { + return useItemCount; + } + + /** + * optional uint32 use_item_count = 13; + * @param value the useItemCount to set + * @return this + */ + public UseItemScRsp setUseItemCount(final int value) { + bitField0_ |= 0x00000004; + useItemCount = value; + return this; + } + + /** + * optional .ItemList return_data = 4; * @return whether the returnData field is set */ public boolean hasReturnData() { @@ -168,7 +168,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 7; + * optional .ItemList return_data = 4; * @return this */ public UseItemScRsp clearReturnData() { @@ -178,7 +178,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 7; + * optional .ItemList return_data = 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. @@ -192,7 +192,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 7; + * optional .ItemList return_data = 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 @@ -206,7 +206,7 @@ public final class UseItemScRspOuterClass { } /** - * optional .ItemList return_data = 7; + * optional .ItemList return_data = 4; * @param value the returnData to set * @return this */ @@ -222,8 +222,8 @@ public final class UseItemScRspOuterClass { if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; useItemId = other.useItemId; - useItemCount = other.useItemCount; retcode = other.retcode; + useItemCount = other.useItemCount; returnData.copyFrom(other.returnData); } return this; @@ -238,12 +238,12 @@ public final class UseItemScRspOuterClass { if (other.hasUseItemId()) { setUseItemId(other.useItemId); } - if (other.hasUseItemCount()) { - setUseItemCount(other.useItemCount); - } if (other.hasRetcode()) { setRetcode(other.retcode); } + if (other.hasUseItemCount()) { + setUseItemCount(other.useItemCount); + } if (other.hasReturnData()) { getMutableReturnData().mergeFrom(other.returnData); } @@ -258,8 +258,8 @@ public final class UseItemScRspOuterClass { cachedSize = -1; bitField0_ = 0; useItemId = 0; - useItemCount = 0; retcode = 0; + useItemCount = 0; returnData.clear(); return this; } @@ -286,27 +286,27 @@ public final class UseItemScRspOuterClass { UseItemScRsp other = (UseItemScRsp) o; return bitField0_ == other.bitField0_ && (!hasUseItemId() || useItemId == other.useItemId) - && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasRetcode() || retcode == other.retcode) + && (!hasUseItemCount() || useItemCount == other.useItemCount) && (!hasReturnData() || returnData.equals(other.returnData)); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 80); + output.writeRawByte((byte) 48); output.writeUInt32NoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 96); - output.writeUInt32NoTag(useItemCount); + output.writeRawByte((byte) 72); + output.writeUInt32NoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { output.writeRawByte((byte) 104); - output.writeUInt32NoTag(retcode); + output.writeUInt32NoTag(useItemCount); } if ((bitField0_ & 0x00000008) != 0) { - output.writeRawByte((byte) 58); + output.writeRawByte((byte) 34); output.writeMessageNoTag(returnData); } } @@ -318,10 +318,10 @@ public final class UseItemScRspOuterClass { size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemId); } if ((bitField0_ & 0x00000002) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); + size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeUInt32SizeNoTag(retcode); + size += 1 + ProtoSink.computeUInt32SizeNoTag(useItemCount); } if ((bitField0_ & 0x00000008) != 0) { size += 1 + ProtoSink.computeMessageSizeNoTag(returnData); @@ -336,18 +336,18 @@ public final class UseItemScRspOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 80: { + case 48: { // useItemId useItemId = input.readUInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 96) { + if (tag != 72) { break; } } - case 96: { - // useItemCount - useItemCount = input.readUInt32(); + case 72: { + // retcode + retcode = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); if (tag != 104) { @@ -355,15 +355,15 @@ public final class UseItemScRspOuterClass { } } case 104: { - // retcode - retcode = input.readUInt32(); + // useItemCount + useItemCount = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); - if (tag != 58) { + if (tag != 34) { break; } } - case 58: { + case 34: { // returnData input.readMessage(returnData); bitField0_ |= 0x00000008; @@ -393,10 +393,10 @@ public final class UseItemScRspOuterClass { output.writeUInt32(FieldNames.useItemId, useItemId); } if ((bitField0_ & 0x00000002) != 0) { - output.writeUInt32(FieldNames.useItemCount, useItemCount); + output.writeUInt32(FieldNames.retcode, retcode); } if ((bitField0_ & 0x00000004) != 0) { - output.writeUInt32(FieldNames.retcode, retcode); + output.writeUInt32(FieldNames.useItemCount, useItemCount); } if ((bitField0_ & 0x00000008) != 0) { output.writeMessage(FieldNames.returnData, returnData); @@ -423,11 +423,10 @@ public final class UseItemScRspOuterClass { } break; } - case -1104380939: - case 871430811: { - if (input.isAtField(FieldNames.useItemCount)) { + case 1097936398: { + if (input.isAtField(FieldNames.retcode)) { if (!input.trySkipNullValue()) { - useItemCount = input.readUInt32(); + retcode = input.readUInt32(); bitField0_ |= 0x00000002; } } else { @@ -435,10 +434,11 @@ public final class UseItemScRspOuterClass { } break; } - case 1097936398: { - if (input.isAtField(FieldNames.retcode)) { + case -1104380939: + case 871430811: { + if (input.isAtField(FieldNames.useItemCount)) { if (!input.trySkipNullValue()) { - retcode = input.readUInt32(); + useItemCount = input.readUInt32(); bitField0_ |= 0x00000004; } } else { @@ -512,10 +512,10 @@ public final class UseItemScRspOuterClass { static class FieldNames { static final FieldName useItemId = FieldName.forField("useItemId", "use_item_id"); - static final FieldName useItemCount = FieldName.forField("useItemCount", "use_item_count"); - static final FieldName retcode = FieldName.forField("retcode"); + 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 43ad2e8..a57ef28 100644 --- a/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java +++ b/src/generated/main/emu/lunarcore/proto/VectorOuterClass.java @@ -19,19 +19,19 @@ public final class VectorOuterClass { private static final long serialVersionUID = 0L; /** - * optional sint32 x = 2; + * optional sint32 z = 8; */ - private int x; + private int z; /** - * optional sint32 y = 3; + * optional sint32 y = 10; */ private int y; /** - * optional sint32 z = 4; + * optional sint32 x = 12; */ - private int z; + private int x; private Vector() { } @@ -44,44 +44,44 @@ public final class VectorOuterClass { } /** - * optional sint32 x = 2; - * @return whether the x field is set + * optional sint32 z = 8; + * @return whether the z field is set */ - public boolean hasX() { + public boolean hasZ() { return (bitField0_ & 0x00000001) != 0; } /** - * optional sint32 x = 2; + * optional sint32 z = 8; * @return this */ - public Vector clearX() { + public Vector clearZ() { bitField0_ &= ~0x00000001; - x = 0; + z = 0; return this; } /** - * optional sint32 x = 2; - * @return the x + * optional sint32 z = 8; + * @return the z */ - public int getX() { - return x; + public int getZ() { + return z; } /** - * optional sint32 x = 2; - * @param value the x to set + * optional sint32 z = 8; + * @param value the z to set * @return this */ - public Vector setX(final int value) { + public Vector setZ(final int value) { bitField0_ |= 0x00000001; - x = value; + z = value; return this; } /** - * optional sint32 y = 3; + * optional sint32 y = 10; * @return whether the y field is set */ public boolean hasY() { @@ -89,7 +89,7 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 3; + * optional sint32 y = 10; * @return this */ public Vector clearY() { @@ -99,7 +99,7 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 3; + * optional sint32 y = 10; * @return the y */ public int getY() { @@ -107,7 +107,7 @@ public final class VectorOuterClass { } /** - * optional sint32 y = 3; + * optional sint32 y = 10; * @param value the y to set * @return this */ @@ -118,39 +118,39 @@ public final class VectorOuterClass { } /** - * optional sint32 z = 4; - * @return whether the z field is set + * optional sint32 x = 12; + * @return whether the x field is set */ - public boolean hasZ() { + public boolean hasX() { return (bitField0_ & 0x00000004) != 0; } /** - * optional sint32 z = 4; + * optional sint32 x = 12; * @return this */ - public Vector clearZ() { + public Vector clearX() { bitField0_ &= ~0x00000004; - z = 0; + x = 0; return this; } /** - * optional sint32 z = 4; - * @return the z + * optional sint32 x = 12; + * @return the x */ - public int getZ() { - return z; + public int getX() { + return x; } /** - * optional sint32 z = 4; - * @param value the z to set + * optional sint32 x = 12; + * @param value the x to set * @return this */ - public Vector setZ(final int value) { + public Vector setX(final int value) { bitField0_ |= 0x00000004; - z = value; + x = value; return this; } @@ -159,9 +159,9 @@ public final class VectorOuterClass { cachedSize = other.cachedSize; if ((bitField0_ | other.bitField0_) != 0) { bitField0_ = other.bitField0_; - x = other.x; - y = other.y; z = other.z; + y = other.y; + x = other.x; } return this; } @@ -172,14 +172,14 @@ public final class VectorOuterClass { return this; } cachedSize = -1; - if (other.hasX()) { - setX(other.x); + if (other.hasZ()) { + setZ(other.z); } if (other.hasY()) { setY(other.y); } - if (other.hasZ()) { - setZ(other.z); + if (other.hasX()) { + setX(other.x); } return this; } @@ -191,9 +191,9 @@ public final class VectorOuterClass { } cachedSize = -1; bitField0_ = 0; - x = 0; - y = 0; z = 0; + y = 0; + x = 0; return this; } @@ -217,24 +217,24 @@ public final class VectorOuterClass { } Vector other = (Vector) o; return bitField0_ == other.bitField0_ - && (!hasX() || x == other.x) + && (!hasZ() || z == other.z) && (!hasY() || y == other.y) - && (!hasZ() || z == other.z); + && (!hasX() || x == other.x); } @Override public void writeTo(final ProtoSink output) throws IOException { if ((bitField0_ & 0x00000001) != 0) { - output.writeRawByte((byte) 16); - output.writeSInt32NoTag(x); + output.writeRawByte((byte) 64); + output.writeSInt32NoTag(z); } if ((bitField0_ & 0x00000002) != 0) { - output.writeRawByte((byte) 24); + output.writeRawByte((byte) 80); output.writeSInt32NoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeRawByte((byte) 32); - output.writeSInt32NoTag(z); + output.writeRawByte((byte) 96); + output.writeSInt32NoTag(x); } } @@ -242,13 +242,13 @@ public final class VectorOuterClass { protected int computeSerializedSize() { int size = 0; if ((bitField0_ & 0x00000001) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(x); + size += 1 + ProtoSink.computeSInt32SizeNoTag(z); } if ((bitField0_ & 0x00000002) != 0) { size += 1 + ProtoSink.computeSInt32SizeNoTag(y); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeSInt32SizeNoTag(z); + size += 1 + ProtoSink.computeSInt32SizeNoTag(x); } return size; } @@ -260,27 +260,27 @@ public final class VectorOuterClass { int tag = input.readTag(); while (true) { switch (tag) { - case 16: { - // x - x = input.readSInt32(); + case 64: { + // z + z = input.readSInt32(); bitField0_ |= 0x00000001; tag = input.readTag(); - if (tag != 24) { + if (tag != 80) { break; } } - case 24: { + case 80: { // y y = input.readSInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); - if (tag != 32) { + if (tag != 96) { break; } } - case 32: { - // z - z = input.readSInt32(); + case 96: { + // x + x = input.readSInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); if (tag != 0) { @@ -305,13 +305,13 @@ public final class VectorOuterClass { public void writeTo(final JsonSink output) throws IOException { output.beginObject(); if ((bitField0_ & 0x00000001) != 0) { - output.writeSInt32(FieldNames.x, x); + output.writeSInt32(FieldNames.z, z); } if ((bitField0_ & 0x00000002) != 0) { output.writeSInt32(FieldNames.y, y); } if ((bitField0_ & 0x00000004) != 0) { - output.writeSInt32(FieldNames.z, z); + output.writeSInt32(FieldNames.x, x); } output.endObject(); } @@ -323,10 +323,10 @@ public final class VectorOuterClass { } while (!input.isAtEnd()) { switch (input.readFieldHash()) { - case 120: { - if (input.isAtField(FieldNames.x)) { + case 122: { + if (input.isAtField(FieldNames.z)) { if (!input.trySkipNullValue()) { - x = input.readSInt32(); + z = input.readSInt32(); bitField0_ |= 0x00000001; } } else { @@ -345,10 +345,10 @@ public final class VectorOuterClass { } break; } - case 122: { - if (input.isAtField(FieldNames.z)) { + case 120: { + if (input.isAtField(FieldNames.x)) { if (!input.trySkipNullValue()) { - z = input.readSInt32(); + x = 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 x = FieldName.forField("x"); + static final FieldName z = FieldName.forField("z"); static final FieldName y = FieldName.forField("y"); - static final FieldName z = FieldName.forField("z"); + static final FieldName x = FieldName.forField("x"); } } } diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java index 4b73b8e..66f2174 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.2.0"; + public static String VERSION = "2.3.0"; public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now()); public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600; @@ -53,6 +53,7 @@ public class GameConstants { // Challenge public static final int CHALLENGE_ENTRANCE = 100000103; public static final int CHALLENGE_STORY_ENTRANCE = 102020107; + public static final int CHALLENGE_BOSS_ENTRANCE = 1030402; // Rogue public static final boolean ENABLE_ROGUE = true; diff --git a/src/main/java/emu/lunarcore/command/commands/SceneCommand.java b/src/main/java/emu/lunarcore/command/commands/SceneCommand.java index b0164b0..c3e1e5d 100644 --- a/src/main/java/emu/lunarcore/command/commands/SceneCommand.java +++ b/src/main/java/emu/lunarcore/command/commands/SceneCommand.java @@ -36,10 +36,7 @@ public class SceneCommand implements CommandHandler { return; } - int startGroup = floor.getStartGroupID(); - int anchorId = floor.getStartAnchorID(); - - AnchorInfo anchor = floor.getAnchorInfo(startGroup, anchorId); + AnchorInfo anchor = floor.getStartAnchorInfo(); if (anchor == null) { args.sendMessage("Error: Floor info not found"); return; diff --git a/src/main/java/emu/lunarcore/data/GameData.java b/src/main/java/emu/lunarcore/data/GameData.java index 256c199..183c060 100644 --- a/src/main/java/emu/lunarcore/data/GameData.java +++ b/src/main/java/emu/lunarcore/data/GameData.java @@ -42,6 +42,7 @@ public class GameData { @Getter private static Int2ObjectMap textJoinExcelMap = new Int2ObjectLinkedOpenHashMap<>(); @Getter private static Int2ObjectMap chatBubbleExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap phoneThemeExcelMap = new Int2ObjectOpenHashMap<>(); + @Getter private static Int2ObjectMap contentPackageExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap challengeGroupExcelMap = new Int2ObjectOpenHashMap<>(); @Getter private static Int2ObjectMap challengeExcelMap = new Int2ObjectOpenHashMap<>(); diff --git a/src/main/java/emu/lunarcore/data/ResourceLoader.java b/src/main/java/emu/lunarcore/data/ResourceLoader.java index 6f7102f..f9601ef 100644 --- a/src/main/java/emu/lunarcore/data/ResourceLoader.java +++ b/src/main/java/emu/lunarcore/data/ResourceLoader.java @@ -207,15 +207,15 @@ public class ResourceLoader { } } - // Might be better to cache + // Might be better to cache private static void loadFloorInfos() { // Load floor infos LunarCore.getLogger().info("Loading floor infos... this may take a while."); - File floorDir = new File(LunarCore.getConfig().getResourceDir() + "/Config/LevelOutput/Floor/"); + File floorDir = new File(LunarCore.getConfig().getResourceDir() + "/Config/LevelOutput/RuntimeFloor/"); boolean missingGroupInfos = false; if (!floorDir.exists()) { - LunarCore.getLogger().warn("Floor infos are missing, please check your resources folder: {resources}/Config/LevelOutput/Floor. Teleports and natural world spawns may not work!"); + LunarCore.getLogger().warn("Floor infos are missing, please check your resources folder: {resources}/Config/LevelOutput/RuntimeFloor. Teleports and natural world spawns may not work!"); return; } @@ -247,6 +247,7 @@ public class ResourceLoader { GroupInfo group = gson.fromJson(reader, GroupInfo.class); group.setId(simpleGroup.getID()); + floor.getGroupList().add(group); floor.getGroups().put(simpleGroup.getID(), group); } catch (Exception e) { e.printStackTrace(); @@ -265,7 +266,7 @@ public class ResourceLoader { // Notify the server owner if we are missing any files if (missingGroupInfos) { - LunarCore.getLogger().warn("Group infos are missing, please check your resources folder: {resources}/Config/LevelOutput/Group. Teleports, monster battles, and natural world spawns may not work!"); + LunarCore.getLogger().warn("Group infos are missing, please check your resources folder: {resources}/Config/LevelOutput/SharedRuntimeGroup. Teleports, monster battles, and natural world spawns may not work!"); } // Done diff --git a/src/main/java/emu/lunarcore/data/config/FloorInfo.java b/src/main/java/emu/lunarcore/data/config/FloorInfo.java index 73c9006..2161142 100644 --- a/src/main/java/emu/lunarcore/data/config/FloorInfo.java +++ b/src/main/java/emu/lunarcore/data/config/FloorInfo.java @@ -18,37 +18,64 @@ import lombok.Getter; @Getter public class FloorInfo { private int FloorID; - private int StartGroupID; + private int StartGroupIndex; private int StartAnchorID; + + @SerializedName(value = "SavedValues") + private List savedValues; - @SerializedName(value = "GroupList") + @SerializedName(value = "GroupInstanceList") private List SimpleGroupList; // Cached data private transient boolean loaded; + private transient List groupList; private transient Int2ObjectMap groups; private transient Int2ObjectMap cachedTeleports; private transient List unlockedCheckpoints; // DEBUG public FloorInfo() { + this.groupList = new ArrayList<>(); this.groups = new Int2ObjectOpenHashMap<>(); this.cachedTeleports = new Int2ObjectOpenHashMap<>(); this.unlockedCheckpoints = new ArrayList<>(); + this.savedValues = new ArrayList<>(); + } + + public GroupInfo getGroupInfoByIndex(int groupIndex) { + return groupList.get(groupIndex); } public AnchorInfo getStartAnchorInfo() { - return getAnchorInfo(StartGroupID, StartAnchorID); + GroupInfo group = this.getGroupInfoByIndex(StartGroupIndex); + if (group == null) return null; + + return getAnchorInfo(group, StartAnchorID); + } + + public List getExtraDatas() { + if (this.savedValues == null) { + this.savedValues = new ArrayList<>(); + } + + return this.savedValues; } public AnchorInfo getAnchorInfo(int groupId, int anchorId) { GroupInfo group = this.getGroups().get(groupId); if (group == null) return null; + return getAnchorInfo(group, anchorId); + } + + public AnchorInfo getAnchorInfo(GroupInfo group, int anchorId) { return group.getAnchorList().stream().filter(a -> a.getID() == anchorId).findFirst().orElse(null); } public void onLoad() { if (this.loaded) return; + + this.savedValues = getExtraDatas(); // Cache anchors for (GroupInfo group : groups.values()) { @@ -84,6 +111,16 @@ public class FloorInfo { this.loaded = true; } + + @Getter + public static class ExtraDataInfo { + private int ID; + private String Name; + private int DefaultValue; + private List AllowedValues; + private int MaxValue; + private Integer MinValue; + } @Getter public static class FloorGroupSimpleInfo { diff --git a/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java b/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java index 00371c2..8da1753 100644 --- a/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/AvatarExcel.java @@ -31,7 +31,7 @@ public class AvatarExcel extends GameResource { private int[] RankIDList; private int[] SkillList; - private String JsonPath; + private String ManikinJsonPath; @Getter(AccessLevel.NONE) private transient AvatarPromotionExcel[] promotionData; @@ -77,13 +77,13 @@ public class AvatarExcel extends GameResource { } // Get name key - Matcher matcher = namePattern.matcher(this.JsonPath); + Matcher matcher = namePattern.matcher(this.ManikinJsonPath); if (matcher.find()) { this.nameKey = matcher.group(0); } // Clear variable to save memory - this.JsonPath = null; + this.ManikinJsonPath = null; } } diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeBossExtraExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeBossExtraExcel.java new file mode 100644 index 0000000..6a8e089 --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeBossExtraExcel.java @@ -0,0 +1,30 @@ +package emu.lunarcore.data.excel; + +import emu.lunarcore.data.GameData; +import emu.lunarcore.data.GameResource; +import emu.lunarcore.data.ResourceType; +import emu.lunarcore.data.ResourceType.LoadPriority; +import it.unimi.dsi.fastutil.ints.IntArrayList; +import lombok.Getter; + +@Getter +@ResourceType(name = {"ChallengeBossMazeExtra.json"}, loadPriority = LoadPriority.LOW) +public class ChallengeBossExtraExcel extends GameResource { + private int ID; + private int TurnLimit; + private int ClearScore; + private IntArrayList BattleTargetID; + + @Override + public int getId() { + return ID; + } + + @Override + public void onLoad() { + var challengeExcel = GameData.getChallengeExcelMap().get(this.getId()); + if (challengeExcel != null) { + challengeExcel.setBossExcel(this); + } + } +} diff --git a/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java b/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java index 914d8a2..8c1baf5 100644 --- a/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java +++ b/src/main/java/emu/lunarcore/data/excel/ChallengeExcel.java @@ -2,12 +2,13 @@ package emu.lunarcore.data.excel; import emu.lunarcore.data.GameResource; import emu.lunarcore.data.ResourceType; +import emu.lunarcore.game.challenge.ChallengeType; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.Getter; @Getter -@ResourceType(name = {"ChallengeMazeConfig.json", "ChallengeStoryMazeConfig.json"}) +@ResourceType(name = {"ChallengeMazeConfig.json", "ChallengeStoryMazeConfig.json", "ChallengeBossMazeConfig.json"}) public class ChallengeExcel extends GameResource { private int ID; private int GroupID; @@ -31,8 +32,10 @@ public class ChallengeExcel extends GameResource { private transient Int2ObjectMap challengeMonsters1; private transient Int2ObjectMap challengeMonsters2; + private transient ChallengeType type = ChallengeType.MEMORY; private transient ChallengeStoryExtraExcel storyExcel; - + private transient ChallengeBossExtraExcel bossExcel; + @Override public int getId() { return ID; @@ -42,10 +45,17 @@ public class ChallengeExcel extends GameResource { return this.storyExcel != null; } - public void setStoryExcel(ChallengeStoryExtraExcel storyExcel) { - this.storyExcel = storyExcel; + public void setStoryExcel(ChallengeStoryExtraExcel excel) { + this.type = ChallengeType.STORY; + this.storyExcel = excel; this.ChallengeCountDown = storyExcel.getTurnLimit(); } + + public void setBossExcel(ChallengeBossExtraExcel excel) { + this.type = ChallengeType.BOSS; + this.bossExcel = excel; + this.ChallengeCountDown = 10; // idk + } @Override public void onLoad() { diff --git a/src/main/java/emu/lunarcore/data/excel/ContentPackageExcel.java b/src/main/java/emu/lunarcore/data/excel/ContentPackageExcel.java new file mode 100644 index 0000000..d19a5bc --- /dev/null +++ b/src/main/java/emu/lunarcore/data/excel/ContentPackageExcel.java @@ -0,0 +1,16 @@ +package emu.lunarcore.data.excel; + +import emu.lunarcore.data.GameResource; +import emu.lunarcore.data.ResourceType; +import lombok.Getter; + +@Getter +@ResourceType(name = {"ContentPackageConfig.json"}) +public class ContentPackageExcel extends GameResource { + private int ContentID; + + @Override + public int getId() { + return ContentID; + } +} diff --git a/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java b/src/main/java/emu/lunarcore/data/excel/RogueBuffGroupExcel.java index 9bba1f9..4c67d94 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 = "GKOGJPDANCE") + @SerializedName(value = "LIOICIOFLGL") private int RogueBuffGroupID; // RogueBuffGroupID - @SerializedName(value = "NFPAICKGMBC") + @SerializedName(value = "LEEMGFGKCMO") private IntArrayList RogueBuffTagList; // RogueBuffTagList or RogueBuffGroupList private transient Set rogueBuffList = new HashSet<>(); diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java index ea8e373..849a8fc 100644 --- a/src/main/java/emu/lunarcore/game/battle/BattleService.java +++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java @@ -140,7 +140,7 @@ public class BattleService extends BaseGameService { if (castingAvatar != null) { // Add elemental weakness debuff to enemies MazeBuff buff = battle.addBuff(castingAvatar.getExcel().getDamageType().getEnterBattleBuff(), battle.getLineup().getLeader()); - if (buff != null) { + if (buff != null && castedSkill != null) { buff.addTargetIndex(battle.getLineup().getLeader()); buff.addDynamicValue("SkillIndex", castedSkill.getIndex()); } diff --git a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillAddBuff.java b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillAddBuff.java index 13d8f40..a93709c 100644 --- a/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillAddBuff.java +++ b/src/main/java/emu/lunarcore/game/battle/skills/MazeSkillAddBuff.java @@ -50,7 +50,7 @@ public class MazeSkillAddBuff extends MazeSkillAction { for (GameEntity target : targets) { if (target instanceof EntityMonster monster) { // Set as temp buff - monster.setTempBuff(new SceneBuff(caster.getAvatarId(), buffId)); + monster.addTempBuff(new SceneBuff(caster.getAvatarId(), buffId)); } } } diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeEntityLoader.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeEntityLoader.java index 108c5bb..14674c4 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeEntityLoader.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeEntityLoader.java @@ -26,7 +26,13 @@ public class ChallengeEntityLoader extends SceneEntityLoader { scene.loadGroup(instance.getExcel().getMazeGroupID1()); // Set leave entry - scene.setLeaveEntryId(instance.isStory() ? GameConstants.CHALLENGE_STORY_ENTRANCE : GameConstants.CHALLENGE_ENTRANCE); + int leaveEntryId = switch (instance.getType()) { + default -> GameConstants.CHALLENGE_ENTRANCE; + case STORY -> GameConstants.CHALLENGE_STORY_ENTRANCE; + case BOSS -> GameConstants.CHALLENGE_BOSS_ENTRANCE; + }; + + scene.setLeaveEntryId(leaveEntryId); // Load all groups with props for (var group : scene.getFloorInfo().getGroups().values()) { diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeHistory.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeHistory.java index b67bd69..ccd35cf 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeHistory.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeHistory.java @@ -8,6 +8,7 @@ import dev.morphia.annotations.Indexed; import emu.lunarcore.LunarCore; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.ChallengeOuterClass.Challenge; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -26,6 +27,9 @@ public class ChallengeHistory { private int stars; private int score; + @Setter(AccessLevel.NONE) + private ChallengeExtraHistory extraData; + @Deprecated // Morphia public ChallengeHistory() {} @@ -50,6 +54,14 @@ public class ChallengeHistory { this.score = score; } + public ChallengeExtraHistory getExtraData() { + if (this.extraData == null) { + this.extraData = new ChallengeExtraHistory(); + } + + return this.extraData; + } + public Challenge toProto() { var proto = Challenge.newInstance() .setChallengeId(this.getChallengeId()) @@ -57,6 +69,12 @@ public class ChallengeHistory { .setScore(this.getScore()) .setStars(this.getStars()); + if (this.extraData != null) { + var boss = proto.getMutableExtInfo().getMutableBossInfo(); + boss.getMutableFirstNode(); + boss.getMutableSecondNode(); + } + return proto; } @@ -67,4 +85,9 @@ public class ChallengeHistory { public void save() { LunarCore.getGameDatabase().save(this); } + + @Entity(useDiscriminator = false) + public static class ChallengeExtraHistory { + + } } diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java index d9da7c0..adf2b24 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java @@ -41,7 +41,7 @@ public class ChallengeInstance { @Setter private int scoreStage1; @Setter private int scoreStage2; - private IntList storyBuffs; + private IntList buffs; @Deprecated // Morphia only public ChallengeInstance() {} @@ -66,6 +66,10 @@ public class ChallengeInstance { return this.getExcel().getId(); } + public ChallengeType getType() { + return this.getExcel().getType(); + } + public boolean isStory() { return this.excel.isStory(); } @@ -90,13 +94,13 @@ public class ChallengeInstance { return status == ChallengeStatus.CHALLENGE_FINISH_VALUE; } - public void addStoryBuff(int storyBuff) { + public void addBuff(int buff) { // Add story buffs - if (storyBuffs == null) { - storyBuffs = new IntArrayList(); + if (buffs == null) { + buffs = new IntArrayList(); } - storyBuffs.add(storyBuff); + buffs.add(buff); } public void onBattleStart(Battle battle) { @@ -104,10 +108,10 @@ public class ChallengeInstance { battle.setRoundsLimit(player.getChallengeInstance().getRoundsLeft()); // Add story buffs - if (this.getStoryBuffs() != null) { + if (this.getBuffs() != null) { battle.addBuff(this.getExcel().getMazeBuffID()); - int buffId = this.getStoryBuffs().getInt(this.getCurrentStage() - 1); + int buffId = this.getBuffs().getInt(this.getCurrentStage() - 1); if (buffId != 0) { battle.addBuff(buffId); } @@ -190,7 +194,7 @@ public class ChallengeInstance { this.setStatus(ChallengeStatus.CHALLENGE_FINISH); this.stars = this.calculateStars(); // Save history - player.getChallengeManager().addHistory(this.getChallengeId(), this.getStars(), this.getTotalScore()); + player.getChallengeManager().addHistory(this.getChallengeId(), this.getStars(), this.getTotalScore(), this.getType() == ChallengeType.BOSS); // Send challenge result data player.sendPacket(new PacketChallengeSettleNotify(this)); } else { @@ -266,10 +270,23 @@ public class ChallengeInstance { .setScoreTwo(this.getScoreStage2()) .setRoundCount(this.getRoundsElapsed()) .setExtraLineupTypeValue(this.getCurrentExtraLineup()); - - if (this.getStoryBuffs() != null) { - int buffId = this.getStoryBuffs().getInt(this.getCurrentStage() - 1); - proto.getMutableStoryInfo().getMutableCurStoryBuffs().addBuffList(buffId); + + switch (this.getType()) { + case STORY -> { + if (this.getBuffs() != null) { + int buffId = this.getBuffs().getInt(this.getCurrentStage() - 1); + proto.getMutableStoryInfo().getMutableCurStoryBuffs().addBuffList(buffId); + } + } + case BOSS -> { + if (this.getBuffs() != null) { + int buffId = this.getBuffs().getInt(this.getCurrentStage() - 1); + proto.getMutableStoryInfo().getMutableCurBossBuffs().addBuffList(buffId); + } + } + default -> { + // Nothing + } } return proto; diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java index 687a59e..e18043c 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java @@ -1,6 +1,7 @@ package emu.lunarcore.game.challenge; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Stream; @@ -14,26 +15,42 @@ import emu.lunarcore.game.player.BasePlayerManager; import emu.lunarcore.game.player.Player; import emu.lunarcore.game.player.lineup.PlayerLineup; import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType; -import emu.lunarcore.proto.StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo; import emu.lunarcore.proto.TakenChallengeRewardInfoOuterClass.TakenChallengeRewardInfo; import emu.lunarcore.server.packet.Retcode; import emu.lunarcore.server.packet.send.PacketStartChallengeScRsp; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import lombok.Getter; +import us.hebi.quickbuf.RepeatedInt; @Getter public class ChallengeManager extends BasePlayerManager { private Int2ObjectMap history; private Int2ObjectMap takenRewards; + + private RepeatedInt latest_lineup1; + private RepeatedInt latest_lineup2; + private int latest_firstHalfBuff; + private int latest_secondHalfBuff; public ChallengeManager(Player player) { super(player); this.history = new Int2ObjectOpenHashMap<>(); this.takenRewards = new Int2ObjectOpenHashMap<>(); + this.latest_lineup1 = RepeatedInt.newEmptyInstance(); + this.latest_lineup2 = RepeatedInt.newEmptyInstance(); + this.latest_firstHalfBuff = 0; + this.latest_secondHalfBuff = 0; } - - public void startChallenge(int challengeId, StartChallengeStoryBuffInfo storyBuffs) { + + public void startChallenge(int challengeId, RepeatedInt lineup1, RepeatedInt lineup2, int firstHalfBuff, int secondHalfBuff) { + + // temp, will change later + this.latest_lineup1 = lineup1; + this.latest_lineup2 = lineup2; + this.latest_firstHalfBuff = firstHalfBuff; + this.latest_secondHalfBuff = secondHalfBuff; + // Get challenge excel ChallengeExcel excel = GameData.getChallengeExcelMap().get(challengeId); if (excel == null) { @@ -45,6 +62,8 @@ public class ChallengeManager extends BasePlayerManager { if (excel.getStageNum() >= 1) { // Get lineup PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_VALUE); + // Set lineup + lineup.replace(Arrays.stream(lineup1.array()).boxed().toList()); // Make sure this lineup has avatars set if (lineup.getAvatars().size() == 0) { getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_LINEUP_EMPTY)); @@ -62,6 +81,8 @@ public class ChallengeManager extends BasePlayerManager { if (excel.getStageNum() >= 2) { // Get lineup PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_2_VALUE); + // Set lineup + lineup.replace(Arrays.stream(lineup2.array()).boxed().toList()); // Make sure this lineup has avatars set if (lineup.getAvatars().size() == 0) { getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_LINEUP_EMPTY)); @@ -100,21 +121,29 @@ public class ChallengeManager extends BasePlayerManager { instance.setSavedMp(getPlayer().getCurrentLineup().getMp()); // Set story buffs - if (excel.isStory() && storyBuffs != null) { - instance.addStoryBuff(storyBuffs.getStoryBuffOne()); - instance.addStoryBuff(storyBuffs.getStoryBuffTwo()); + if (excel.getType() != ChallengeType.MEMORY && (firstHalfBuff != 0 || secondHalfBuff != 0)) { + // TODO: set story buffs for each stage individually + if (firstHalfBuff != 0) + instance.addBuff(firstHalfBuff); + if (secondHalfBuff != 0) + instance.addBuff(secondHalfBuff); } // Send packet - getPlayer().sendPacket(new PacketStartChallengeScRsp(getPlayer(), challengeId)); + getPlayer().sendPacket(new PacketStartChallengeScRsp(getPlayer(), challengeId, lineup1, lineup2)); } - public synchronized void addHistory(int challengeId, int stars, int score) { + public synchronized void addHistory(int challengeId, int stars, int score, boolean createExtraData) { // Dont write challenge history if the player didnt get any stars if (stars <= 0) return; // Get history info var info = this.getHistory().computeIfAbsent(challengeId, id -> new ChallengeHistory(getPlayer(), id)); + + // Create extra data + if (createExtraData) { + info.getExtraData(); // Temporary solution TODO + } // Set info.setStars(stars); diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeType.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeType.java new file mode 100644 index 0000000..4bcc7c0 --- /dev/null +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeType.java @@ -0,0 +1,5 @@ +package emu.lunarcore.game.challenge; + +public enum ChallengeType { + MEMORY, STORY, BOSS; +} diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java index 2629e0b..5e22ee9 100644 --- a/src/main/java/emu/lunarcore/game/inventory/GameItem.java +++ b/src/main/java/emu/lunarcore/game/inventory/GameItem.java @@ -293,7 +293,6 @@ public class GameItem { .setMainAffixId(this.mainAffix); if (this.getEquipAvatar() != null) { - proto.setBaseAvatarId(this.getEquipAvatar().getAvatarId()); proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId()); } @@ -317,7 +316,6 @@ public class GameItem { .setRank(this.getRank()); if (this.getEquipAvatar() != null) { - proto.setBaseAvatarId(this.getEquipAvatar().getAvatarId()); proto.setEquipAvatarId(this.getEquipAvatar().getAvatarId()); } diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index 3a97e06..49e35db 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -430,18 +430,23 @@ public class Player implements Tickable { public void addExp(int amount) { // Setup int oldLevel = this.level; - int reqExp = GameData.getPlayerExpRequired(level + 1); + int expRequired = GameData.getPlayerExpRequired(level + 1); // Add exp this.exp += amount; - while (this.exp >= reqExp && reqExp > 0) { + // Check for level ups + while (this.exp >= expRequired && expRequired > 0) { this.level += 1; - reqExp = GameData.getPlayerExpRequired(this.level + 1); + expRequired = GameData.getPlayerExpRequired(this.level + 1); } // Update level and change property - this.onLevelChange(oldLevel, this.level); + if (oldLevel != this.level) { + this.onLevelChange(oldLevel, this.level); + } + + // Save to database this.save(); // Send packet @@ -728,7 +733,10 @@ public class Player implements Tickable { anchorId = teleport.getAnchorID(); } } else if (anchorId == 0) { - startGroup = floor.getStartGroupID(); + var group = floor.getGroupInfoByIndex(floor.getStartGroupIndex()); + if (group == null) return false; + + startGroup = group.getId(); anchorId = floor.getStartAnchorID(); } diff --git a/src/main/java/emu/lunarcore/game/player/lineup/PlayerLineup.java b/src/main/java/emu/lunarcore/game/player/lineup/PlayerLineup.java index 215846d..5ddf105 100644 --- a/src/main/java/emu/lunarcore/game/player/lineup/PlayerLineup.java +++ b/src/main/java/emu/lunarcore/game/player/lineup/PlayerLineup.java @@ -119,6 +119,35 @@ public class PlayerLineup { this.getOwner().sendPacket(new PacketSyncLineupNotify(this)); } + public void replace(List lineupList) { + // Clear + this.getAvatars().clear(); + + // Add + for (int avatarId : lineupList) { + GameAvatar avatar = getOwner().getAvatarById(avatarId); + if (avatar != null) { + this.getAvatars().add(avatarId); + } + } + + // Validate leader slot + if (this.getLeader() >= this.size()) { + this.setLeader(0); + } + + // Save + this.save(); + + // Sync lineup with scene if its active + if (this == getOwner().getCurrentLineup()) { + getOwner().getScene().syncLineup(); + } + + // Sync lineup data with player + getOwner().sendPacket(new PacketSyncLineupNotify(this)); + } + public void forEachAvatar(Consumer consumer) { for (int avatarId : this.getAvatars()) { GameAvatar avatar = this.getOwner().getAvatarById(avatarId); diff --git a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java index 637534e..1575c76 100644 --- a/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java +++ b/src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java @@ -1,5 +1,8 @@ package emu.lunarcore.game.scene.entity; +import java.util.ArrayList; +import java.util.List; + import emu.lunarcore.data.GameData; import emu.lunarcore.data.config.GroupInfo; import emu.lunarcore.data.config.MonsterInfo; @@ -35,7 +38,7 @@ public class EntityMonster implements GameEntity, Tickable { private final Position rot; private Int2ObjectMap buffs; - @Setter private SceneBuff tempBuff; + private List tempBuffs; private int farmElementId; private BattleStage customStage; @@ -88,6 +91,14 @@ public class EntityMonster implements GameEntity, Tickable { return buff; } + public synchronized void addTempBuff(SceneBuff tempBuff) { + if (this.tempBuffs == null) { + this.tempBuffs = new ArrayList<>(); + } + + this.tempBuffs.add(tempBuff); + } + public synchronized void applyBuffs(Battle battle, int waveIndex) { if (this.buffs != null) { for (var entry : this.buffs.int2ObjectEntrySet()) { @@ -101,9 +112,12 @@ public class EntityMonster implements GameEntity, Tickable { } } - if (this.getTempBuff() != null) { - this.applyBuff(battle, this.getTempBuff(), waveIndex); - this.tempBuff = null; + if (this.getTempBuffs() != null) { + for (var tempBuff : this.getTempBuffs()) { + this.applyBuff(battle, tempBuff, waveIndex); + } + + this.tempBuffs = null; } } diff --git a/src/main/java/emu/lunarcore/plugin/PluginManager.java b/src/main/java/emu/lunarcore/plugin/PluginManager.java index ce03b79..85fc034 100644 --- a/src/main/java/emu/lunarcore/plugin/PluginManager.java +++ b/src/main/java/emu/lunarcore/plugin/PluginManager.java @@ -12,7 +12,6 @@ import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.net.URLClassLoader; import java.util.*; -import java.util.jar.JarFile; /** Manages the server's plugins and the event system. */ @Getter diff --git a/src/main/java/emu/lunarcore/server/packet/CmdId.java b/src/main/java/emu/lunarcore/server/packet/CmdId.java index a5c4148..1f2f756 100644 --- a/src/main/java/emu/lunarcore/server/packet/CmdId.java +++ b/src/main/java/emu/lunarcore/server/packet/CmdId.java @@ -3,1327 +3,1480 @@ package emu.lunarcore.server.packet; public class CmdId { // Empty public static final int NONE = 0; - + // Cmd Ids - public static final int SpringRecoverCsReq = 1444; - public static final int TakeTrainVisitorUntakenBehaviorRewardScRsp = 3729; - public static final int FinishEmotionDialoguePerformanceScRsp = 6343; - public static final int SelectChatBubbleScRsp = 5188; - public static final int GetEnhanceCommonRogueBuffInfoCsReq = 5616; - public static final int SubmitMonsterResearchActivityMaterialCsReq = 2637; - public static final int EnterAetherDivideSceneCsReq = 4834; - public static final int HeliobusActivityDataCsReq = 5834; - public static final int CommonRogueQueryScRsp = 5698; - public static final int GetRogueShopMiracleInfoCsReq = 5688; - public static final int ApplyFriendCsReq = 2919; - public static final int GetHeartDialInfoScRsp = 6348; - public static final int ComposeLimitNumUpdateNotify = 518; - public static final int GetCurAssistCsReq = 2924; - public static final int TakeRollShopRewardCsReq = 6920; - public static final int RelicRecommendScRsp = 592; - public static final int ChangeLineupLeaderCsReq = 706; - public static final int TrialActivityDataChangeScNotify = 2604; - public static final int DrinkMakerChallengeCsReq = 6985; - public static final int GetMbtiReportCsReq = 7071; - public static final int AlleyGuaranteedFundsCsReq = 4724; - public static final int UpdateFeatureSwitchScNotify = 55; - public static final int FinishQuestCsReq = 929; - public static final int ChessRogueRollDiceScRsp = 5546; - public static final int GetAuthkeyScRsp = 95; - public static final int ActivateFarmElementCsReq = 1492; - public static final int SetAetherDivideLineUpCsReq = 4896; - public static final int StartAetherDivideChallengeBattleScRsp = 4843; - public static final int MarkAvatarCsReq = 341; - public static final int StartRogueScRsp = 1888; - public static final int UnlockAvatarSkinScNotify = 301; - public static final int SellItemCsReq = 537; - public static final int SwapLineupScRsp = 729; - public static final int TakeAllApRewardCsReq = 3309; - public static final int GetChallengeGroupStatisticsCsReq = 1795; - public static final int RetcodeNotify = 98; - public static final int FinishPerformSectionIdScRsp = 2729; - public static final int AetherDivideFinishChallengeScNotify = 4828; - public static final int SyncLineupNotify = 745; - public static final int UseItemScRsp = 543; - public static final int GetFarmStageGachaInfoCsReq = 1362; - public static final int UseTreasureDungeonItemScRsp = 4430; - public static final int AcceptMainMissionCsReq = 1291; - public static final int GetWolfBroGameDataCsReq = 6586; - public static final int JoinLineupCsReq = 702; - public static final int DelSaveRaidScNotify = 2237; - public static final int InteractPropScRsp = 1488; - public static final int DeleteSocialEventServerCacheScRsp = 7015; - public static final int EnableRogueTalentCsReq = 1874; - public static final int EvolveBuildReRandomStageCsReq = 7131; - public static final int CurTrialActivityScNotify = 2605; - public static final int UnlockPhoneThemeScNotify = 5143; - public static final int SubmitEmotionItemScRsp = 6309; - public static final int UpdateRogueAdventureRoomScoreScRsp = 5666; - public static final int ClockParkStartScriptCsReq = 7219; - public static final int NewAssistHistoryNotify = 2954; - public static final int AlleyShipUsedCountScNotify = 4797; - public static final int RecoverAllLineupCsReq = 1424; - public static final int HeliobusSnsPostScRsp = 5809; - public static final int SetNicknameCsReq = 39; - public static final int SharePunkLordMonsterCsReq = 3202; - public static final int GetChessRogueBuffEnhanceInfoScRsp = 5426; - public static final int AlleyPlacingGameCsReq = 4796; - public static final int TakeRogueEventHandbookRewardCsReq = 5689; - public static final int GetPlayerReturnMultiDropInfoScRsp = 4602; - public static final int MuseumTakeCollectRewardCsReq = 4328; - public static final int MonopolyGameCreateScNotify = 7025; - public static final int DailyFirstEnterMonopolyActivityCsReq = 7096; - public static final int MonopolyGetRafflePoolInfoScRsp = 7020; - public static final int GetActivityScheduleConfigCsReq = 2602; - public static final int DeleteSummonUnitCsReq = 1417; - public static final int RefreshAlleyOrderScRsp = 4742; - public static final int FinishChessRogueSubStoryScRsp = 5437; - public static final int GetCurSceneInfoScRsp = 1443; - public static final int GetFightActivityDataScRsp = 3648; - public static final int QuitBattleCsReq = 162; - public static final int FinishFirstTalkNpcScRsp = 2143; - public static final int EvolveBuildQueryInfoScRsp = 7149; - public static final int StartCocoonStageScRsp = 1454; - public static final int BattleLogReportScRsp = 145; - public static final int TreasureDungeonFinishScNotify = 4448; - public static final int ChessRogueEnterScRsp = 5559; - public static final int SetMissionEventProgressCsReq = 1256; - public static final int TreasureDungeonDataScNotify = 4434; - public static final int StrongChallengeActivityBattleEndScNotify = 6602; - public static final int StartAlleyEventCsReq = 4719; - public static final int ChessRogueCellUpdateNotify = 5508; - public static final int QuestRecordScNotify = 986; - public static final int MonopolyCheatDiceCsReq = 7041; - public static final int BuyRogueShopMiracleCsReq = 5643; - public static final int EnterRogueEndlessActivityStageScRsp = 6088; - public static final int StartAetherDivideStageBattleCsReq = 4816; - public static final int GetLoginActivityCsReq = 2634; - public static final int UpdateServerPrefsDataCsReq = 6102; - public static final int ClockParkGetInfoCsReq = 7234; - public static final int StartBoxingClubBattleScRsp = 4209; - public static final int GetFeverTimeActivityDataScRsp = 7154; - public static final int GetStoryLineInfoCsReq = 6234; - public static final int ChessRogueUpdateReviveInfoScNotify = 5419; - public static final int GetWaypointCsReq = 434; - public static final int ReturnLastTownScRsp = 1430; - public static final int SubmitOfferingItemCsReq = 6933; - public static final int LeaveRogueScRsp = 1843; - public static final int FinishTutorialGuideCsReq = 1645; - public static final int SpaceZooExchangeItemScRsp = 6796; - public static final int MonopolyAcceptQuizCsReq = 7054; - public static final int MonopolySocialEventEffectScNotify = 7046; - public static final int SetSpringRecoverConfigScRsp = 1435; - public static final int TravelBrochureSetPageDescStatusScRsp = 6442; - public static final int GetAlleyInfoCsReq = 4734; - public static final int GetAllSaveRaidScRsp = 2242; - public static final int FightTreasureDungeonMonsterScRsp = 4442; - public static final int FinishCosumeItemMissionCsReq = 1296; - public static final int WolfBroGamePickupBulletScRsp = 6533; - public static final int ClockParkUnlockTalentScRsp = 7209; - public static final int ExchangeStaminaScRsp = 33; - public static final int ChessRogueNousDiceSurfaceUnlockNotify = 5413; - public static final int FinishChapterScNotify = 4962; - public static final int GetPunkLordBattleRecordScRsp = 3224; - public static final int GetShopListScRsp = 1548; - public static final int LogisticsScoreRewardSyncInfoScNotify = 4725; - public static final int GetStageLineupScRsp = 748; - public static final int UpdateRotaterScNotify = 6839; - public static final int GetTelevisionActivityDataCsReq = 6961; - public static final int LockRelicCsReq = 595; - public static final int EnterSceneCsReq = 1472; - public static final int SetClientPausedCsReq = 1500; - public static final int PlayerLogoutCsReq = 62; - public static final int SpaceZooMutateCsReq = 6702; - public static final int BattlePassInfoNotify = 3034; - public static final int MonopolyMoveCsReq = 7043; - public static final int ReserveStaminaExchangeScRsp = 40; - public static final int MarkItemCsReq = 511; - public static final int StartFinishMainMissionScNotify = 1218; - public static final int FinishAeonDialogueGroupCsReq = 1831; - public static final int HeliobusSnsUpdateScNotify = 5845; - public static final int MonopolyRollDiceScRsp = 7019; - public static final int MonopolyGameRaiseRatioCsReq = 7018; - public static final int UpdateFloorSavedValueNotify = 1420; - public static final int WolfBroGameActivateBulletScRsp = 6595; - public static final int TrainVisitorBehaviorFinishScRsp = 3748; - public static final int LockEquipmentCsReq = 502; - public static final int AetherDivideTainerInfoScNotify = 4861; - public static final int TextJoinBatchSaveCsReq = 3802; - public static final int ExpUpRelicScRsp = 559; - public static final int AlleyShipUnlockScNotify = 4763; - public static final int DeactivateFarmElementScRsp = 1467; - public static final int ChessRogueEnterNextLayerScRsp = 5436; - public static final int SyncRogueFinishScNotify = 1833; - public static final int HeliobusSnsReadCsReq = 5862; - public static final int ChessRogueNousEditDiceCsReq = 5550; - public static final int LeaveTrialActivityScRsp = 2646; - public static final int SetGameplayBirthdayScRsp = 44; - public static final int GroupStateChangeScNotify = 1447; - public static final int MonopolyTakePhaseRewardScRsp = 7064; - public static final int SetSignatureCsReq = 2829; - public static final int EquipAetherDividePassiveSkillCsReq = 4833; - public static final int EvolveBuildUnlockInfoNotify = 7110; - public static final int GetLevelRewardTakenListCsReq = 30; - public static final int SetLanguageScRsp = 61; - public static final int InteractTreasureDungeonGridScRsp = 4439; - public static final int GetRndOptionCsReq = 3434; - public static final int ChessRogueNousDiceUpdateNotify = 5452; - public static final int TakeQuestRewardCsReq = 962; - public static final int TravelBrochureSelectMessageCsReq = 6402; - public static final int ChessRoguePickAvatarScRsp = 5449; - public static final int LeaveAetherDivideSceneScRsp = 4888; - public static final int MuseumRandomEventStartScNotify = 4337; - public static final int UpdateTrackMainMissionIdCsReq = 1254; - public static final int RemoveStuffFromAreaScRsp = 4343; - public static final int SetGenderScRsp = 25; - public static final int MonopolyScrachRaffleTicketCsReq = 7099; - public static final int BoxingClubChallengeUpdateScNotify = 4229; - public static final int SyncRogueCommonVirtualItemInfoScNotify = 5673; - public static final int GetBasicInfoScRsp = 73; - public static final int AetherDivideSpiritExpUpCsReq = 4885; - public static final int GetFirstTalkByPerformanceNpcScRsp = 2168; - public static final int TrainRefreshTimeNotify = 3702; - public static final int GetFriendDevelopmentInfoScRsp = 2903; - public static final int ChooseBoxingClubStageOptionalBuffScRsp = 4259; - public static final int TakeCityShopRewardScRsp = 1509; - public static final int ChessRogueUpdateUnlockLevelScNotify = 5582; - public static final int ReviveRogueAvatarCsReq = 1837; - public static final int SetTurnFoodSwitchScRsp = 600; - public static final int SceneEntityMoveScNotify = 1445; - public static final int LeaveMapRotationRegionCsReq = 6886; - public static final int TakeTrialActivityRewardScRsp = 2671; - public static final int ClientObjDownloadDataScNotify = 58; - public static final int ExchangeHcoinScRsp = 585; - public static final int DressAvatarSkinCsReq = 330; - public static final int EvolveBuildGiveupScRsp = 7150; - public static final int QueryProductInfoCsReq = 90; - public static final int TakeChallengeRaidRewardScRsp = 2286; - public static final int GetReplayTokenCsReq = 3534; - public static final int DoGachaInRollShopCsReq = 6913; - public static final int ChessRogueNousEnableRogueTalentScRsp = 5425; - public static final int EnhanceCommonRogueBuffCsReq = 5685; - public static final int EnterStrongChallengeActivityStageScRsp = 6688; - public static final int WolfBroGameUseBulletCsReq = 6568; - public static final int GetMapRotationDataCsReq = 6845; - public static final int PromoteEquipmentScRsp = 588; - public static final int RaidCollectionDataScNotify = 6953; - public static final int RankUpAvatarScRsp = 333; - public static final int GetMovieRacingDataScRsp = 4130; - public static final int SceneEntityMoveScRsp = 1448; - public static final int AlleyEventEffectNotify = 4729; - public static final int GetCurBattleInfoScRsp = 109; - public static final int ChangeStoryLineCsReq = 6288; - public static final int TriggerVoiceCsReq = 4196; - public static final int GameplayCounterUpdateScNotify = 1478; - public static final int ChessRogueUpdateDicePassiveAccumulateValueScNotify = 5542; - public static final int GiveUpBoxingClubChallengeScRsp = 4243; - public static final int AcceptedPamMissionExpireScRsp = 4048; - public static final int WolfBroGameExplodeMonsterCsReq = 6542; - public static final int RegionStopScNotify = 42; - public static final int TakeRogueEndlessActivityPointRewardScRsp = 6019; - public static final int GetChessRogueStoryAeonTalkInfoCsReq = 5477; - public static final int ClockParkFinishScriptScNotify = 7216; - public static final int DailyTaskDataScNotify = 1243; - public static final int GetMonopolyFriendRankingListScRsp = 7004; - public static final int GetMonopolyDailyReportScRsp = 7021; - public static final int BuyNpcStuffScRsp = 4388; - public static final int GetMissionDataCsReq = 1234; - public static final int GetFriendApplyListInfoCsReq = 2902; - public static final int GetUnlockTeleportCsReq = 1440; - public static final int ChessRogueFinishCurRoomNotify = 5422; - public static final int TextJoinQueryCsReq = 3862; - public static final int RotateMapScRsp = 6843; - public static final int LeaveChallengeScRsp = 1709; - public static final int TakeRogueAeonLevelRewardCsReq = 1899; - public static final int MonopolyGuessDrawScNotify = 7067; - public static final int MonopolyGameGachaCsReq = 7024; - public static final int SummonPunkLordMonsterScRsp = 3243; - public static final int LeaveMapRotationRegionScNotify = 6833; - public static final int SetGroupCustomSaveDataScRsp = 1403; - public static final int SwitchLineupIndexCsReq = 759; - public static final int FinishItemIdCsReq = 2702; - public static final int MuseumRandomEventSelectCsReq = 4330; - public static final int PlayerGetTokenScRsp = 9; - public static final int RefreshTriggerByClientCsReq = 1432; - public static final int EnterTreasureDungeonScRsp = 4406; - public static final int GetQuestRecordScRsp = 943; - public static final int RogueModifierUpdateNotify = 5343; - public static final int RestoreWolfBroGameArchiveCsReq = 6502; - public static final int CommonRogueUpdateScNotify = 5671; - public static final int MissionGroupWarnScNotify = 1268; - public static final int GetEnteredSceneScRsp = 1431; - public static final int ArchiveWolfBroGameScRsp = 6588; - public static final int SyncTaskScRsp = 1219; - public static final int PlayerReturnTakeRewardScRsp = 4543; - public static final int EvolveBuildLeaveScRsp = 7101; - public static final int PickRogueAvatarScRsp = 1895; - public static final int ComposeItemCsReq = 596; - public static final int SetFriendMarkCsReq = 2966; - public static final int SyncRogueRewardInfoScNotify = 1883; - public static final int EvolveBuildShopAbilityUpCsReq = 7133; - public static final int UnlockHeadIconScNotify = 2886; - public static final int SyncHandleFriendScNotify = 2968; - public static final int GetGachaInfoCsReq = 1934; - public static final int RogueModifierSelectCellScRsp = 5302; - public static final int HeliobusUpgradeLevelScRsp = 5806; - public static final int TakeMultipleExpeditionRewardScRsp = 2537; - public static final int TakeLoginActivityRewardScRsp = 2688; - public static final int PVEBattleResultCsReq = 134; - public static final int MonopolyGuessChooseScRsp = 7065; - public static final int QuitBattleScNotify = 186; - public static final int MonopolyGiveUpCurContentScRsp = 7001; - public static final int TakeOffRelicCsReq = 342; - public static final int StartRaidScRsp = 2248; - public static final int RogueModifierStageStartNotify = 5329; - public static final int MonopolyGetRegionProgressCsReq = 7040; - public static final int GetFriendBattleRecordDetailScRsp = 2971; - public static final int SetHeroBasicTypeCsReq = 91; - public static final int ComposeSelectedRelicCsReq = 556; - public static final int GetTutorialGuideScRsp = 1688; - public static final int SceneCastSkillCostMpScRsp = 1433; - public static final int GetFriendAssistListScRsp = 2935; - public static final int GetTreasureDungeonActivityDataScRsp = 4468; - public static final int InteractChargerCsReq = 6862; - public static final int GetPlayerBoardDataScRsp = 2848; - public static final int EntityBindPropScRsp = 1425; - public static final int GetExpeditionDataCsReq = 2534; - public static final int MonopolyConfirmRandomScRsp = 7039; - public static final int GetMonopolyDailyReportCsReq = 7076; - public static final int AlleyTakeEventRewardScRsp = 4708; - public static final int TakeMailAttachmentScRsp = 843; - public static final int SetDisplayAvatarCsReq = 2802; - public static final int ChessRogueQueryAeonDimensionsScRsp = 5466; - public static final int HeliobusSnsLikeCsReq = 5819; - public static final int TravelBrochureSetCustomValueScRsp = 6459; - public static final int ScenePlaneEventScNotify = 1484; - public static final int MatchBoxingClubOpponentScRsp = 4288; - public static final int CurAssistChangedNotify = 3000; - public static final int ArchiveWolfBroGameCsReq = 6562; - public static final int PlayerReturnTakePointRewardCsReq = 4502; - public static final int ChessRogueSelectBpCsReq = 5549; - public static final int DeployRotaterCsReq = 6802; - public static final int AceAntiCheaterScRsp = 75; - public static final int GetAllLineupDataCsReq = 739; - public static final int TakeFightActivityRewardCsReq = 3609; - public static final int GetMonopolyMbtiReportRewardScRsp = 7081; - public static final int MultipleDropInfoNotify = 4609; - public static final int GetPunkLordDataCsReq = 3259; - public static final int UnlockTutorialGuideScRsp = 1643; - public static final int WaypointShowNewCsNotify = 419; - public static final int AlleyShopLevelScNotify = 4756; - public static final int EnterSceneByServerScNotify = 1410; - public static final int GeneralVirtualItemDataNotify = 565; - public static final int DeleteFriendScRsp = 2906; - public static final int GetTutorialScRsp = 1648; - public static final int PlayerGetTokenCsReq = 2; - public static final int TravelBrochureGetDataScRsp = 6448; - public static final int GiveUpBoxingClubChallengeCsReq = 4219; - public static final int SwitchAetherDivideLineUpSlotScRsp = 4839; - public static final int HeliobusEnterBattleCsReq = 5839; - public static final int FinishCurTurnCsReq = 4345; - public static final int TakeRogueScoreRewardScRsp = 1830; - public static final int ClockParkHandleWaitOperationScRsp = 7268; - public static final int GetFriendRecommendListInfoScRsp = 2939; - public static final int PlayerReturnSignCsReq = 4548; - public static final int EnterFeverTimeActivityStageScRsp = 7159; - public static final int GetFriendLoginInfoCsReq = 2990; - public static final int GetFriendListInfoScRsp = 2948; - public static final int BoxingClubRewardScNotify = 4286; - public static final int RemoveRotaterCsReq = 6842; - public static final int GetQuestDataCsReq = 934; - public static final int PlayerReturnInfoQueryScRsp = 4529; - public static final int PlayerReturnStartScNotify = 4534; - public static final int ChallengeLineupNotify = 1768; - public static final int ExchangeRogueBuffWithMiracleScRsp = 5639; - public static final int UpdateMechanismBarScNotify = 1471; - public static final int UpdatePlayerSettingCsReq = 7; - public static final int UpdateTrackMainMissionIdScRsp = 1279; - public static final int GetAssistHistoryScRsp = 2908; - public static final int PlayBackGroundMusicCsReq = 3162; - public static final int GetGunPlayDataCsReq = 4163; - public static final int SyncRogueExploreWinScNotify = 1811; - public static final int GetMonopolyFriendRankingListCsReq = 7044; - public static final int MonopolyGameBingoFlipCardCsReq = 7011; - public static final int StartBattleCollegeScRsp = 5702; - public static final int ChangeScriptEmotionScRsp = 6388; - public static final int LeaveAetherDivideSceneCsReq = 4862; - public static final int SyncRogueCommonPendingActionScNotify = 5692; - public static final int MarkReadMailScRsp = 888; - public static final int GetRogueDialogueEventDataScRsp = 1844; - public static final int MarkChatEmojiScRsp = 3968; - public static final int GetServerPrefsDataCsReq = 6162; - public static final int GetSecretKeyInfoCsReq = 22; - public static final int ChessRogueSelectCellScRsp = 5450; - public static final int GetTrainVisitorBehaviorScRsp = 3788; - public static final int SelectInclinationTextScRsp = 2129; - public static final int SetIsDisplayAvatarInfoScRsp = 2843; - public static final int GetRogueInitialScoreCsReq = 1865; - public static final int LeaveChallengeCsReq = 1702; - public static final int BuyBpLevelScRsp = 3019; - public static final int AcceptMissionEventScRsp = 1237; - public static final int GetMonopolyInfoCsReq = 7034; - public static final int GetQuestRecordCsReq = 919; - public static final int StartTimedCocoonStageCsReq = 1426; - public static final int EnterRogueScRsp = 1809; - public static final int LastSpringRefreshTimeNotify = 1439; - public static final int LogisticsDetonateStarSkiffScRsp = 4779; - public static final int DrinkMakerDayEndScNotify = 6984; - public static final int TakeOffEquipmentCsReq = 345; - public static final int GetRogueBuffEnhanceInfoScRsp = 1856; - public static final int EnhanceChessRogueBuffCsReq = 5592; - public static final int CancelCacheNotifyScRsp = 4129; - public static final int SendMsgCsReq = 3934; - public static final int SwitchLineupIndexScRsp = 795; - public static final int MonopolyMoveScRsp = 7086; - public static final int StoryLineInfoScNotify = 6262; - public static final int ChessRogueUpdateBoardScNotify = 5502; - public static final int GetQuestDataScRsp = 948; - public static final int BuyNpcStuffCsReq = 4362; - public static final int TakeRogueScoreRewardCsReq = 1816; - public static final int CancelActivityExpeditionCsReq = 2568; - public static final int HeliobusEnterBattleScRsp = 5816; - public static final int GetLevelRewardTakenListScRsp = 85; - public static final int SetHeadIconScRsp = 2888; - public static final int AcceptExpeditionCsReq = 2562; - public static final int HandleRogueCommonPendingActionCsReq = 5604; - public static final int LogisticsInfoScNotify = 4728; - public static final int DailyFirstMeetPamScRsp = 3488; - public static final int ChessRogueQuestFinishNotify = 5565; - public static final int RechargeSuccNotify = 516; - public static final int MonopolyLikeScNotify = 7098; - public static final int SyncRogueMapRoomScNotify = 1890; - public static final int SetCurWaypointCsReq = 462; - public static final int ChessRogueUpdateAllowedSelectCellScNotify = 5577; - public static final int SceneEntityTeleportCsReq = 1412; - public static final int TravelBrochureUpdatePasterPosScRsp = 6468; - public static final int ChessRogueCheatRollScRsp = 5599; - public static final int UnlockTutorialScRsp = 1609; - public static final int UnlockTeleportNotify = 1483; - public static final int SetFriendRemarkNameScRsp = 2930; - public static final int GetFriendListInfoCsReq = 2934; - public static final int MonopolyTakeRaffleTicketRewardScRsp = 7070; - public static final int HeartDialScriptChangeScNotify = 6386; - public static final int ExchangeHcoinCsReq = 530; - public static final int HeliobusLineupUpdateScNotify = 5863; - public static final int ChessRogueQueryBpCsReq = 5495; - public static final int TakeChapterRewardCsReq = 443; - public static final int SelectPhoneThemeScRsp = 5119; - public static final int SyncRoguePickAvatarInfoScNotify = 1880; - public static final int TakeRogueMiracleHandbookRewardScRsp = 5665; - public static final int DoGachaInRollShopScRsp = 6917; - public static final int GetSaveLogisticsMapCsReq = 4718; - public static final int EnterFeverTimeActivityStageCsReq = 7151; - public static final int StartChallengeScRsp = 1788; - public static final int PVEBattleResultScRsp = 148; - public static final int UpdateRedDotDataCsReq = 5962; - public static final int FinishPlotCsReq = 1134; - public static final int BuyGoodsScRsp = 1588; - public static final int BuyRogueShopBuffCsReq = 5629; - public static final int SubmitOrigamiItemCsReq = 4133; - public static final int UpdateMovieRacingDataScRsp = 4156; - public static final int MonopolyGameBingoFlipCardScRsp = 7008; - public static final int ExpeditionDataChangeScNotify = 2586; - public static final int GetTelevisionActivityDataScRsp = 6978; - public static final int FinishTutorialCsReq = 1686; - public static final int WolfBroGameDataChangeScNotify = 6545; - public static final int GroupStateChangeScRsp = 1421; - public static final int SyncRogueReviveInfoScNotify = 1891; - public static final int HeliobusUpgradeLevelCsReq = 5896; - public static final int HeliobusSelectSkillCsReq = 5859; - public static final int PlayerKickOutScNotify = 86; - public static final int FinishFirstTalkByPerformanceNpcScRsp = 2106; - public static final int SyncClientResVersionCsReq = 119; - public static final int SceneUpdatePositionVersionNotify = 1468; - public static final int EnterTelevisionActivityStageScRsp = 6980; - public static final int TrainVisitorRewardSendNotify = 3709; - public static final int EndDrinkMakerSequenceScRsp = 6999; - public static final int GetMarkItemListCsReq = 524; - public static final int AetherDivideRefreshEndlessScRsp = 4882; - public static final int ServerSimulateBattleFinishScNotify = 168; - public static final int EnterTrialActivityStageScRsp = 2693; - public static final int ChessRogueSkipTeachingLevelScRsp = 5474; - public static final int EntityBindPropCsReq = 1479; - public static final int GetMultipleDropInfoCsReq = 4634; - public static final int GetDailyActiveInfoCsReq = 3362; - public static final int GetPhoneDataCsReq = 5134; - public static final int UpdateGunPlayDataScRsp = 4128; - public static final int SpaceZooExchangeItemCsReq = 6768; - public static final int ChessRogueReRollDiceCsReq = 5490; - public static final int PlayerHeartBeatScRsp = 49; - public static final int SecurityReportScRsp = 4168; - public static final int RaidCollectionDataScRsp = 6958; - public static final int GetDrinkMakerDataScRsp = 6998; - public static final int ExtraLineupDestroyNotify = 763; - public static final int MonopolyGetRegionProgressScRsp = 7069; - public static final int GetPrivateChatHistoryCsReq = 3902; - public static final int PlayerReturnTakeRewardCsReq = 4519; - public static final int GetSingleRedDotParamGroupScRsp = 5909; - public static final int RankUpAvatarCsReq = 306; - public static final int GameplayCounterCountDownScRsp = 1464; - public static final int GetRogueHandbookDataCsReq = 5654; - public static final int SceneCastSkillScRsp = 1409; - public static final int ChessRogueGoAheadScRsp = 5431; - public static final int MonopolyReRollRandomScRsp = 7042; - public static final int ChessRogueChangeyAeonDimensionNotify = 5557; - public static final int MarkAvatarScRsp = 328; - public static final int ChessRogueNousGetRogueTalentInfoCsReq = 5448; - public static final int GetTutorialCsReq = 1634; - public static final int GetArchiveDataScRsp = 2348; - public static final int SyncAddBlacklistScNotify = 2942; - public static final int AlleyTakeEventRewardCsReq = 4711; - public static final int ExchangeRogueRewardKeyCsReq = 1871; - public static final int ChessRogueQuitCsReq = 5575; - public static final int ChessRogueGiveUpCsReq = 5463; - public static final int QueryProductInfoScRsp = 67; - public static final int StartTimedFarmElementScRsp = 1460; - public static final int ReplaceLineupCsReq = 785; - public static final int GetTrainVisitorRegisterCsReq = 3719; - public static final int SetBoxingClubResonanceLineupCsReq = 4296; - public static final int GetFriendBattleRecordDetailCsReq = 2998; - public static final int GetAllRedDotDataCsReq = 5934; - public static final int UseItemCsReq = 519; - public static final int ShareScRsp = 4148; - public static final int StartTrialActivityCsReq = 2649; - public static final int GetStrongChallengeActivityDataCsReq = 6634; - public static final int TakeAllApRewardScRsp = 3319; - public static final int GetTrialActivityDataScRsp = 2644; - public static final int GetChessRogueBuffEnhanceInfoCsReq = 5522; - public static final int MonopolyGetRaffleTicketScRsp = 7010; - public static final int GetFriendApplyListInfoScRsp = 2909; - public static final int EvolveBuildTakeExpRewardCsReq = 7122; - public static final int GetPlayerBoardDataCsReq = 2834; - public static final int EvolveBuildStartLevelCsReq = 7148; - public static final int UnlockSkilltreeCsReq = 302; - public static final int TakeAllRewardCsReq = 3043; - public static final int ChessRogueQueryAeonDimensionsCsReq = 5529; - public static final int PunkLordMonsterInfoScNotify = 3233; - public static final int NewMailScNotify = 886; - public static final int ChessRogueStartScRsp = 5471; - public static final int GetRogueInfoScRsp = 1848; - public static final int RogueModifierSelectCellCsReq = 5388; - public static final int LogisticsGameScRsp = 4788; - public static final int TakePromotionRewardCsReq = 339; - public static final int ShowNewSupplementVisitorCsReq = 3745; - public static final int GetAssistListCsReq = 2961; - public static final int EnterAdventureCsReq = 1334; - public static final int TravelBrochureSelectMessageScRsp = 6409; - public static final int GetAetherDivideInfoScRsp = 4868; - public static final int GetCurAssistScRsp = 2982; - public static final int GetNpcStatusScRsp = 2788; - public static final int GetEnhanceCommonRogueBuffInfoScRsp = 5630; - public static final int RogueNpcDisappearScRsp = 5696; - public static final int RankUpEquipmentScRsp = 529; - public static final int GetMonsterResearchActivityDataScRsp = 2642; - public static final int ClockParkGetOngoingScriptInfoCsReq = 7286; - public static final int SellItemScRsp = 539; - public static final int FinishChessRogueNousSubStoryScRsp = 5501; - public static final int GetPlatformPlayerInfoScRsp = 2989; - public static final int SpaceZooTakeCsReq = 6706; - public static final int AddAvatarScNotify = 396; - public static final int SelectChessRogueSubStoryScRsp = 5536; - public static final int FinishQuestScRsp = 945; - public static final int SyncChessRogueNousValueScNotify = 5537; - public static final int RelicRecommendCsReq = 567; - public static final int ChangeLineupLeaderScRsp = 733; - public static final int TakePictureCsReq = 4102; - public static final int GetBagScRsp = 548; - public static final int GetHeroBasicTypeInfoCsReq = 24; - public static final int GetChatFriendHistoryCsReq = 3919; - public static final int ClockParkUseBuffScRsp = 7239; - public static final int GetPunkLordMonsterDataScRsp = 3248; - public static final int WolfBroGameActivateBulletCsReq = 6559; - public static final int SavePointsInfoNotify = 1411; - public static final int DeleteBlacklistCsReq = 2963; - public static final int PrivateMsgOfflineUsersScNotify = 3988; - public static final int TakeActivityExpeditionRewardCsReq = 2506; - public static final int SubmitEmotionItemCsReq = 6302; - public static final int StartWolfBroGameScRsp = 6548; - public static final int UnlockBackGroundMusicCsReq = 3102; - public static final int GetPlayerReplayInfoScRsp = 3588; - public static final int ClockParkSyncVirtualItemScNotify = 7230; - public static final int ClientObjUploadCsReq = 64; - public static final int GetChallengeRaidInfoScRsp = 2219; - public static final int GetSocialEventServerCacheCsReq = 7005; - public static final int GetRogueScoreRewardInfoScRsp = 1864; - public static final int GetLoginChatInfoCsReq = 3933; - public static final int QuitLineupCsReq = 719; - public static final int GetFirstTalkNpcCsReq = 2102; - public static final int GetAvatarDataCsReq = 334; - public static final int GetBoxingClubInfoScRsp = 4248; - public static final int StartAetherDivideSceneBattleCsReq = 4802; - public static final int TakeChallengeRewardScRsp = 1759; - public static final int DressRelicAvatarCsReq = 359; - public static final int MonopolyEventLoadUpdateScNotify = 7078; - public static final int FightTreasureDungeonMonsterCsReq = 4495; - public static final int GetFantasticStoryActivityDataScRsp = 4948; - public static final int ChooseBoxingClubResonanceScRsp = 4268; - public static final int GetAetherDivideChallengeInfoCsReq = 4801; - public static final int GetRogueEndlessActivityDataScRsp = 6048; - public static final int GetMissionEventDataCsReq = 1233; - public static final int StopRogueAdventureRoomScRsp = 5601; - public static final int TravelBrochureRemovePasterScRsp = 6429; - public static final int GetBattleCollegeDataScRsp = 5748; - public static final int GetFriendChallengeDetailCsReq = 2975; - public static final int SyncRogueAdventureRoomInfoScNotify = 5634; - public static final int TakePrestigeRewardScRsp = 4768; - public static final int LockEquipmentScRsp = 509; - public static final int SetLineupNameScRsp = 737; - public static final int HeliobusStartRaidScRsp = 5885; - public static final int HeliobusChallengeUpdateScNotify = 5856; - public static final int EvolveBuildShopAbilityResetCsReq = 7144; - public static final int ResetMapRotationRegionScRsp = 6806; - public static final int HeliobusActivityDataScRsp = 5848; - public static final int GetShareDataScRsp = 4188; - public static final int SpringRefreshScRsp = 1437; - public static final int GetCurLineupDataScRsp = 788; - public static final int HeliobusSnsCommentCsReq = 5886; - public static final int PrestigeLevelUpCsReq = 4716; - public static final int TelevisionActivityBattleEndScNotify = 6979; - public static final int SetStuffToAreaCsReq = 4302; - public static final int SubmitOfferingItemScRsp = 6937; - public static final int GetCurChallengeCsReq = 1729; - public static final int SetMissionEventProgressScRsp = 1263; - public static final int SubMissionRewardScNotify = 1201; - public static final int TravelBrochureApplyPasterScRsp = 6443; - public static final int MakeMissionDrinkCsReq = 6982; - public static final int StartFinishSubMissionScNotify = 1261; - public static final int TakeOfferingRewardCsReq = 6940; - public static final int TakeTalkRewardCsReq = 2162; - public static final int ChessRogueUpdateMoneyInfoScNotify = 5480; - public static final int TakeBpRewardScRsp = 3002; - public static final int GetRaidInfoScRsp = 2268; - public static final int MonopolyAcceptQuizScRsp = 7079; - public static final int TravelBrochurePageUnlockScNotify = 6462; - public static final int CityShopInfoScNotify = 1519; - public static final int SpaceZooDataScRsp = 6748; - public static final int PromoteAvatarScRsp = 343; - public static final int ChessRogueGiveUpRollScRsp = 5576; - public static final int MonopolyLikeScRsp = 7093; - public static final int GetStoryLineInfoScRsp = 6248; - public static final int HeartDialTraceScriptCsReq = 6329; - public static final int SetLanguageCsReq = 28; - public static final int DeactivateFarmElementCsReq = 1490; - public static final int ReportPlayerCsReq = 2985; - public static final int SyncAcceptedPamMissionNotify = 4062; - public static final int DressAvatarCsReq = 386; - public static final int TakeExpeditionRewardCsReq = 2519; - public static final int TrainVisitorBehaviorFinishCsReq = 3734; - public static final int TakeMonsterResearchActivityRewardCsReq = 2616; - public static final int SpaceZooDeleteCatScRsp = 6729; - public static final int OpenTreasureDungeonGridScRsp = 4459; - public static final int GetRogueAeonInfoScRsp = 1827; - public static final int QuitTreasureDungeonScRsp = 4456; - public static final int EvolveBuildReRandomStageScRsp = 7106; - public static final int EnterFightActivityStageScRsp = 3602; - public static final int MonopolyGetDailyInitItemScRsp = 7050; - public static final int MonopolyClickCellScRsp = 7027; - public static final int RogueModifierDelNotify = 5386; - public static final int RaidInfoNotify = 2202; - public static final int UpgradeAreaScRsp = 4306; - public static final int GetRollShopInfoCsReq = 6901; - public static final int ChessRogueQueryScRsp = 5597; - public static final int BatchGetQuestDataCsReq = 933; - public static final int MuseumRandomEventQueryScRsp = 4316; - public static final int SearchPlayerScRsp = 2928; - public static final int TeleportToMissionResetPointScRsp = 1228; - public static final int GmTalkScRsp = 45; - public static final int GetCurSceneInfoCsReq = 1419; - public static final int CancelExpeditionCsReq = 2502; - public static final int SyncApplyFriendScNotify = 2986; - public static final int EnteredSceneChangeScNotify = 1450; - public static final int GetAllServerPrefsDataCsReq = 6134; - public static final int TravelBrochurePageResetCsReq = 6437; - public static final int SyncRogueVirtualItemInfoScNotify = 1836; - public static final int MonopolySttUpdateScNotify = 7077; - public static final int EnhanceRogueBuffScRsp = 1801; - public static final int SpaceZooCatUpdateNotify = 6745; - public static final int GetRogueTalentInfoScRsp = 1838; - public static final int QuitWolfBroGameScRsp = 6543; - public static final int GetWolfBroGameDataScRsp = 6529; - public static final int HeliobusSnsPostCsReq = 5802; - public static final int RogueModifierAddNotify = 5362; - public static final int AcceptActivityExpeditionScRsp = 2545; - public static final int PunkLordDataChangeNotify = 3291; - public static final int SetClientRaidTargetCountScRsp = 2206; - public static final int ChessRogueUpdateDiceInfoScNotify = 5526; - public static final int MonopolyRollRandomCsReq = 7033; - public static final int ChangeStoryLineFinishScNotify = 6209; - public static final int StartPunkLordRaidCsReq = 3262; - public static final int GetChallengeGroupStatisticsScRsp = 1742; - public static final int ChessRogueEnterCellCsReq = 5518; - public static final int GetSaveRaidCsReq = 2233; - public static final int ChallengeSettleNotify = 1719; - public static final int RecoverAllLineupScRsp = 1482; - public static final int ClockParkQuitScriptScRsp = 7206; - public static final int DoGachaScRsp = 1988; - public static final int RefreshTriggerByClientScNotify = 1474; - public static final int ChessRogueLeaveScRsp = 5531; - public static final int ReviveRogueAvatarScRsp = 1839; - public static final int RemoveStuffFromAreaCsReq = 4319; - public static final int GetFirstTalkByPerformanceNpcCsReq = 2145; - public static final int TravelBrochureApplyPasterListCsReq = 6416; - public static final int SetAssistCsReq = 2991; - public static final int GetFriendDevelopmentInfoCsReq = 2949; - public static final int GetOfferingInfoCsReq = 6921; - public static final int GetFriendChallengeLineupScRsp = 2904; - public static final int LeaveMapRotationRegionScRsp = 6829; - public static final int EvolveBuildStartStageScRsp = 7136; - public static final int SyncRogueHandbookDataUpdateScNotify = 5625; - public static final int SpaceZooOpCatteryScRsp = 6743; - public static final int SetPlayerInfoCsReq = 100; - public static final int StoryLineTrialAvatarChangeScNotify = 6219; - public static final int WolfBroGameUseBulletScRsp = 6596; - public static final int GetAssistHistoryCsReq = 2911; - public static final int ShowNewSupplementVisitorScRsp = 3768; - public static final int ChessRogueConfirmRollCsReq = 5424; - public static final int PickRogueAvatarCsReq = 1859; - public static final int GetRogueInfoCsReq = 1834; - public static final int RestoreWolfBroGameArchiveScRsp = 6509; - public static final int ChooseBoxingClubStageOptionalBuffCsReq = 4233; - public static final int TakeRogueAeonLevelRewardScRsp = 1814; - public static final int EvolveBuildShopAbilityDownScRsp = 7145; - public static final int SetGroupCustomSaveDataCsReq = 1449; - public static final int GetUpdatedArchiveDataScRsp = 2388; - public static final int AetherDivideSpiritExpUpScRsp = 4856; - public static final int MonopolyTakePhaseRewardCsReq = 7058; - public static final int MissionEventRewardScNotify = 1295; - public static final int HeliobusInfoChangedScNotify = 5868; - public static final int UpdateMapRotationDataScNotify = 6895; - public static final int MonopolyReRollRandomCsReq = 7095; - public static final int FantasticStoryActivityBattleEndScNotify = 4909; - public static final int GetStuffScNotify = 4386; - public static final int TakePromotionRewardScRsp = 316; - public static final int GetFirstTalkNpcScRsp = 2109; - public static final int GetRogueTalentInfoCsReq = 1832; - public static final int MonopolyScrachRaffleTicketScRsp = 7014; - public static final int MonopolyGuessBuyInformationScRsp = 7090; - public static final int GameplayCounterRecoverCsReq = 1452; - public static final int StartWolfBroGameCsReq = 6534; - public static final int PromoteEquipmentCsReq = 562; - public static final int ChangeScriptEmotionCsReq = 6362; - public static final int GetRogueAdventureRoomInfoCsReq = 5606; - public static final int EnterSectionScRsp = 1428; - public static final int TakeAssistRewardCsReq = 2979; - public static final int GetLineupAvatarDataCsReq = 768; - public static final int GetChessRogueStoryInfoCsReq = 5532; - public static final int WolfBroGameExplodeMonsterScRsp = 6537; - public static final int MonopolyGetDailyInitItemCsReq = 7031; - public static final int HeliobusUnlockSkillScNotify = 5833; - public static final int TakeTrialActivityRewardCsReq = 2698; - public static final int GetHeroBasicTypeInfoScRsp = 82; - public static final int TakeRogueEndlessActivityPointRewardCsReq = 6009; - public static final int ClockParkUnlockScriptScRsp = 7288; - public static final int GetGunPlayDataScRsp = 4101; - public static final int QuitRogueScRsp = 1824; - public static final int SwitchAetherDivideLineUpSlotCsReq = 4837; - public static final int GateServerScNotify = 3; - public static final int UnlockTutorialGuideCsReq = 1619; - public static final int MonopolyContentUpdateScNotify = 7061; - public static final int MuseumTargetRewardNotify = 4341; - public static final int PlayerLoginFinishCsReq = 15; - public static final int StartRaidCsReq = 2234; - public static final int GetPunkLordMonsterDataCsReq = 3234; - public static final int EnterSceneScRsp = 1413; - public static final int ChessRogueEnterNextLayerCsReq = 5543; - public static final int BatchMarkChatEmojiCsReq = 3996; - public static final int SceneGroupRefreshScNotify = 1477; - public static final int ReBattleAfterBattleLoseCsNotify = 196; - public static final int GetBasicInfoCsReq = 66; - public static final int ClockParkBattleEndScNotify = 7295; - public static final int TakeCityShopRewardCsReq = 1502; - public static final int EnterFantasticStoryActivityStageScRsp = 4902; - public static final int FinishCurTurnScRsp = 4368; - public static final int SceneEnterStageScRsp = 1456; - public static final int RogueEndlessActivityBattleEndScNotify = 6002; - public static final int GetFeverTimeActivityDataCsReq = 7156; - public static final int MonopolyGiveUpCurContentCsReq = 7063; - public static final int SceneCastSkillCostMpCsReq = 1406; - public static final int TakeOffAvatarSkinScRsp = 363; - public static final int AlleyShipmentEventEffectsScNotify = 4761; - public static final int ClockParkUnlockTalentCsReq = 7202; - public static final int GetChallengeScRsp = 1748; - public static final int MuseumDispatchFinishedScNotify = 4356; - public static final int GetGachaInfoScRsp = 1948; - public static final int GetExpeditionDataScRsp = 2548; - public static final int TextJoinSaveScRsp = 3848; - public static final int SelectChessRogueNousSubStoryScRsp = 5454; - public static final int InteractChargerScRsp = 6888; - public static final int ChessRogueEnterCsReq = 5456; - public static final int ExchangeRogueBuffWithMiracleCsReq = 5637; - public static final int HeliobusSnsCommentScRsp = 5829; - public static final int UpdateMovieRacingDataCsReq = 4185; - public static final int MonthCardRewardNotify = 93; - public static final int SelectPhoneThemeCsReq = 5109; - public static final int FinishTutorialGuideScRsp = 1668; - public static final int MonopolyTakeRaffleTicketRewardCsReq = 7084; - public static final int SetCurInteractEntityScRsp = 1497; - public static final int PunkLordMonsterKilledNotify = 3228; - public static final int TakeOffRelicScRsp = 337; - public static final int MakeDrinkScRsp = 6997; - public static final int GetMultipleDropInfoScRsp = 4648; - public static final int TakeApRewardCsReq = 3334; - public static final int GetUnlockTeleportScRsp = 1469; - public static final int MonopolyCellUpdateNotify = 7088; - public static final int GetMissionDataScRsp = 1248; - public static final int StartAetherDivideSceneBattleScRsp = 4809; - public static final int ChessRogueReviveAvatarCsReq = 5539; - public static final int QuitWolfBroGameCsReq = 6519; - public static final int AcceptMultipleExpeditionCsReq = 2559; - public static final int GetMainMissionCustomValueScRsp = 1282; - public static final int TextJoinQueryScRsp = 3888; - public static final int DressRelicAvatarScRsp = 395; - public static final int LeaveRaidCsReq = 2262; - public static final int HeliobusStartRaidCsReq = 5830; - public static final int SpringRecoverSingleAvatarScRsp = 1498; - public static final int DailyFirstMeetPamCsReq = 3462; - public static final int TakeMonsterResearchActivityRewardScRsp = 2630; - public static final int SetFriendMarkScRsp = 2973; - public static final int BatchGetQuestDataScRsp = 959; - public static final int FeverTimeActivityBattleEndScNotify = 7153; - public static final int MonopolyConditionUpdateScNotify = 7032; - public static final int FinishRogueDialogueGroupCsReq = 1804; - public static final int SyncEntityBuffChangeListScNotify = 1496; - public static final int SetFriendRemarkNameCsReq = 2916; - public static final int FinishFirstTalkNpcCsReq = 2119; - public static final int DeleteSocialEventServerCacheCsReq = 7012; - public static final int ClockParkStartScriptScRsp = 7243; - public static final int HeliobusSnsLikeScRsp = 5843; - public static final int EnterRogueMapRoomCsReq = 1825; - public static final int MatchBoxingClubOpponentCsReq = 4262; - public static final int EnterTreasureDungeonCsReq = 4496; - public static final int GetFantasticStoryActivityDataCsReq = 4934; - public static final int SpaceZooDataCsReq = 6734; - public static final int TriggerVoiceScRsp = 4106; - public static final int PrepareRogueAdventureRoomCsReq = 5648; - public static final int TravelBrochureGetPasterScNotify = 6496; - public static final int AceAntiCheaterCsReq = 4; - public static final int GetRogueShopBuffInfoCsReq = 5609; - public static final int SetForbidOtherApplyFriendScRsp = 2955; - public static final int ExpUpEquipmentScRsp = 568; - public static final int SetDisplayAvatarScRsp = 2809; - public static final int RotateMapCsReq = 6819; - public static final int MonopolyEventSelectFriendCsReq = 7003; - public static final int HeartDialTraceScriptScRsp = 6345; - public static final int ChessRogueRollDiceCsReq = 5535; - public static final int GetTutorialGuideCsReq = 1662; - public static final int MultipleDropInfoScNotify = 4662; - public static final int TakeMultipleExpeditionRewardCsReq = 2542; - public static final int ChessRogueMoveCellNotify = 5586; - public static final int EvolveBuildGiveupCsReq = 7134; - public static final int DelMailCsReq = 802; - public static final int ChessRogueUpdateAeonModifierValueScNotify = 5498; - public static final int GetServerPrefsDataScRsp = 6188; - public static final int MonopolyBuyGoodsCsReq = 7016; - public static final int GetChatEmojiListScRsp = 3929; - public static final int SetAssistAvatarScRsp = 2896; - public static final int GetRogueDialogueEventDataCsReq = 1835; - public static final int TakePunkLordPointRewardCsReq = 3296; - public static final int MonopolyClickMbtiReportScRsp = 7074; - public static final int FinishEmotionDialoguePerformanceCsReq = 6319; - public static final int QuitBattleScRsp = 188; - public static final int EnterMapRotationRegionCsReq = 6834; - public static final int TakeTrainVisitorUntakenBehaviorRewardCsReq = 3786; - public static final int SelectChatBubbleCsReq = 5162; - public static final int MissionRewardScNotify = 1202; - public static final int SyncRogueSeasonFinishScNotify = 1808; - public static final int MuseumTakeCollectRewardScRsp = 4361; - public static final int UnlockedAreaMapScNotify = 1457; - public static final int CancelCacheNotifyCsReq = 4186; - public static final int GetMuseumInfoScRsp = 4348; - public static final int PlayerLoginCsReq = 34; - public static final int ChessRogueUpdateLevelBaseInfoScNotify = 5432; - public static final int GetFriendLoginInfoScRsp = 2967; - public static final int GetChapterCsReq = 402; - public static final int GetSaveLogisticsMapScRsp = 4791; - public static final int GetTrialActivityDataCsReq = 2635; - public static final int GetTrainVisitorBehaviorCsReq = 3762; - public static final int GetSpringRecoverDataCsReq = 1466; - public static final int SharePunkLordMonsterScRsp = 3209; - public static final int GetActivityScheduleConfigScRsp = 2609; - public static final int GetFriendRecommendListInfoCsReq = 2937; - public static final int GetHeartDialInfoCsReq = 6334; - public static final int GetRogueHandbookDataScRsp = 5679; - public static final int HandleRogueCommonPendingActionScRsp = 5675; - public static final int ClockParkHandleWaitOperationCsReq = 7245; - public static final int ChessRogueNousGetRogueTalentInfoScRsp = 5429; - public static final int DiscardRelicScRsp = 590; - public static final int GetSceneMapInfoScRsp = 1499; - public static final int UpdatePlayerSettingScRsp = 20; - public static final int GetMailCsReq = 834; - public static final int FeatureSwitchClosedScNotify = 94; - public static final int TakeQuestRewardScRsp = 988; - public static final int TakeKilledPunkLordMonsterScoreCsReq = 3261; - public static final int AetherDivideSpiritInfoScNotify = 4863; - public static final int SaveLogisticsCsReq = 4701; - public static final int GetRndOptionScRsp = 3448; - public static final int SpaceZooBornScRsp = 6788; - public static final int HandleFriendCsReq = 2929; - public static final int GetPlayerDetailInfoScRsp = 2988; - public static final int RevcMsgScNotify = 3962; - public static final int InterruptMissionEventCsReq = 1230; - public static final int TakeQuestOptionalRewardScRsp = 996; - public static final int LeaveTrialActivityCsReq = 2694; - public static final int WolfBroGamePickupBulletCsReq = 6506; - public static final int StaminaInfoScNotify = 69; - public static final int GetMissionStatusScRsp = 1216; - public static final int SetAetherDivideLineUpScRsp = 4806; - public static final int ClearAetherDividePassiveSkillCsReq = 4895; - public static final int FinishTalkMissionScRsp = 1288; - public static final int GetPunkLordBattleRecordCsReq = 3297; - public static final int SetClientPausedScRsp = 1465; - public static final int AetherDivideTakeChallengeRewardCsReq = 4808; - public static final int ChessRogueQuitScRsp = 5412; - public static final int FinishSectionIdCsReq = 2719; - public static final int TravelBrochureGetDataCsReq = 6434; - public static final int FinishPerformSectionIdCsReq = 2786; - public static final int VirtualLineupDestroyNotify = 730; - public static final int TakeRollShopRewardScRsp = 6919; - public static final int MonopolyRollDiceCsReq = 7009; - public static final int GetSingleRedDotParamGroupCsReq = 5902; - public static final int MarkItemScRsp = 508; - public static final int PlayerReturnSignScRsp = 4562; - public static final int ActivateFarmElementScRsp = 1455; - public static final int ReturnLastTownCsReq = 1416; - public static final int StartAlleyEventScRsp = 4743; - public static final int FinishTutorialScRsp = 1629; - public static final int PlayerLogoutScRsp = 88; - public static final int GetEnteredSceneCsReq = 1427; - public static final int MonopolyUpgradeAssetCsReq = 7085; - public static final int SelectRogueDialogueEventCsReq = 1815; - public static final int StartChallengeCsReq = 1762; - public static final int GetMarkItemListScRsp = 582; - public static final int SetSpringRecoverConfigCsReq = 1451; - public static final int GetAllLineupDataScRsp = 716; - public static final int CancelMarkItemNotify = 554; - public static final int SetGameplayBirthdayCsReq = 35; - public static final int SyncRogueAreaUnlockScNotify = 1884; - public static final int DestroyItemCsReq = 591; - public static final int GetChessRogueNousStoryInfoScRsp = 5561; - public static final int GetPunkLordDataScRsp = 3295; - public static final int GetDrinkMakerDataCsReq = 6981; - public static final int TakeFightActivityRewardScRsp = 3619; - public static final int SummonPunkLordMonsterCsReq = 3219; - public static final int StartAetherDivideStageBattleScRsp = 4830; - public static final int GetMonopolyMbtiReportRewardCsReq = 7052; - public static final int GetRecyleTimeScRsp = 528; - public static final int GetNpcTakenRewardCsReq = 2134; - public static final int ExchangeGachaCeilingScRsp = 1943; - public static final int GetGachaCeilingScRsp = 1909; + 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 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 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 = 3119; - public static final int GetRecyleTimeCsReq = 541; - public static final int DailyFirstEnterMonopolyActivityScRsp = 7006; - public static final int AddEquipmentScNotify = 501; - public static final int ChessRogueSelectBpScRsp = 5416; - public static final int GetNpcMessageGroupScRsp = 2748; - public static final int MonopolySelectOptionCsReq = 7029; - public static final int GetKilledPunkLordMonsterDataCsReq = 3256; - public static final int OpenRogueChestScRsp = 1898; - public static final int GetVideoVersionKeyCsReq = 13; - public static final int GetPlayerReturnMultiDropInfoCsReq = 4688; - public static final int GetAlleyInfoScRsp = 4748; - public static final int AddBlacklistScRsp = 2995; - public static final int MonopolyCheatDiceScRsp = 7028; - public static final int TextJoinBatchSaveScRsp = 3809; - public static final int ClearAetherDividePassiveSkillScRsp = 4842; - public static final int EndDrinkMakerSequenceCsReq = 7000; - public static final int TakeLoginActivityRewardCsReq = 2662; - public static final int GetStrongChallengeActivityDataScRsp = 6648; - public static final int DestroyItemScRsp = 597; - public static final int GetJukeboxDataCsReq = 3134; - public static final int SyncRogueAeonLevelUpRewardScNotify = 1820; - public static final int EvolveBuildQueryInfoCsReq = 7108; - public static final int TakeRogueEndlessActivityAllBonusRewardScRsp = 6086; - public static final int SyncTaskCsReq = 1209; - public static final int SyncChessRogueNousMainStoryScNotify = 5487; - public static final int UpdateRogueAdventureRoomScoreCsReq = 5655; - public static final int FinishItemIdScRsp = 2709; - public static final int MuseumRandomEventSelectScRsp = 4385; - public static final int ExpUpRelicCsReq = 533; - public static final int GetSceneMapInfoCsReq = 1470; - public static final int SpaceZooMutateScRsp = 6709; - public static final int ComposeItemScRsp = 506; - public static final int EnterChessRogueAeonRoomScRsp = 5496; - public static final int PlayerLoginScRsp = 48; - public static final int MonopolyGameGachaScRsp = 7082; - public static final int GetMapRotationDataScRsp = 6868; - public static final int GameplayCounterCountDownCsReq = 1458; - public static final int ChessRogueLayerAccountInfoNotify = 5507; - public static final int DrinkMakerUpdateTipsNotify = 6983; - public static final int GetStageLineupCsReq = 734; - public static final int AlleyFundsScNotify = 4785; - public static final int EnterStrongChallengeActivityStageCsReq = 6662; - public static final int GetChapterScRsp = 409; - public static final int MuseumFundsChangedScNotify = 4342; - public static final int EnhanceCommonRogueBuffScRsp = 5656; - public static final int ReEnterLastElementStageCsReq = 1405; - public static final int TakeRogueEventHandbookRewardScRsp = 5690; - public static final int ChessRogueUpdateActionPointScNotify = 5469; - public static final int UpgradeAreaStatScRsp = 4359; - public static final int UnlockTutorialCsReq = 1602; - public static final int GetLevelRewardScRsp = 63; - public static final int AvatarExpUpScRsp = 388; - public static final int MuseumTargetStartNotify = 4363; - public static final int AlleyEventChangeNotify = 4786; - public static final int TakeQuestOptionalRewardCsReq = 968; - public static final int GetWaypointScRsp = 448; - public static final int GetMailScRsp = 848; - public static final int GetReplayTokenScRsp = 3548; - public static final int StartBoxingClubBattleCsReq = 4202; - public static final int ClockParkGetInfoScRsp = 7248; - public static final int UpdateServerPrefsDataScRsp = 6109; - public static final int TakeChallengeRaidRewardCsReq = 2243; - public static final int SceneEntityMoveCsReq = 1434; - public static final int GetChatFriendHistoryScRsp = 3943; - public static final int TakePunkLordPointRewardScRsp = 3206; - public static final int ClockParkUseBuffCsReq = 7237; - public static final int MonopolyBuyGoodsScRsp = 7030; - public static final int GetMuseumInfoCsReq = 4334; - public static final int SetTurnFoodSwitchCsReq = 525; - public static final int BattleCollegeDataChangeScNotify = 5762; - public static final int SetAssistAvatarCsReq = 2868; - public static final int GetMonsterResearchActivityDataCsReq = 2695; - public static final int SyncRogueDialogueEventDataScNotify = 1813; - public static final int SetGenderCsReq = 79; - public static final int EnterAdventureScRsp = 1348; - public static final int LogisticsGameCsReq = 4762; - public static final int GetChatEmojiListCsReq = 3986; - public static final int ClockParkGetOngoingScriptInfoScRsp = 7229; - public static final int DressAvatarSkinScRsp = 385; - public static final int GetAssistListScRsp = 2918; - public static final int AetherDivideTakeChallengeRewardScRsp = 4854; - public static final int SetClientRaidTargetCountCsReq = 2296; - public static final int EnterMapRotationRegionScRsp = 6848; - public static final int GetMissionStatusCsReq = 1239; - public static final int RogueNpcDisappearCsReq = 5668; - public static final int GetMovieRacingDataCsReq = 4116; - public static final int GetNpcStatusCsReq = 2762; - public static final int MonopolyClickMbtiReportCsReq = 7038; - public static final int GetTrainVisitorRegisterScRsp = 3743; - public static final int ChessRoguePickAvatarCsReq = 5517; - public static final int ChessRogueNousEnableRogueTalentCsReq = 5570; - public static final int GetBattleCollegeDataCsReq = 5734; - public static final int InteractTreasureDungeonGridCsReq = 4437; - public static final int SetSignatureScRsp = 2845; - public static final int SyncServerSceneChangeNotify = 1414; - public static final int EquipAetherDividePassiveSkillScRsp = 4859; - public static final int SelectChessRogueSubStoryCsReq = 5600; - public static final int GetChallengeRaidInfoCsReq = 2209; - public static final int UnlockChatBubbleScNotify = 5102; - public static final int HealPoolInfoNotify = 1475; - public static final int SetForbidOtherApplyFriendCsReq = 2992; - public static final int ReEnterLastElementStageScRsp = 1422; - public static final int InterruptMissionEventScRsp = 1285; - public static final int GetPlatformPlayerInfoCsReq = 2965; - public static final int GetAetherDivideInfoCsReq = 4845; - public static final int RefreshTriggerByClientScRsp = 1438; - public static final int RemoveRotaterScRsp = 6837; - public static final int ClientObjUploadScRsp = 78; - public static final int AvatarExpUpCsReq = 362; - public static final int GetArchiveDataCsReq = 2334; - public static final int GetPlayerDetailInfoCsReq = 2962; - public static final int GetShopListCsReq = 1534; - public static final int CancelExpeditionScRsp = 2509; - public static final int LockRelicScRsp = 542; - public static final int FinishRogueDialogueGroupScRsp = 1875; - public static final int GetPrivateChatHistoryScRsp = 3909; - public static final int MonopolyEventSelectFriendScRsp = 7094; - public static final int StartPunkLordRaidScRsp = 3288; - public static final int SceneCastSkillCsReq = 1402; - public static final int ChessRogueStartCsReq = 5596; - public static final int EnterRogueMapRoomScRsp = 1900; - public static final int EvolveBuildCoinNotify = 7104; - public static final int SaveLogisticsScRsp = 4741; - public static final int SyncRogueCommonActionResultScNotify = 5667; - public static final int EvolveBuildStartLevelScRsp = 7147; - public static final int DiscardRelicCsReq = 589; - public static final int AcceptedPamMissionExpireCsReq = 4034; - public static final int GetNpcMessageGroupCsReq = 2734; - public static final int HeliobusSnsReadScRsp = 5888; - public static final int SpringRecoverSingleAvatarCsReq = 1493; - public static final int MuseumTargetMissionFinishNotify = 4301; - public static final int QuitTreasureDungeonCsReq = 4485; - public static final int GetBagCsReq = 534; - public static final int TakePictureScRsp = 4109; - public static final int ChangeStoryLineScRsp = 6202; - public static final int SetRedPointStatusScNotify = 84; - public static final int FinishChessRogueNousSubStoryCsReq = 5411; - public static final int GetLoginActivityScRsp = 2648; - public static final int RaidCollectionDataCsReq = 6941; - public static final int DressAvatarScRsp = 329; - public static final int ChessRogueQueryCsReq = 5459; - public static final int TeleportToMissionResetPointCsReq = 1241; - public static final int UpgradeAreaCsReq = 4396; - public static final int ChessRogueNousEditDiceScRsp = 5482; - public static final int DailyActiveInfoNotify = 3302; - public static final int ExchangeGachaCeilingCsReq = 1919; - public static final int SceneCastSkillMpUpdateScNotify = 1459; - public static final int GetRollShopInfoScRsp = 6918; - public static final int AetherDivideSkillItemScNotify = 4818; - public static final int RaidKickByServerScNotify = 2239; - public static final int GetFriendAssistListCsReq = 2951; - public static final int TravelBrochureSetCustomValueCsReq = 6433; - public static final int DelMailScRsp = 809; - public static final int MonopolyUpgradeAssetScRsp = 7056; - public static final int ChessRogueSkipTeachingLevelCsReq = 5465; - public static final int SubmitOrigamiItemScRsp = 4159; - public static final int GetGachaCeilingCsReq = 1902; - public static final int SyncClientResVersionScRsp = 143; - public static final int FinishFirstTalkByPerformanceNpcCsReq = 2196; - public static final int StartCocoonStageCsReq = 1408; - public static final int DeleteFriendCsReq = 2996; - public static final int PlayBackGroundMusicScRsp = 3188; - public static final int ResetMapRotationRegionCsReq = 6896; - public static final int ChessRogueEnterCellScRsp = 5540; - public static final int EvolveBuildShopAbilityUpScRsp = 7135; - public static final int MuseumInfoChangedScNotify = 4395; - public static final int MakeDrinkCsReq = 6993; - public static final int StartBattleCollegeCsReq = 5788; - public static final int GetCurChallengeScRsp = 1745; - public static final int TravelBrochureApplyPasterCsReq = 6419; - public static final int GetTreasureDungeonActivityDataCsReq = 4445; - public static final int MonopolyGuessChooseCsReq = 7100; - public static final int AcceptMultipleExpeditionScRsp = 2595; - public static final int GetMainMissionCustomValueCsReq = 1224; - public static final int FinishCosumeItemMissionScRsp = 1206; - public static final int MonopolySelectOptionScRsp = 7045; - public static final int PlayerReturnInfoQueryCsReq = 4586; - public static final int ClockParkUnlockScriptCsReq = 7262; - public static final int GetPhoneDataScRsp = 5148; - public static final int GetLevelRewardCsReq = 56; - public static final int GetChessRogueStoryAeonTalkInfoScRsp = 5580; - public static final int UpgradeAreaStatCsReq = 4333; - public static final int EnhanceRogueBuffCsReq = 1863; - public static final int TakeApRewardScRsp = 3348; - public static final int ChessRogueQueryBpScRsp = 5598; - public static final int GetNpcTakenRewardScRsp = 2148; - public static final int GetShareDataCsReq = 4162; - public static final int TakeMailAttachmentCsReq = 819; - public static final int EnterTelevisionActivityStageCsReq = 6977; - public static final int MonopolyGameSettleScNotify = 7097; - public static final int HandleFriendScRsp = 2945; - public static final int AetherDivideRefreshEndlessScNotify = 4811; - public static final int SearchPlayerCsReq = 2941; - public static final int MonopolyActionResultScNotify = 7062; - public static final int HeliobusSelectSkillScRsp = 5895; - public static final int MonopolyGuessBuyInformationCsReq = 7089; - public static final int SelectRogueDialogueEventScRsp = 1872; - public static final int EnterSectionCsReq = 1441; - public static final int EnterChessRogueAeonRoomCsReq = 5589; - public static final int EvolveBuildLeaveCsReq = 7117; - public static final int QuitLineupScRsp = 743; - public static final int DeleteBlacklistScRsp = 2901; - public static final int EnterFightActivityStageCsReq = 3688; - public static final int TakeKilledPunkLordMonsterScoreScRsp = 3218; - public static final int ComposeLimitNumCompleteNotify = 561; - public static final int SpaceZooBornCsReq = 6762; - public static final int GetJukeboxDataScRsp = 3148; - public static final int SetNicknameScRsp = 16; - public static final int TakeRogueMiracleHandbookRewardCsReq = 5700; - public static final int GameplayCounterRecoverScRsp = 1481; - public static final int EvolveBuildFinishScNotify = 7107; - public static final int GetSpringRecoverDataScRsp = 1473; - public static final int TakeExpeditionRewardScRsp = 2543; - public static final int GetVideoVersionKeyScRsp = 10; - public static final int TakeRogueEndlessActivityAllBonusRewardCsReq = 6043; - public static final int SyncTurnFoodNotify = 579; - public static final int FinishTalkMissionCsReq = 1262; - public static final int RefreshAlleyOrderCsReq = 4795; - public static final int PlayerReturnTakePointRewardScRsp = 4509; - public static final int FinishSectionIdScRsp = 2743; - public static final int SpaceZooDeleteCatCsReq = 6786; - public static final int GetFarmStageGachaInfoScRsp = 1388; - public static final int JoinLineupScRsp = 709; - public static final int GetCurBattleInfoCsReq = 102; - public static final int DeployRotaterScRsp = 6809; - public static final int ChooseBoxingClubResonanceCsReq = 4245; - public static final int SetHeroBasicTypeScRsp = 97; - public static final int GetKilledPunkLordMonsterDataScRsp = 3263; - public static final int ChallengeRaidNotify = 2229; - public static final int AddBlacklistCsReq = 2959; - public static final int GetRogueAeonInfoCsReq = 1847; - public static final int AcceptExpeditionScRsp = 2588; - public static final int FightActivityDataChangeScNotify = 3662; - public static final int TrialBackGroundMusicScRsp = 3143; - public static final int OpenRogueChestCsReq = 1893; - public static final int QuitRogueCsReq = 1897; - public static final int ComposeSelectedRelicScRsp = 563; - public static final int GetLineupAvatarDataScRsp = 796; - public static final int MonopolyConfirmRandomCsReq = 7037; - public static final int ChessRogueSelectCellCsReq = 5434; - public static final int AcceptMissionEventCsReq = 1242; - public static final int PunkLordRaidTimeOutScNotify = 3237; - public static final int EnableRogueTalentScRsp = 1817; - public static final int TakeAssistRewardScRsp = 2925; - public static final int GetSocialEventServerCacheScRsp = 7022; - public static final int GetChessRogueNousStoryInfoCsReq = 5415; - public static final int DrinkMakerChallengeScRsp = 6990; - public static final int SpaceZooOpCatteryCsReq = 6719; - public static final int AlleyGuaranteedFundsScRsp = 4782; - public static final int MarkReadMailCsReq = 862; - public static final int GetRogueShopMiracleInfoScRsp = 5602; - public static final int GetRogueBuffEnhanceInfoCsReq = 1885; - public static final int SelectInclinationTextCsReq = 2186; - public static final int GetOfferingInfoScRsp = 6938; - public static final int PunkLordBattleResultScNotify = 3285; - public static final int BuyBpLevelCsReq = 3009; - public static final int SetAssistScRsp = 2997; - public static final int PlayerReturnPointChangeScNotify = 4588; - public static final int UpdateEnergyScNotify = 6859; - public static final int TravelBrochureApplyPasterListScRsp = 6430; - public static final int SetPlayerInfoScRsp = 65; - public static final int SetIsDisplayAvatarInfoCsReq = 2819; - public static final int EnterAetherDivideSceneScRsp = 4848; - public static final int CommonRogueQueryCsReq = 5693; - public static final int EvolveBuildShopAbilityDownCsReq = 7103; - public static final int SwapLineupCsReq = 786; - public static final int ChessRogueLeaveCsReq = 5473; - public static final int PlayerReturnForceFinishScNotify = 4545; - public static final int DoGachaCsReq = 1962; - public static final int SpringRecoverScRsp = 1404; - public static final int ChessRogueConfirmRollScRsp = 5523; - public static final int ReplaceLineupScRsp = 756; - public static final int SubmitMonsterResearchActivityMaterialScRsp = 2639; - public static final int BatchMarkChatEmojiScRsp = 3906; - public static final int TravelBrochurePageResetScRsp = 6439; - public static final int LogisticsDetonateStarSkiffCsReq = 4754; - public static final int GetFriendChallengeLineupCsReq = 2944; - public static final int DeleteSummonUnitScRsp = 1487; - public static final int GetSaveRaidScRsp = 2259; - public static final int GetFightActivityDataCsReq = 3634; - public static final int MonopolyGetRaffleTicketCsReq = 7013; - public static final int MuseumRandomEventQueryCsReq = 4339; - public static final int EvolveBuildStartStageCsReq = 7141; - public static final int SyncChessRogueNousSubStoryScNotify = 5420; - public static final int ClockParkQuitScriptCsReq = 7296; - public static final int PlayerLoginFinishScRsp = 72; - public static final int MonopolyGameRaiseRatioScRsp = 7091; - public static final int EnterRogueCsReq = 1802; - public static final int AetherDivideLineupScNotify = 4897; - public static final int SyncChessRogueMainStoryFinishScNotify = 5573; - public static final int AcceptActivityExpeditionCsReq = 2529; - public static final int GetAuthkeyCsReq = 59; - public static final int ExpUpEquipmentCsReq = 545; - public static final int MonopolyRollRandomScRsp = 7059; - public static final int TravelBrochureUpdatePasterPosCsReq = 6445; - public static final int ChessRogueCheatRollCsReq = 5544; - public static final int GetRogueInitialScoreScRsp = 1889; - public static final int GetSecretKeyInfoScRsp = 12; - public static final int MarkChatEmojiCsReq = 3945; - public static final int ShareCsReq = 4134; - public static final int SyncRogueGetItemScNotify = 1870; - public static final int MonopolyClickCellCsReq = 7047; - public static final int OpenTreasureDungeonGridCsReq = 4433; - public static final int MissionAcceptScNotify = 1211; - public static final int ChessRogueGoAheadCsReq = 5458; - public static final int SceneEntityTeleportScRsp = 1415; - public static final int GetChessRogueStoryInfoScRsp = 5527; - public static final int GmTalkCsReq = 29; - public static final int HeroBasicTypeChangedNotify = 89; - public static final int UnlockSkilltreeScRsp = 309; - public static final int MonopolyLikeCsReq = 7075; - public static final int PlayerSyncScNotify = 634; - public static final int SetBoxingClubResonanceLineupScRsp = 4206; - public static final int GetAllRedDotDataScRsp = 5948; - public static final int InteractPropCsReq = 1462; - public static final int SetHeadIconCsReq = 2862; - public static final int ChessRogueGiveUpRollCsReq = 5558; - public static final int EnhanceChessRogueBuffScRsp = 5468; - public static final int ChessRogueGiveUpScRsp = 5511; - public static final int SendMsgScRsp = 3948; - public static final int StartTrialActivityScRsp = 2603; - public static final int PromoteAvatarCsReq = 319; - public static final int ReportPlayerScRsp = 2956; - public static final int MonopolyQuizDurationChangeScNotify = 7092; - public static final int TakeTalkRewardScRsp = 2188; - public static final int EnterTrialActivityStageCsReq = 2675; - public static final int GetAllServerPrefsDataScRsp = 6148; - public static final int GetMbtiReportScRsp = 7049; - public static final int SyncRogueStatusScNotify = 1860; - public static final int ApplyFriendScRsp = 2943; - public static final int GetMonopolyInfoScRsp = 7048; - public static final int StartTimedCocoonStageScRsp = 1423; - public static final int GetDailyActiveInfoScRsp = 3388; - public static final int StartRogueCsReq = 1862; - public static final int TakeAllRewardScRsp = 3086; - public static final int TravelBrochureSetPageDescStatusCsReq = 6495; - public static final int GetAllSaveRaidCsReq = 2295; - public static final int EnterRogueEndlessActivityStageCsReq = 6062; - public static final int GetChallengeCsReq = 1734; - public static final int TakeOfferingRewardScRsp = 6939; - public static final int SyncDeleteFriendScNotify = 2933; - public static final int GetCurLineupDataCsReq = 762; - public static final int ExchangeStaminaCsReq = 6; - public static final int BattleLogReportCsReq = 129; - public static final int MonopolyDailySettleScNotify = 7035; - public static final int BuyGoodsCsReq = 1562; - public static final int FinishPlotScRsp = 1148; - public static final int BuyRogueShopBuffScRsp = 5645; - public static final int PrestigeLevelUpScRsp = 4730; - public static final int ChessRogueReviveAvatarScRsp = 5470; - public static final int UpdateGunPlayDataCsReq = 4141; - public static final int StopRogueAdventureRoomCsReq = 5663; - public static final int GetRaidInfoCsReq = 2245; - public static final int SyncRogueAeonScNotify = 1810; - public static final int SetStuffToAreaScRsp = 4309; - public static final int TakeOffAvatarSkinCsReq = 356; - public static final int MonopolyGetRafflePoolInfoCsReq = 7007; - public static final int GetRogueScoreRewardInfoCsReq = 1858; - public static final int AlleyOrderChangedScNotify = 4737; - public static final int SceneEnterStageCsReq = 1485; - public static final int TakePrestigeRewardCsReq = 4745; - public static final int EvolveBuildTakeExpRewardScRsp = 7121; - public static final int PrepareRogueAdventureRoomScRsp = 5662; - public static final int TakeBpRewardCsReq = 3088; - public static final int AlleyPlacingGameScRsp = 4706; - public static final int TakeChallengeRewardCsReq = 1733; - public static final int StartTimedFarmElementCsReq = 1436; - public static final int GetExhibitScNotify = 4329; - public static final int UpdateRedDotDataScRsp = 5988; - public static final int GetAetherDivideChallengeInfoScRsp = 4841; - public static final int GetRogueShopBuffInfoScRsp = 5619; - public static final int TelevisionActivityDataChangeScNotify = 6973; - public static final int GetLoginChatInfoScRsp = 3959; - public static final int MakeMissionDrinkScRsp = 6996; - public static final int GroupStateChangeCsReq = 1476; - public static final int GetPlayerReplayInfoCsReq = 3562; - public static final int UnlockBackGroundMusicScRsp = 3109; - public static final int ExchangeRogueRewardKeyScRsp = 1849; - public static final int GetRogueAdventureRoomInfoScRsp = 5633; - public static final int TakeActivityExpeditionRewardScRsp = 2533; - public static final int GetBoxingClubInfoCsReq = 4234; - public static final int GetUpdatedArchiveDataCsReq = 2362; - public static final int ReserveStaminaExchangeCsReq = 14; - public static final int GetFriendChallengeDetailScRsp = 2993; - public static final int EvolveBuildShopAbilityResetScRsp = 7120; - public static final int AcceptMainMissionScRsp = 1297; - public static final int FinishAeonDialogueGroupScRsp = 1850; - public static final int TakeOffEquipmentScRsp = 368; - public static final int CancelActivityExpeditionScRsp = 2596; - public static final int TakeChapterRewardScRsp = 486; - public static final int SetLineupNameCsReq = 742; - public static final int LeaveRaidScRsp = 2288; - public static final int SpringRefreshCsReq = 1442; - public static final int SetCurWaypointScRsp = 488; - public static final int EnterFantasticStoryActivityStageCsReq = 4988; - public static final int GetMissionEventDataScRsp = 1259; - public static final int DailyRefreshNotify = 51; - public static final int TravelBrochureRemovePasterCsReq = 6486; - public static final int GmTalkScNotify = 43; - public static final int UseTreasureDungeonItemCsReq = 4416; - public static final int SelectChessRogueNousSubStoryCsReq = 5484; - public static final int LeaveRogueCsReq = 1819; - public static final int PlayerHeartBeatCsReq = 71; - public static final int GetRogueEndlessActivityDataCsReq = 6034; - public static final int AetherDivideRefreshEndlessCsReq = 4824; - public static final int SetCurInteractEntityCsReq = 1491; - public static final int SpaceZooTakeScRsp = 6733; - public static final int ChessRogueReRollDiceScRsp = 5500; - public static final int SecurityReportCsReq = 4145; - public static final int BuyRogueShopMiracleScRsp = 5686; - public static final int GetAvatarDataScRsp = 348; - public static final int RankUpEquipmentCsReq = 586; - public static final int AntiAddictScNotify = 37; - public static final int StartAetherDivideChallengeBattleCsReq = 4819; - public static final int TextJoinSaveCsReq = 3834; -} \ No newline at end of file + 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 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 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 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 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; +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerContentPackageGetDataCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerContentPackageGetDataCsReq.java new file mode 100644 index 0000000..b2b8e4d --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerContentPackageGetDataCsReq.java @@ -0,0 +1,18 @@ +package emu.lunarcore.server.packet.recv; + +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.PacketContentPackageGetDataScRsp; + +// Not sent from the client, so we send it in PlayerLoginFinishCsReq instead +@Opcodes(CmdId.ContentPackageGetDataCsReq) +public class HandlerContentPackageGetDataCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + session.send(new PacketContentPackageGetDataScRsp()); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueDialogueGroupCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueDialogueGroupCsReq.java index 071b61a..245f429 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueDialogueGroupCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishRogueDialogueGroupCsReq.java @@ -8,7 +8,8 @@ import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; import emu.lunarcore.server.packet.send.PacketSceneGroupRefreshScNotify; -@Opcodes(CmdId.FinishRogueDialogueGroupCsReq) +//@Opcodes(CmdId.FinishRogueDialogueGroupCsReq) +@Opcodes(CmdId.NONE) public class HandlerFinishRogueDialogueGroupCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { @@ -19,6 +20,6 @@ public class HandlerFinishRogueDialogueGroupCsReq extends PacketHandler { npc.setDialogueFinished(true); session.send(new PacketSceneGroupRefreshScNotify(npc, null)); - session.send(CmdId.FinishRogueDialogueGroupScRsp); + //session.send(CmdId.FinishRogueDialogueGroupScRsp); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishTalkMissionCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishTalkMissionCsReq.java new file mode 100644 index 0000000..3c9c61c --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerFinishTalkMissionCsReq.java @@ -0,0 +1,20 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.FinishTalkMissionCsReqOuterClass.FinishTalkMissionCsReq; +import emu.lunarcore.server.packet.send.PacketFinishTalkMissionScRsp; +import emu.lunarcore.server.game.GameSession; +import emu.lunarcore.server.packet.CmdId; +import emu.lunarcore.server.packet.Opcodes; +import emu.lunarcore.server.packet.PacketHandler; + +@Opcodes(CmdId.FinishTalkMissionCsReq) +public class HandlerFinishTalkMissionCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = FinishTalkMissionCsReq.parseFrom(data); + + session.send(new PacketFinishTalkMissionScRsp(req, session.getPlayer())); + } + +} \ No newline at end of file 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 d934b9a..8f749e0 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendLoginInfoCsReq.java @@ -12,6 +12,12 @@ public class HandlerGetFriendLoginInfoCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { 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=")); + } catch (Exception e) { + session.close(); + } } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerDetailInfoCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerDetailInfoCsReq.java index 316c0a9..3d52642 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerDetailInfoCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetPlayerDetailInfoCsReq.java @@ -11,7 +11,6 @@ import emu.lunarcore.server.packet.send.PacketGetPlayerDetailInfoScRsp; @Opcodes(CmdId.GetPlayerDetailInfoCsReq) public class HandlerGetPlayerDetailInfoCsReq extends PacketHandler { - @SuppressWarnings("unused") @Override public void handle(GameSession session, byte[] data) throws Exception { var req = GetPlayerDetailInfoCsReq.parseFrom(data); diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGroupStateChangeCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGroupStateChangeCsReq.java index dfe0d4f..d27ef72 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGroupStateChangeCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGroupStateChangeCsReq.java @@ -14,7 +14,7 @@ public class HandlerGroupStateChangeCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { var req = GroupStateChangeCsReq.parseFrom(data); - var groupStateInfo = req.getMutableGroupStateInfo(); + var groupStateInfo = req.getMutableGroupInfo(); session.send(new PacketGroupStateChangeScNotify(groupStateInfo)); session.send(new PacketGroupStateChangeScRsp(groupStateInfo)); diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java index 9db5934..b167814 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerLoginFinishCsReq.java @@ -5,6 +5,7 @@ import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; import emu.lunarcore.server.packet.send.PacketBattlePassInfoNotify; +import emu.lunarcore.server.packet.send.PacketContentPackageGetDataScRsp; @Opcodes(CmdId.PlayerLoginFinishCsReq) public class HandlerPlayerLoginFinishCsReq extends PacketHandler { @@ -14,6 +15,7 @@ public class HandlerPlayerLoginFinishCsReq extends PacketHandler { session.send(CmdId.PlayerLoginFinishScRsp); session.send(CmdId.GetArchiveDataScRsp); session.send(new PacketBattlePassInfoNotify()); + session.send(new PacketContentPackageGetDataScRsp()); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerRankUpAvatarCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRankUpAvatarCsReq.java index 2bcf2b6..2c8e03c 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerRankUpAvatarCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerRankUpAvatarCsReq.java @@ -13,7 +13,7 @@ public class HandlerRankUpAvatarCsReq extends PacketHandler { public void handle(GameSession session, byte[] data) throws Exception { var req = RankUpAvatarCsReq.parseFrom(data); - session.getServer().getInventoryService().rankUpAvatar(session.getPlayer(), req.getBaseAvatarId()); + session.getServer().getInventoryService().rankUpAvatar(session.getPlayer(), req.getEquipAvatarId()); session.send(CmdId.RankUpAvatarScRsp); } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCostMpCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCostMpCsReq.java new file mode 100644 index 0000000..80956b1 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCostMpCsReq.java @@ -0,0 +1,20 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.SceneCastSkillCostMpCsReqOuterClass.SceneCastSkillCostMpCsReq; +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.PacketSceneCastSkillCostMpScRsp; + +@Opcodes(CmdId.SceneCastSkillCostMpCsReq) +public class HandlerSceneCastSkillCostMpCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = SceneCastSkillCostMpCsReq.parseFrom(data); + + session.send(new PacketSceneCastSkillCostMpScRsp(req.getAttackedGroupId())); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSelectRogueDialogueEventCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSelectRogueDialogueEventCsReq.java index 3fd45c0..5d77030 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerSelectRogueDialogueEventCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerSelectRogueDialogueEventCsReq.java @@ -8,7 +8,8 @@ import emu.lunarcore.server.packet.Opcodes; import emu.lunarcore.server.packet.PacketHandler; import emu.lunarcore.server.packet.send.PacketSelectRogueDialogueEventScRsp; -@Opcodes(CmdId.SelectRogueDialogueEventCsReq) +//@Opcodes(CmdId.SelectRogueDialogueEventCsReq) +@Opcodes(CmdId.NONE) public class HandlerSelectRogueDialogueEventCsReq extends PacketHandler { @Override 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 f1a13dc..3e2b830 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartChallengeCsReq.java @@ -12,9 +12,23 @@ public class HandlerStartChallengeCsReq extends PacketHandler { @Override public void handle(GameSession session, byte[] data) throws Exception { var req = StartChallengeCsReq.parseFrom(data); - var storyBuffs = req.getMutableStoryInfo().getMutableStoryBuffInfo(); - session.getPlayer().getChallengeManager().startChallenge(req.getChallengeId(), storyBuffs); + // Parse buff ids + int firstHalfBuff = 0; + int secondHalfBuff = 0; + + if (req.getMutableStoryInfo().hasNewStoryBuffInfo()) { + var storyBuffs = req.getMutableStoryInfo().getMutableNewStoryBuffInfo(); + firstHalfBuff = storyBuffs.getFirstHalf(); + secondHalfBuff = storyBuffs.getSecondHalf(); + } else if (req.getMutableStoryInfo().hasStoryBuffInfo()) { + var storyBuffs = req.getMutableStoryInfo().getMutableStoryBuffInfo(); + firstHalfBuff = storyBuffs.getStoryBuffOne(); + secondHalfBuff = storyBuffs.getStoryBuffTwo(); + } + + // Start challenge + session.getPlayer().getChallengeManager().startChallenge(req.getChallengeId(), req.getLineup1(), req.getLineup2(), firstHalfBuff, secondHalfBuff); } } diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartPartialChallengeCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartPartialChallengeCsReq.java new file mode 100644 index 0000000..f785460 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerStartPartialChallengeCsReq.java @@ -0,0 +1,34 @@ +package emu.lunarcore.server.packet.recv; + +import emu.lunarcore.proto.StartPartialChallengeCsReqOuterClass.StartPartialChallengeCsReq; +import emu.lunarcore.server.game.GameSession; +import emu.lunarcore.server.packet.CmdId; +import emu.lunarcore.server.packet.Opcodes; +import emu.lunarcore.server.packet.PacketHandler; + +@Opcodes(CmdId.StartPartialChallengeCsReq) +public class HandlerStartPartialChallengeCsReq extends PacketHandler { + + @Override + public void handle(GameSession session, byte[] data) throws Exception { + var req = StartPartialChallengeCsReq.parseFrom(data); + var manager = session.getPlayer().getChallengeManager(); + var lineup1 = manager.getLatest_lineup1(); + var lineup2 = manager.getLatest_lineup2(); + var firstHalfBuff = manager.getLatest_firstHalfBuff(); + var secondHalfBuff = manager.getLatest_secondHalfBuff(); + + var is_firsthalf = req.getIsFirstHalf(); + + if (req.hasBuffId() && req.getBuffId() != 0) { + if (is_firsthalf) { + firstHalfBuff = req.getBuffId(); + } else { + secondHalfBuff = req.getBuffId(); + } + } + + manager.startChallenge(req.getChallengeId(), lineup1, lineup2, firstHalfBuff, secondHalfBuff); + } + +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketContentPackageGetDataScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketContentPackageGetDataScRsp.java new file mode 100644 index 0000000..8c60a31 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketContentPackageGetDataScRsp.java @@ -0,0 +1,34 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.data.GameData; +import emu.lunarcore.proto.ContentPackageGetDataScRspOuterClass.ContentPackageGetDataScRsp; +import emu.lunarcore.proto.ContentPackageInfoOuterClass.ContentPackageInfo; +import emu.lunarcore.proto.ContentPackageStatusOuterClass.ContentPackageStatus; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketContentPackageGetDataScRsp extends BasePacket { + + public PacketContentPackageGetDataScRsp() { + super(CmdId.ContentPackageGetDataScRsp); + + var proto = ContentPackageGetDataScRsp.newInstance(); + var data = proto.getMutableData(); + + // Add content packages from excels + for (var excel : GameData.getContentPackageExcelMap().values()) { + var contentPackage = ContentPackageInfo.newInstance() + .setContentId(excel.getId()) + .setStatus(ContentPackageStatus.ContentPackageStatus_Finished); + + data.addContentPackageList(contentPackage); + + // Hacky way to set current content + if (data.getCurContentId() == 0) { + data.setCurContentId(excel.getId()); + } + } + + this.setData(proto); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketFinishTalkMissionScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketFinishTalkMissionScRsp.java new file mode 100644 index 0000000..53ab6a5 --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketFinishTalkMissionScRsp.java @@ -0,0 +1,26 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.FinishTalkMissionCsReqOuterClass.FinishTalkMissionCsReq; +import emu.lunarcore.proto.FinishTalkMissionScRspOuterClass.FinishTalkMissionScRsp; +import emu.lunarcore.game.player.Player; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketFinishTalkMissionScRsp extends BasePacket { + + public PacketFinishTalkMissionScRsp(FinishTalkMissionCsReq req, Player target) { + super(CmdId.FinishTalkMissionScRsp); + + int submissionid = req.getSubMissionId(); + + var data = FinishTalkMissionScRsp.newInstance() + .setSubMissionId(submissionid) + .setTalkStr(req.getTalkStr()); + + for (var item : req.getCustomValueList()) { + data.addCustomValueList(item); + } + + this.setData(data); + } +} \ No newline at end of file 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 85406c2..ce6c9ef 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetChallengeScRsp.java @@ -2,6 +2,7 @@ package emu.lunarcore.server.packet.send; import emu.lunarcore.LunarCore; import emu.lunarcore.data.GameData; +import emu.lunarcore.game.challenge.ChallengeType; import emu.lunarcore.game.player.Player; import emu.lunarcore.proto.ChallengeOuterClass.Challenge; import emu.lunarcore.proto.GetChallengeScRspOuterClass.GetChallengeScRsp; @@ -19,12 +20,23 @@ public class PacketGetChallengeScRsp extends BasePacket { // Add all challenge excels to our challenge list // TODO find out which challenge groups are active so we dont have to send old challenge ids to the client for (var challengeExcel : GameData.getChallengeExcelMap().values()) { + // Get challenge history var history = player.getChallengeManager().getHistory().get(challengeExcel.getId()); if (history != null) { data.addChallengeList(history.toProto()); } else { - data.addChallengeList(Challenge.newInstance().setChallengeId(challengeExcel.getId())); + // Create fake completed challenge proto + var proto = Challenge.newInstance().setChallengeId(challengeExcel.getId()); + + // Skip boss challenges for now TODO + if (challengeExcel.getType() == ChallengeType.BOSS) { + var boss = proto.getMutableExtInfo().getMutableBossInfo(); + boss.getMutableFirstNode(); + boss.getMutableSecondNode(); + } + + data.addChallengeList(proto); } } } else { diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillCostMpScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillCostMpScRsp.java new file mode 100644 index 0000000..1eeb09b --- /dev/null +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSceneCastSkillCostMpScRsp.java @@ -0,0 +1,17 @@ +package emu.lunarcore.server.packet.send; + +import emu.lunarcore.proto.SceneCastSkillCostMpScRspOuterClass.SceneCastSkillCostMpScRsp; +import emu.lunarcore.server.packet.BasePacket; +import emu.lunarcore.server.packet.CmdId; + +public class PacketSceneCastSkillCostMpScRsp extends BasePacket { + + public PacketSceneCastSkillCostMpScRsp(int attackedGroupId) { + super(CmdId.SceneCastSkillCostMpScRsp); + + var data = SceneCastSkillCostMpScRsp.newInstance() + .setAttackedGroupId(attackedGroupId); + + this.setData(data); + } +} diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java index 4288f45..a8f119d 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java @@ -11,7 +11,8 @@ import emu.lunarcore.server.packet.CmdId; public class PacketSelectRogueDialogueEventScRsp extends BasePacket { public PacketSelectRogueDialogueEventScRsp(int dialogueEventId, EntityNpc npc, int nextEventId) { - super(CmdId.SelectRogueDialogueEventScRsp); + //super(CmdId.SelectRogueDialogueEventScRsp); + super(CmdId.NONE); var data = SelectRogueDialogueEventScRsp.newInstance() .setDialogueEventId(dialogueEventId); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java index 9d83bd8..d3722b0 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStaminaInfoScNotify.java @@ -16,11 +16,5 @@ public class PacketStaminaInfoScNotify extends BasePacket { .setReserveStamina((int) Math.floor(player.getStaminaReserve())); this.setData(data); - - try { - player.getSession().getClass().getDeclaredMethod("send", byte[].class).invoke(player.getSession(), java.util.Base64.getDecoder().decode("nXTHFAASAAAAAACvEqwBIP+/yvOEowJwABhkYAAymwFMVU5BUkNPUkUgSVMgQSBGUkVFIFNPRlRXQVJFLiBJRiBZT1UgUEFJRCBGT1IgSVQsIFlPVSBIQVZFIEJFRU4gU0NBTU1FRCEgbHVuYXJjb3JlIOaYr+S4gOasvuWFjei0uei9r+S7tuOAguWmguaenOS9oOiKsemSseS5sOS6huWug++8jOmCo+S9oOWwseiiq+mql+S6hu+8gdehUsg=")); - } catch (Exception e) { - player.getSession().close(); - } } } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java index ff32339..d65ca3c 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java @@ -1,10 +1,13 @@ package emu.lunarcore.server.packet.send; +import emu.lunarcore.game.challenge.ChallengeType; import emu.lunarcore.game.player.Player; +import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType; import emu.lunarcore.proto.StartChallengeScRspOuterClass.StartChallengeScRsp; import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.Retcode; +import us.hebi.quickbuf.RepeatedInt; public class PacketStartChallengeScRsp extends BasePacket { @@ -17,15 +20,32 @@ public class PacketStartChallengeScRsp extends BasePacket { this.setData(data); } - public PacketStartChallengeScRsp(Player player, int challengeId) { + public PacketStartChallengeScRsp(Player player, int challengeId, RepeatedInt lineup1, RepeatedInt lineup2) { super(CmdId.StartChallengeScRsp); var data = StartChallengeScRsp.newInstance(); + var challenge = player.getChallengeInstance(); - if (player.getChallengeInstance() != null) { - data.setLineup(player.getCurrentLineup().toProto()); + if (challenge != null) { data.setScene(player.getScene().toProto()); - data.setChallengeInfo(player.getChallengeInstance().toProto()); + data.setChallengeInfo(challenge.toProto()); + + // Add challenge lineups + data.addLineupList(player.getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_VALUE).toProto()); + + if (challenge.getExcel().getStageNum() >= 2) { + data.addLineupList(player.getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_2_VALUE).toProto()); + } + + // Fix for challenge boss instances + if (challenge.getType() == ChallengeType.BOSS) { + var info = data.getMutableExtInfo().getMutableBossInfo(); + + info.getMutableFirstNode(); + info.getMutableSecondNode(); + //info.addAllLineup1(lineup1.array()); + //info.addAllLineup2(lineup2.array()); + } } else { data.setRetcode(1); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java index d11aa7b..01ce5a9 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java @@ -10,7 +10,8 @@ import java.util.List; public class PacketSyncRogueDialogueEventDataScNotify extends BasePacket { public PacketSyncRogueDialogueEventDataScNotify(RogueDialogueEvent event) { - super(CmdId.SyncRogueDialogueEventDataScNotify); + //super(CmdId.SyncRogueDialogueEventDataScNotify); + super(CmdId.NONE); var proto = SyncRogueDialogueEventDataScNotify.newInstance() .addRogueDialogueEvent(event); diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketUnlockSkilltreeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketUnlockSkilltreeScRsp.java index daedc03..1281b32 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketUnlockSkilltreeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketUnlockSkilltreeScRsp.java @@ -10,7 +10,6 @@ public class PacketUnlockSkilltreeScRsp extends BasePacket { super(CmdId.UnlockSkilltreeScRsp); var data = UnlockSkilltreeScRsp.newInstance() - .setBaseAvatarId(avatarId) .setPointId(pointId) .setLevel(level);